Skip to content

Commit 10c757f

Browse files
committed
Fixes Bitbucket PRs categories on Launchpad
(#4046, #4099)
1 parent dba76e7 commit 10c757f

File tree

1 file changed

+10
-4
lines changed
  • src/plus/integrations/providers/bitbucket

1 file changed

+10
-4
lines changed

src/plus/integrations/providers/bitbucket/models.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import { RepositoryAccessLevel } from '../../../../git/models/issue';
22
import type { IssueOrPullRequestState } from '../../../../git/models/issueOrPullRequest';
33
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';
510
import type { Provider } from '../../../../git/models/remoteProvider';
611
import type { ResourceDescriptor } from '../../integration';
712

@@ -259,7 +264,7 @@ export function fromBitbucketParticipantToReviewer(
259264
? PullRequestReviewState.Commented
260265
: prt.user.uuid === closedBy?.uuid && prState === 'DECLINED'
261266
? PullRequestReviewState.Dismissed
262-
: PullRequestReviewState.Pending,
267+
: PullRequestReviewState.ReviewRequested,
263268
};
264269
}
265270

@@ -310,7 +315,8 @@ export function fromBitbucketPullRequest(pr: BitbucketPullRequest, provider: Pro
310315
new Date(pr.updated_on),
311316
pr.closed_by ? new Date(pr.updated_on) : undefined,
312317
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
314320
undefined, // viewerCanUpdate
315321
{
316322
base: {
@@ -340,7 +346,7 @@ export function fromBitbucketPullRequest(pr: BitbucketPullRequest, provider: Pro
340346
pr.participants // reviewRequests:PullRequestReviewer[]
341347
?.filter(prt => prt.role === 'REVIEWER')
342348
.map(prt => fromBitbucketParticipantToReviewer(prt, pr.closed_by, pr.state))
343-
.filter(rv => rv.state === PullRequestReviewState.Pending),
349+
.filter(rv => rv.state === PullRequestReviewState.ReviewRequested),
344350
pr.participants // latestReviews:PullRequestReviewer[]
345351
?.filter(prt => prt.participated_on != null)
346352
.map(prt => fromBitbucketParticipantToReviewer(prt, pr.closed_by, pr.state)),

0 commit comments

Comments
 (0)