|
1 | 1 | import { RepositoryAccessLevel } from '../../../../git/models/issue'; |
2 | 2 | import type { IssueOrPullRequestState } from '../../../../git/models/issueOrPullRequest'; |
3 | 3 | import type { PullRequestMember, PullRequestReviewer } from '../../../../git/models/pullRequest'; |
4 | | -import { PullRequest, PullRequestReviewDecision, PullRequestReviewState } from '../../../../git/models/pullRequest'; |
| 4 | +import { |
| 5 | + PullRequest, |
| 6 | + PullRequestMergeableState, |
| 7 | + PullRequestReviewDecision, |
| 8 | + PullRequestReviewState, |
| 9 | +} from '../../../../git/models/pullRequest'; |
5 | 10 | import type { Provider } from '../../../../git/models/remoteProvider'; |
6 | 11 | import type { ResourceDescriptor } from '../../integration'; |
7 | 12 |
|
@@ -259,7 +264,7 @@ export function fromBitbucketParticipantToReviewer( |
259 | 264 | ? PullRequestReviewState.Commented |
260 | 265 | : prt.user.uuid === closedBy?.uuid && prState === 'DECLINED' |
261 | 266 | ? PullRequestReviewState.Dismissed |
262 | | - : PullRequestReviewState.Pending, |
| 267 | + : PullRequestReviewState.ReviewRequested, |
263 | 268 | }; |
264 | 269 | } |
265 | 270 |
|
@@ -310,7 +315,8 @@ export function fromBitbucketPullRequest(pr: BitbucketPullRequest, provider: Pro |
310 | 315 | new Date(pr.updated_on), |
311 | 316 | pr.closed_by ? new Date(pr.updated_on) : undefined, |
312 | 317 | pr.state === 'MERGED' ? new Date(pr.updated_on) : undefined, |
313 | | - undefined, // mergeableState |
| 318 | + // TODO: Remove this assumption once actual mergeable state is available |
| 319 | + PullRequestMergeableState.Mergeable, // mergeableState |
314 | 320 | undefined, // viewerCanUpdate |
315 | 321 | { |
316 | 322 | base: { |
@@ -340,7 +346,7 @@ export function fromBitbucketPullRequest(pr: BitbucketPullRequest, provider: Pro |
340 | 346 | pr.participants // reviewRequests:PullRequestReviewer[] |
341 | 347 | ?.filter(prt => prt.role === 'REVIEWER') |
342 | 348 | .map(prt => fromBitbucketParticipantToReviewer(prt, pr.closed_by, pr.state)) |
343 | | - .filter(rv => rv.state === PullRequestReviewState.Pending), |
| 349 | + .filter(rv => rv.state === PullRequestReviewState.ReviewRequested), |
344 | 350 | pr.participants // latestReviews:PullRequestReviewer[] |
345 | 351 | ?.filter(prt => prt.participated_on != null) |
346 | 352 | .map(prt => fromBitbucketParticipantToReviewer(prt, pr.closed_by, pr.state)), |
|
0 commit comments