Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit c631257

Browse files
committedJun 5, 2024··
Thins down search queries for PRs
1 parent ee8e8a0 commit c631257

File tree

2 files changed

+32
-64
lines changed

2 files changed

+32
-64
lines changed
 

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

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,6 @@ author {
8787
}
8888
baseRefName
8989
baseRefOid
90-
baseRepository {
91-
name
92-
owner {
93-
login
94-
}
95-
url
96-
}
9790
headRefName
9891
headRefOid
9992
headRepository {
@@ -112,6 +105,7 @@ repository {
112105
owner {
113106
login
114107
}
108+
url
115109
viewerPermission
116110
}
117111
`;
@@ -126,50 +120,39 @@ assignees(first: 10) {
126120
}
127121
}
128122
checksUrl
129-
commits(last: 1) {
130-
nodes {
131-
commit {
132-
oid
133-
statusCheckRollup {
134-
state
135-
}
136-
}
137-
}
138-
}
139123
deletions
140124
isDraft
141-
isReadByViewer
142-
latestReviews (first: 10) {
125+
mergeable
126+
mergedBy {
127+
login
128+
}
129+
reviewDecision
130+
latestReviews(first: 10) {
143131
nodes {
144132
author {
145133
login
146-
avatarUrl
134+
avatarUrl(size: $avatarSize)
147135
url
148136
}
149137
state
150138
}
151139
}
152-
mergeable
153-
mergedBy {
154-
login
155-
}
156-
reactions(content: THUMBS_UP) {
157-
totalCount
158-
}
159-
reviewDecision
160140
reviewRequests(first: 10) {
161141
nodes {
162142
asCodeOwner
163143
id
164144
requestedReviewer {
165145
... on User {
166146
login
167-
avatarUrl
147+
avatarUrl(size: $avatarSize)
168148
url
169149
}
170150
}
171151
}
172152
}
153+
statusCheckRollup {
154+
state
155+
}
173156
totalCommentsCount
174157
viewerCanUpdate
175158
`;
@@ -180,7 +163,7 @@ assignees(first: 100) {
180163
nodes {
181164
login
182165
url
183-
avatarUrl
166+
avatarUrl(size: $avatarSize)
184167
}
185168
}
186169
author {
@@ -2936,7 +2919,7 @@ export class GitHubApi implements Disposable {
29362919
async searchMyIssues(
29372920
provider: Provider,
29382921
token: string,
2939-
options?: { search?: string; user?: string; repos?: string[]; baseUrl?: string },
2922+
options?: { search?: string; user?: string; repos?: string[]; baseUrl?: string; avatarSize?: number },
29402923
cancellation?: CancellationToken,
29412924
): Promise<SearchedIssue[] | undefined> {
29422925
const scope = getLogScope();
@@ -2957,6 +2940,7 @@ export class GitHubApi implements Disposable {
29572940
$authored: String!
29582941
$assigned: String!
29592942
$mentioned: String!
2943+
$avatarSize: Int
29602944
) {
29612945
authored: search(first: 100, query: $authored, type: ISSUE) {
29622946
nodes {
@@ -3003,6 +2987,7 @@ export class GitHubApi implements Disposable {
30032987
assigned: `${search} ${baseFilters} assignee:@me`.trim(),
30042988
mentioned: `${search} ${baseFilters} mentions:@me`.trim(),
30052989
baseUrl: options?.baseUrl,
2990+
avatarSize: options?.avatarSize,
30062991
},
30072992
scope,
30082993
cancellation,

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

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ export interface GitHubPullRequestLite extends Omit<GitHubIssueOrPullRequest, '_
9191

9292
baseRefName: string;
9393
baseRefOid: string;
94-
baseRepository: {
95-
name: string;
96-
owner: {
97-
login: string;
98-
};
99-
url: string;
100-
};
10194

10295
headRefName: string;
10396
headRefOid: string;
@@ -119,6 +112,7 @@ export interface GitHubPullRequestLite extends Omit<GitHubIssueOrPullRequest, '_
119112
owner: {
120113
login: string;
121114
};
115+
url: string;
122116
viewerPermission: GitHubViewerPermission;
123117
};
124118
}
@@ -153,36 +147,25 @@ export interface GitHubPullRequest extends GitHubPullRequestLite {
153147
nodes: GitHubMember[];
154148
};
155149
checksUrl: string;
156-
commits: {
157-
nodes: {
158-
commit: {
159-
oid: string;
160-
statusCheckRollup: {
161-
state: 'SUCCESS' | 'FAILURE' | 'PENDING' | 'EXPECTED' | 'ERROR';
162-
} | null;
163-
};
164-
}[];
165-
};
166150
deletions: number;
167151
isDraft: boolean;
168-
isReadByViewer: boolean;
152+
mergeable: GitHubPullRequestMergeableState;
153+
reviewDecision: GitHubPullRequestReviewDecision;
169154
latestReviews: {
170155
nodes: {
171156
author: GitHubMember;
172157
state: GitHubPullRequestReviewState;
173158
}[];
174159
};
175-
mergeable: GitHubPullRequestMergeableState;
176-
reactions: {
177-
totalCount: number;
178-
};
179-
reviewDecision: GitHubPullRequestReviewDecision;
180160
reviewRequests: {
181161
nodes: {
182162
asCodeOwner: boolean;
183163
requestedReviewer: GitHubMember | null;
184164
}[];
185165
};
166+
statusCheckRollup: {
167+
state: 'SUCCESS' | 'FAILURE' | 'PENDING' | 'EXPECTED' | 'ERROR';
168+
} | null;
186169
totalCommentsCount: number;
187170
viewerCanUpdate: boolean;
188171
}
@@ -221,12 +204,12 @@ export function fromGitHubPullRequestLite(pr: GitHubPullRequestLite, provider: P
221204
url: pr.headRepository?.url,
222205
},
223206
base: {
224-
exists: pr.baseRepository != null,
225-
owner: pr.baseRepository?.owner.login,
226-
repo: pr.baseRepository?.name,
207+
exists: pr.repository != null,
208+
owner: pr.repository?.owner.login,
209+
repo: pr.repository?.name,
227210
sha: pr.baseRefOid,
228211
branch: pr.baseRefName,
229-
url: pr.baseRepository?.url,
212+
url: pr.repository?.url,
230213
},
231214
isCrossRepository: pr.isCrossRepository,
232215
},
@@ -359,20 +342,20 @@ export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: Provider)
359342
url: pr.headRepository?.url,
360343
},
361344
base: {
362-
exists: pr.baseRepository != null,
363-
owner: pr.baseRepository?.owner.login,
364-
repo: pr.baseRepository?.name,
345+
exists: pr.repository != null,
346+
owner: pr.repository?.owner.login,
347+
repo: pr.repository?.name,
365348
sha: pr.baseRefOid,
366349
branch: pr.baseRefName,
367-
url: pr.baseRepository?.url,
350+
url: pr.repository?.url,
368351
},
369352
isCrossRepository: pr.isCrossRepository,
370353
},
371354
pr.isDraft,
372355
pr.additions,
373356
pr.deletions,
374357
pr.totalCommentsCount,
375-
pr.reactions.totalCount,
358+
0, //pr.reactions.totalCount,
376359
fromGitHubPullRequestReviewDecision(pr.reviewDecision),
377360
pr.reviewRequests.nodes
378361
.map(r =>
@@ -402,7 +385,7 @@ export function fromGitHubPullRequest(pr: GitHubPullRequest, provider: Provider)
402385
avatarUrl: r.avatarUrl,
403386
url: r.url,
404387
})),
405-
fromGitHubPullRequestStatusCheckRollupState(pr.commits.nodes[0].commit.statusCheckRollup?.state),
388+
fromGitHubPullRequestStatusCheckRollupState(pr.statusCheckRollup?.state),
406389
);
407390
}
408391

0 commit comments

Comments
 (0)