Skip to content

Commit 9a0aea8

Browse files
authored
removed request for code owners (#6828)
Fixes #6788
1 parent 4451530 commit 9a0aea8

4 files changed

Lines changed: 22 additions & 26 deletions

File tree

src/github/activityBarViewProvider.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,21 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
157157
const teamReviewers: ITeam[] = [];
158158

159159
for (const reviewer of this._existingReviewers) {
160-
let id: string | undefined;
161-
let reviewerArray: (IAccount | ITeam)[] | undefined;
162-
if (reviewer && isTeam(reviewer.reviewer)) {
163-
id = reviewer.reviewer.id;
164-
reviewerArray = teamReviewers;
165-
} else if (reviewer && !isTeam(reviewer.reviewer)) {
166-
id = reviewer.reviewer.id;
167-
reviewerArray = userReviewers;
168-
}
169-
if (reviewerArray && id && ((reviewer.state === 'REQUESTED') || (id === message.args))) {
170-
reviewerArray.push(reviewer.reviewer);
160+
let id = reviewer.reviewer.id;
161+
if (id && ((reviewer.state === 'REQUESTED') || (id === message.args))) {
171162
if (id === message.args) {
172163
targetReviewer = reviewer;
173164
}
174165
}
175166
}
176-
this._item.requestReview(userReviewers, teamReviewers).then(() => {
167+
168+
if (targetReviewer && isTeam(targetReviewer.reviewer)) {
169+
teamReviewers.push(targetReviewer.reviewer);
170+
} else if (targetReviewer && !isTeam(targetReviewer.reviewer)) {
171+
userReviewers.push(targetReviewer.reviewer);
172+
}
173+
174+
this._item.requestReview(userReviewers, teamReviewers, true).then(() => {
177175
if (targetReviewer) {
178176
targetReviewer.state = 'REQUESTED';
179177
}

src/github/createPRViewProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ export abstract class BaseCreatePullRequestViewProvider<T extends BasePullReques
316316
users.push(reviewer);
317317
}
318318
}
319-
await pr.requestReview(users, teams);
319+
await pr.requestReview(users, teams, true);
320320
}
321321
}
322322

src/github/pullRequestModel.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
962962
* Add reviewers to a pull request
963963
* @param reviewers A list of GitHub logins
964964
*/
965-
async requestReview(reviewers: IAccount[], teamReviewers: ITeam[]): Promise<void> {
965+
async requestReview(reviewers: IAccount[], teamReviewers: ITeam[], union: boolean = false): Promise<void> {
966966
const { mutate, schema } = await this.githubRepository.ensure();
967967
await mutate({
968968
mutation: schema.AddReviewers,
@@ -971,6 +971,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
971971
pullRequestId: this.graphNodeId,
972972
teamIds: teamReviewers.map(t => t.id),
973973
userIds: reviewers.filter(r => r.accountType !== AccountType.Bot).map(r => r.id),
974+
union
974975
},
975976
},
976977
});

src/github/pullRequestOverview.ts

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -653,24 +653,21 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
653653
const teamReviewers: ITeam[] = [];
654654

655655
for (const reviewer of this._existingReviewers) {
656-
let id: string | undefined;
657-
let reviewerArray: (IAccount | ITeam)[] | undefined;
658-
if (reviewer && isTeam(reviewer.reviewer)) {
659-
id = reviewer.reviewer.id;
660-
reviewerArray = teamReviewers;
661-
} else if (reviewer && !isTeam(reviewer.reviewer)) {
662-
id = reviewer.reviewer.id;
663-
reviewerArray = userReviewers;
664-
}
665-
if (reviewerArray && id && ((reviewer.state === 'REQUESTED') || (id === message.args))) {
666-
reviewerArray.push(reviewer.reviewer);
656+
let id = reviewer.reviewer.id;
657+
if (id && ((reviewer.state === 'REQUESTED') || (id === message.args))) {
667658
if (id === message.args) {
668659
targetReviewer = reviewer;
669660
}
670661
}
671662
}
672663

673-
this._item.requestReview(userReviewers, teamReviewers).then(() => {
664+
if (targetReviewer && isTeam(targetReviewer.reviewer)) {
665+
teamReviewers.push(targetReviewer.reviewer);
666+
} else if (targetReviewer && !isTeam(targetReviewer.reviewer)) {
667+
userReviewers.push(targetReviewer.reviewer);
668+
}
669+
670+
this._item.requestReview(userReviewers, teamReviewers, true).then(() => {
674671
if (targetReviewer) {
675672
targetReviewer.state = 'REQUESTED';
676673
}

0 commit comments

Comments
 (0)