Unified · Split
| @@ -8,7 +8,7 @@ import { · 7 unmodified lines | ||
| 8 | 8 | } from "../components/pullRequest/pullRequestDetail.logic"; |
| 9 | 9 | import { gitHubPullRequestBrowserUrl } from "../lib/openPullRequestLink"; |
| 10 | 10 | import { selectActiveRightPanelSurface, useRightPanelStore } from "../rightPanelStore"; |
| 11 | −import { useProject } from "../state/entities"; | |
| 11 | +import { useProject, useServerConfigs } from "../state/entities"; | |
| 12 | 12 | import { pullRequestEnvironment } from "../state/pullRequests"; |
| 13 | 13 | import { useEnvironmentQuery } from "../state/query"; |
| 14 | 14 | |
| @@ -20,17 +20,22 @@ export function useOpenPanelPullRequestUrl(threadRef: ScopedThreadRef | null) { · 5 unmodified lines | ||
| 20 | 20 | const environmentId = reference?.environmentId |
| 21 | 21 | ? EnvironmentId.make(reference.environmentId) |
| 22 | 22 | : threadRef?.environmentId; |
| 23 | + const serverConfigs = useServerConfigs(); | |
| 23 | 24 | const project = useProject( |
| 24 | − reference && environmentId | |
| 25 | + reference && reference.projectId !== null && environmentId | |
| 25 | 26 | ? scopeProjectRef(environmentId, ProjectId.make(reference.projectId)) |
| 26 | 27 | : null, |
| 27 | 28 | ); |
| 28 | 29 | const detail = useEnvironmentQuery( |
| 29 | − reference && environmentId | |
| 30 | + reference && | |
| 31 | + environmentId && | |
| 32 | + (reference.projectId !== null || | |
| 33 | + serverConfigs.get(environmentId)?.environment.capabilities.unlinkedGitHubPullRequests === | |
| 34 | + true) | |
| 30 | 35 | ? pullRequestEnvironment.detail({ |
| 31 | 36 | environmentId, |
| 32 | 37 | input: { |
| 33 | − projectId: ProjectId.make(reference.projectId), | |
| 38 | + projectId: reference.projectId === null ? null : ProjectId.make(reference.projectId), | |
| 34 | 39 | repository: reference.repository, |
| 35 | 40 | number: reference.number, |
| 36 | 41 | }, |
| @@ -51,10 +56,12 @@ export function useOpenPanelPullRequestUrl(threadRef: ScopedThreadRef | null) { · 14 unmodified lines | ||
| 51 | 56 | return reference |
| 52 | 57 | ? (resolveDisplayedPullRequestDetail({ live: detail, cached: cachedDetail, reference })?.url ?? |
| 53 | 58 | reference.url ?? |
| 54 | − gitHubPullRequestBrowserUrl( | |
| 55 | − project?.repositoryIdentity, | |
| 56 | − reference.repository, | |
| 57 | − reference.number, | |
| 58 | − )) | |
| 59 | + (reference.projectId === null | |
| 60 | + ? `https://github.com/${reference.repository}/pull/${reference.number}` | |
| 61 | + : gitHubPullRequestBrowserUrl( | |
| 62 | + project?.repositoryIdentity, | |
| 63 | + reference.repository, | |
| 64 | + reference.number, | |
| 65 | + ))) | |
| 59 | 66 | : undefined; |
| 60 | 67 | } |