Skip to content

Commit f9b02f4

Browse files
authored
Fails to open PR's description in some repos on GitHub Enterprise (reviewers name parsing?) (#6902)
Fixes #6736
1 parent c20d5f2 commit f9b02f4

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/github/graphql.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ export interface ReactionGroup {
8181
};
8282
}
8383

84+
export interface Node {
85+
id: string;
86+
}
87+
8488
export interface Actor {
8589
__typename: string;
8690
id: string;
@@ -94,11 +98,11 @@ export interface Account extends Actor {
9498
email: string;
9599
}
96100

97-
export function isAccount(x: Actor | Team | undefined | null): x is Account {
101+
export function isAccount(x: Actor | Team | Node | undefined | null): x is Account {
98102
return !!x && 'name' in x && 'email' in x;
99103
}
100104

101-
export function isTeam(x: Actor | Team | undefined | null): x is Team {
105+
export function isTeam(x: Actor | Team | Node | undefined | null): x is Team {
102106
return !!x && 'slug' in x;
103107
}
104108

@@ -258,7 +262,7 @@ export interface GetReviewRequestsResponse {
258262
pullRequest: {
259263
reviewRequests: {
260264
nodes: {
261-
requestedReviewer: Actor | Account | Team | null;
265+
requestedReviewer: Actor | Account | Team | Node | null;
262266
}[];
263267
};
264268
};

src/github/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ export function parseGraphQLReviewers(data: GraphQL.GetReviewRequestsResponse, r
645645
if (GraphQL.isTeam(reviewer.requestedReviewer)) {
646646
const team: ITeam = parseTeam(reviewer.requestedReviewer, repository);
647647
reviewers.push(team);
648-
} else {
648+
} else if (GraphQL.isAccount(reviewer.requestedReviewer)) {
649649
const account: IAccount = parseAccount(reviewer.requestedReviewer, repository);
650650
reviewers.push(account);
651651
}

0 commit comments

Comments
 (0)