Thins down search queries for PRs

Author: axosoft-ramint

src/plus/integrations/providers/github/github.ts

@@ -87,13 +87,6 @@ author {
 }
 baseRefName
 baseRefOid
-baseRepository {
-	name
-	owner {
-		login
-	}
-	url
-}
 headRefName
 headRefOid
 headRepository {
@@ -112,6 +105,7 @@ repository {
 	owner {
 		login
 	}
+	url
 	viewerPermission
 }
 `;
@@ -126,50 +120,39 @@ assignees(first: 10) {
 	}
 }
 checksUrl
-commits(last: 1) {
-	nodes {
-		commit {
-			oid
-			statusCheckRollup {
-				state
-			}
-		}
-	}
-}
 deletions
 isDraft
-isReadByViewer
-latestReviews (first: 10) {
+mergeable
+mergedBy {
+	login
+}
+reviewDecision
+latestReviews(first: 10) {
 	nodes {
 		author {
 			login
-			avatarUrl
+			avatarUrl(size: $avatarSize)
 			url
 		}
 		state
 	}
 }
-mergeable
-mergedBy {
-	login
-}
-reactions(content: THUMBS_UP) {
-	totalCount
-}
-reviewDecision
 reviewRequests(first: 10) {
 	nodes {
 		asCodeOwner
 		id
 		requestedReviewer {
 			... on User {
 				login
-				avatarUrl
+				avatarUrl(size: $avatarSize)
 				url
 			}
 		}
 	}
 }
+statusCheckRollup {
+	state
+}
 totalCommentsCount
 viewerCanUpdate
 `;
@@ -180,7 +163,7 @@ assignees(first: 100) {
 	nodes {
 		login
 		url
-		avatarUrl
+		avatarUrl(size: $avatarSize)
 	}
 }
 author {
@@ -2936,7 +2919,7 @@ export class GitHubApi implements Disposable {
 	async searchMyIssues(
 		provider: Provider,
 		token: string,
-		options?: { search?: string; user?: string; repos?: string[]; baseUrl?: string },
+		options?: { search?: string; user?: string; repos?: string[]; baseUrl?: string; avatarSize?: number },
 		cancellation?: CancellationToken,
 	): Promise<SearchedIssue[] | undefined> {
 		const scope = getLogScope();
@@ -2957,6 +2940,7 @@ export class GitHubApi implements Disposable {
 				$authored: String!
 				$assigned: String!
 				$mentioned: String!
+				$avatarSize: Int
 			) {
 				authored: search(first: 100, query: $authored, type: ISSUE) {
 					nodes {
@@ -3003,6 +2987,7 @@ export class GitHubApi implements Disposable {
 					assigned: `${search} ${baseFilters} assignee:@me`.trim(),
 					mentioned: `${search} ${baseFilters} mentions:@me`.trim(),
 					baseUrl: options?.baseUrl,
+					avatarSize: options?.avatarSize,
 				},
 				scope,
 				cancellation,

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

@@ -91,13 +91,6 @@ export interface GitHubPullRequestLite extends Omit<GitHubIssueOrPullRequest, '_
 
 	baseRefName: string;
 	baseRefOid: string;
-	baseRepository: {
-		name: string;
-		owner: {
-			login: string;
-		};
-		url: string;
-	};
 
 	headRefName: string;
 	headRefOid: string;
@@ -119,6 +112,7 @@ export interface GitHubPullRequestLite extends Omit<GitHubIssueOrPullRequest, '_
 		owner: {
 			login: string;
 		};
+		url: string;
 		viewerPermission: GitHubViewerPermission;
 	};
 }
@@ -153,36 +147,25 @@ export interface GitHubPullRequest extends GitHubPullRequestLite {
 		nodes: GitHubMember[];
 	};
 	checksUrl: string;
-	commits: {
-		nodes: {
-			commit: {
-				oid: string;
-				statusCheckRollup: {
-					state: 'SUCCESS' | 'FAILURE' | 'PENDING' | 'EXPECTED' | 'ERROR';
-				} | null;
-			};
-		}[];
-	};
 	deletions: number;
 	isDraft: boolean;
-	isReadByViewer: boolean;
+	mergeable: GitHubPullRequestMergeableState;
+	reviewDecision: GitHubPullRequestReviewDecision;
 	latestReviews: {
 		nodes: {
 			author: GitHubMember;
 			state: GitHubPullRequestReviewState;
 		}[];
 	};
-	mergeable: GitHubPullRequestMergeableState;
-	reactions: {
-		totalCount: number;
-	};
-	reviewDecision: GitHubPullRequestReviewDecision;
 	reviewRequests: {
 		nodes: {
 			asCodeOwner: boolean;
 			requestedReviewer: GitHubMember | null;
 		}[];
 	};
+	statusCheckRollup: {
+		state: 'SUCCESS' | 'FAILURE' | 'PENDING' | 'EXPECTED' | 'ERROR';
+	} | null;
 	totalCommentsCount: number;
 	viewerCanUpdate: boolean;
 }
@@ -221,12 +204,12 @@ export function fromGitHubPullRequestLite(pr: GitHubPullRequestLite, provider: P
 				url: pr.headRepository?.url,
 			},
 			base: {
-				exists: pr.baseRepository != null,
-				owner: pr.baseRepository?.owner.login,
-				repo: pr.baseRepository?.name,
+				exists: pr.repository != null,
+				owner: pr.repository?.owner.login,
+				repo: pr.repository?.name,
 				sha: pr.baseRefOid,
 				branch: pr.baseRefName,
-				url: pr.baseRepository?.url,
+				url: pr.repository?.url,
 			},
 			isCrossRepository: pr.isCrossRepository,
 		},
@@ -359,20 +342,20 @@ export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: Provider)
 				url: pr.headRepository?.url,
 			},
 			base: {
-				exists: pr.baseRepository != null,
-				owner: pr.baseRepository?.owner.login,
-				repo: pr.baseRepository?.name,
+				exists: pr.repository != null,
+				owner: pr.repository?.owner.login,
+				repo: pr.repository?.name,
 				sha: pr.baseRefOid,
 				branch: pr.baseRefName,
-				url: pr.baseRepository?.url,
+				url: pr.repository?.url,
 			},
 			isCrossRepository: pr.isCrossRepository,
 		},
 		pr.isDraft,
 		pr.additions,
 		pr.deletions,
 		pr.totalCommentsCount,
-		pr.reactions.totalCount,
+		0, //pr.reactions.totalCount,
 		fromGitHubPullRequestReviewDecision(pr.reviewDecision),
 		pr.reviewRequests.nodes
 			.map(r =>
@@ -402,7 +385,7 @@ export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: Provider)
 			avatarUrl: r.avatarUrl,
 			url: r.url,
 		})),
-		fromGitHubPullRequestStatusCheckRollupState(pr.commits.nodes[0].commit.statusCheckRollup?.state),
+		fromGitHubPullRequestStatusCheckRollupState(pr.statusCheckRollup?.state),
 	);
 }