Skip to content

Unable to open PR editor: Cannot read properties of undefined (reading 'toLowerCase' #6388

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 1 commit into from
Oct 23, 2024
Merged

Unable to open PR editor: Cannot read properties of undefined (reading 'toLowerCase' #6388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 2 additions & 25 deletions src/github/pullRequestModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ import { IssueModel } from './issueModel';
import {
convertRESTPullRequestToRawPullRequest,
convertRESTReviewEvent,
getAvatarWithEnterpriseFallback,
getReactionGroup,
insertNewCommitsSinceReview,
parseGraphQLComment,
parseGraphQLReaction,
parseGraphQLReviewers,
parseGraphQLReviewEvent,
parseGraphQLReviewThread,
parseGraphQLTimelineEvents,
Expand Down Expand Up @@ -975,30 +975,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
return [];
}

const reviewers: (IAccount | ITeam)[] = [];
for (const reviewer of data.repository.pullRequest.reviewRequests.nodes) {
if (reviewer.requestedReviewer?.login) {
const account: IAccount = {
login: reviewer.requestedReviewer.login,
url: reviewer.requestedReviewer.url,
avatarUrl: getAvatarWithEnterpriseFallback(reviewer.requestedReviewer.avatarUrl, undefined, remote.isEnterprise),
email: reviewer.requestedReviewer.email,
name: reviewer.requestedReviewer.name,
id: reviewer.requestedReviewer.id
};
reviewers.push(account);
} else if (reviewer.requestedReviewer) {
const team: ITeam = {
name: reviewer.requestedReviewer.name,
url: reviewer.requestedReviewer.url,
avatarUrl: getAvatarWithEnterpriseFallback(reviewer.requestedReviewer.avatarUrl, undefined, remote.isEnterprise),
id: reviewer.requestedReviewer.id!,
org: remote.owner,
slug: reviewer.requestedReviewer.slug!
};
reviewers.push(team);
}
}
const reviewers: (IAccount | ITeam)[] = parseGraphQLReviewers(data, remote);
Logger.debug('Get Review Requests - done', PullRequestModel.ID);
return reviewers;
}
Expand Down
5 changes: 5 additions & 0 deletions src/github/queriesShared.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@ query GetReviewRequests($owner: String!, $name: String!, $number: Int!) {
email
name
}
... on Bot {
id
login
avatarUrl
}
}
}
}
Expand Down
34 changes: 33 additions & 1 deletion src/github/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { IComment, IReviewThread, Reaction, SPECIAL_COMMENT_AUTHORS, SubjectType
import { DiffHunk, parseDiffHunk } from '../common/diffHunk';
import { GitHubRef } from '../common/githubRef';
import Logger from '../common/logger';
import { Remote } from '../common/remote';
import { GitHubRemote, Remote } from '../common/remote';
import { Resource } from '../common/resources';
import { GITHUB_ENTERPRISE, OVERRIDE_DEFAULT_BRANCH, PR_SETTINGS_NAMESPACE, URI } from '../common/settingKeys';
import * as Common from '../common/timelineEvent';
Expand Down Expand Up @@ -594,6 +594,38 @@ function parseAuthor(
}
}

export function parseGraphQLReviewers(data: GraphQL.GetReviewRequestsResponse, remote: GitHubRemote): (IAccount | ITeam)[] {
if (!data.repository) {
return [];
}
const reviewers: (IAccount | ITeam)[] = [];
for (const reviewer of data.repository.pullRequest.reviewRequests.nodes) {
if (reviewer.requestedReviewer?.login) {
const account: IAccount = {
login: reviewer.requestedReviewer.login,
url: reviewer.requestedReviewer.url,
avatarUrl: getAvatarWithEnterpriseFallback(reviewer.requestedReviewer.avatarUrl, undefined, remote.isEnterprise),
email: reviewer.requestedReviewer.email,
name: reviewer.requestedReviewer.name,
id: reviewer.requestedReviewer.id,
specialDisplayName: SPECIAL_COMMENT_AUTHORS[reviewer.requestedReviewer.login] ? (reviewer.requestedReviewer.name ?? SPECIAL_COMMENT_AUTHORS[reviewer.requestedReviewer.login].name) : undefined,
};
reviewers.push(account);
} else if (reviewer.requestedReviewer) {
const team: ITeam = {
name: reviewer.requestedReviewer.name,
url: reviewer.requestedReviewer.url,
avatarUrl: getAvatarWithEnterpriseFallback(reviewer.requestedReviewer.avatarUrl, undefined, remote.isEnterprise),
id: reviewer.requestedReviewer.id!,
org: remote.owner,
slug: reviewer.requestedReviewer.slug!
};
reviewers.push(team);
}
}
return reviewers;
}

function parseActor(
author: { login: string; url: string; avatarUrl: string; } | null,
githubRepository: GitHubRepository,
Expand Down