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