Skip to content

Exclude pending reviews from "Show Changes Since Last Review" #8264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexr00 merged 6 commits into from
Dec 17, 2025
Merged

Exclude pending reviews from "Show Changes Since Last Review" #8264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
900be7b
Initial plan
Copilot Dec 10, 2025
255ccfc
Initial plan for fixing Show Changes Since Last Review
Copilot Dec 10, 2025
e9cf1fb
Modify GraphQL query to exclude pending reviews from last review
Copilot Dec 10, 2025
b7fc541
Fix test builder for array handling
Copilot Dec 10, 2025
9b3101d
Use 'last: 1' to get the most recent review instead of 'first: 1'
Copilot Dec 10, 2025
4771be8
Revert API proposal changes that were unintentionally included
Copilot Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/github/graphql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,12 @@ export interface LatestUpdatesResponse {
export interface LatestReviewCommitResponse {
repository: {
pullRequest: {
viewerLatestReview: {
commit: {
oid: string;
}
reviews: {
nodes: {
commit: {
oid: string;
}
}[];
};
};
} | null;
Expand Down
7 changes: 5 additions & 2 deletions src/github/pullRequestModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
async getViewerLatestReviewCommit(): Promise<{ sha: string } | undefined> {
Logger.debug(`Fetch viewers latest review commit`, IssueModel.ID);
const { query, remote, schema } = await this.githubRepository.ensure();
const currentUser = (await this.githubRepository.getAuthenticatedUser()).login;

try {
const { data } = await query<LatestReviewCommitResponse>({
Expand All @@ -606,15 +607,17 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
owner: remote.owner,
name: remote.repositoryName,
number: this.number,
author: currentUser,
},
});

if (data.repository === null) {
Logger.error('Unexpected null repository while getting last review commit', PullRequestModel.ID);
}

return data.repository?.pullRequest.viewerLatestReview ? {
sha: data.repository?.pullRequest.viewerLatestReview.commit.oid,
const latestReview = data.repository?.pullRequest.reviews.nodes[0];
return latestReview ? {
sha: latestReview.commit.oid,
} : undefined;
}
catch (e) {
Expand Down
10 changes: 6 additions & 4 deletions src/github/queriesShared.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,14 @@ query IssueTimelineEvents($owner: String!, $name: String!, $number: Int!, $last:
}
}

query LatestReviewCommit($owner: String!, $name: String!, $number: Int!) {
query LatestReviewCommit($owner: String!, $name: String!, $number: Int!, $author: String!) {
repository(owner: $owner, name: $name) {
pullRequest(number: $number) {
viewerLatestReview {
commit {
oid
reviews(last: 1, author: $author, states: [APPROVED, CHANGES_REQUESTED, COMMENTED, DISMISSED]) {
nodes {
commit {
oid
}
}
}
}
Expand Down
9 changes: 3 additions & 6 deletions src/test/builders/graphql/latestReviewCommitBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ import { RateLimitBuilder } from './rateLimitBuilder';

type Repository = NonNullable<LatestReviewCommitResponse['repository']>;
type PullRequest = Repository['pullRequest'];
type ViewerLatestReview = PullRequest['viewerLatestReview'];
type Commit = ViewerLatestReview['commit'];
type Reviews = PullRequest['reviews'];

export const LatestReviewCommitBuilder = createBuilderClass<LatestReviewCommitResponse>()({
repository: createLink<Repository>()({
pullRequest: createLink<PullRequest>()({
viewerLatestReview: createLink<ViewerLatestReview>()({
commit: createLink<Commit>()({
oid: { default: 'abc' },
}),
reviews: createLink<Reviews>()({
nodes: { default: [] },
}),
}),
}),
Expand Down