Skip to content

Commit ba07de3

Browse files
authored
fix(desktop): batch project work item queries (#2160)
1 parent ac8c526 commit ba07de3

10 files changed

Lines changed: 569 additions & 122 deletions

‎desktop/src/features/projects/hooks.ts‎

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import type { ProjectIssue } from "./projectIssues.mjs";
4141
import { projectIssueEventsToIssues } from "./projectIssues.mjs";
4242
import type { ProjectPullRequest } from "./projectPullRequests.mjs";
4343
import { projectPullRequestEventsToPullRequests } from "./projectPullRequests.mjs";
44+
import { fetchProjectsWorkItems } from "./projectWorkItems";
4445

4546
export type { ProjectIssue, ProjectPullRequest };
4647

@@ -768,47 +769,12 @@ export function useProjectPullRequestsQuery(
768769
});
769770
}
770771

771-
export function useProjectsIssuesQuery(projects: Project[]) {
772+
/** Loads cross-project issues and pull requests with partial-failure metadata. */
773+
export function useProjectsWorkItemsQuery(projects: Project[]) {
772774
return useQuery({
773775
enabled: projects.length > 0,
774-
queryKey: ["projects", "issues", projects.map((project) => project.id)],
775-
queryFn: async (): Promise<ProjectIssueListItem[]> => {
776-
const results = await Promise.all(
777-
projects.map(async (project) => {
778-
const issues = await fetchProjectIssues(project);
779-
return issues.map((issue) => ({ project, issue }));
780-
}),
781-
);
782-
return results
783-
.flat()
784-
.sort((left, right) => right.issue.updatedAt - left.issue.updatedAt);
785-
},
786-
staleTime: 30_000,
787-
});
788-
}
789-
790-
export function useProjectsPullRequestsQuery(projects: Project[]) {
791-
return useQuery({
792-
enabled: projects.length > 0,
793-
queryKey: [
794-
"projects",
795-
"pull-requests",
796-
projects.map((project) => project.id),
797-
],
798-
queryFn: async (): Promise<ProjectPullRequestListItem[]> => {
799-
const results = await Promise.all(
800-
projects.map(async (project) => {
801-
const pullRequests = await fetchProjectPullRequests(project);
802-
return pullRequests.map((pullRequest) => ({ project, pullRequest }));
803-
}),
804-
);
805-
return results
806-
.flat()
807-
.sort(
808-
(left, right) =>
809-
right.pullRequest.updatedAt - left.pullRequest.updatedAt,
810-
);
811-
},
776+
queryKey: ["projects", "work-items", projects.map((project) => project.id)],
777+
queryFn: () => fetchProjectsWorkItems(projects),
812778
staleTime: 30_000,
813779
});
814780
}
@@ -843,7 +809,9 @@ export function useCreateProjectIssueCommentMutation(
843809
void queryClient.invalidateQueries({
844810
queryKey: ["project", project?.id ?? "none", "issues"],
845811
});
846-
void queryClient.invalidateQueries({ queryKey: ["projects", "issues"] });
812+
void queryClient.invalidateQueries({
813+
queryKey: ["projects", "work-items"],
814+
});
847815
void queryClient.invalidateQueries({
848816
queryKey: ["projects", "activity-summaries"],
849817
});
@@ -882,7 +850,7 @@ export function useCreateProjectPullRequestCommentMutation(
882850
queryKey: ["project", project?.id ?? "none", "pull-requests"],
883851
});
884852
void queryClient.invalidateQueries({
885-
queryKey: ["projects", "pull-requests"],
853+
queryKey: ["projects", "work-items"],
886854
});
887855
void queryClient.invalidateQueries({
888856
queryKey: ["projects", "activity-summaries"],

‎desktop/src/features/projects/issueMutations.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export function useCreateProjectIssueMutation(
4747
queryKey: ["project", project?.id ?? "none", "issues"],
4848
}),
4949
queryClient.invalidateQueries({
50-
queryKey: ["projects", "issues"],
50+
queryKey: ["projects", "work-items"],
5151
}),
5252
queryClient.invalidateQueries({
5353
queryKey: ["projects", "activity-summaries"],
Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
import { relayClient } from "@/shared/api/relayClient";
2+
import type { RelayEvent } from "@/shared/api/types";
3+
import {
4+
KIND_GIT_ISSUE,
5+
KIND_GIT_PR_UPDATE,
6+
KIND_GIT_PULL_REQUEST,
7+
KIND_GIT_STATUS_CLOSED,
8+
KIND_GIT_STATUS_DRAFT,
9+
KIND_GIT_STATUS_MERGED,
10+
KIND_GIT_STATUS_OPEN,
11+
KIND_TEXT_NOTE,
12+
} from "@/shared/constants/kinds";
13+
import {
14+
getTag,
15+
type ProjectIssue,
16+
projectIssueEventsToIssues,
17+
} from "./projectIssues.mjs";
18+
import {
19+
type ProjectPullRequest,
20+
projectPullRequestEventsToPullRequests,
21+
} from "./projectPullRequests.mjs";
22+
23+
type ProjectReference = {
24+
repoAddress: string;
25+
};
26+
27+
/** Optional event groups that can fail without discarding root work items. */
28+
export type ProjectWorkItemSection =
29+
| "comments"
30+
| "pull-request-updates"
31+
| "statuses";
32+
33+
/** Aggregate work items plus any optional event groups that failed to load. */
34+
export type ProjectsWorkItemsResult<TProject extends ProjectReference> = {
35+
issues: {
36+
items: Array<{ project: TProject; issue: ProjectIssue }>;
37+
failedSections: ProjectWorkItemSection[];
38+
};
39+
pullRequests: {
40+
items: Array<{ project: TProject; pullRequest: ProjectPullRequest }>;
41+
failedSections: ProjectWorkItemSection[];
42+
};
43+
};
44+
45+
function groupByRepoAddress(events: RelayEvent[]): Map<string, RelayEvent[]> {
46+
const grouped = new Map<string, RelayEvent[]>();
47+
for (const event of events) {
48+
const repoAddress = getTag(event, "a");
49+
if (!repoAddress) continue;
50+
const projectEvents = grouped.get(repoAddress) ?? [];
51+
projectEvents.push(event);
52+
grouped.set(repoAddress, projectEvents);
53+
}
54+
return grouped;
55+
}
56+
57+
/** Loads aggregate issue and pull-request data with bounded relay fan-out. */
58+
export async function fetchProjectsWorkItems<TProject extends ProjectReference>(
59+
projects: TProject[],
60+
): Promise<ProjectsWorkItemsResult<TProject>> {
61+
const repoAddresses = [
62+
...new Set(projects.map((project) => project.repoAddress)),
63+
];
64+
const [rootResult, updateResult, commentResult, statusResult] =
65+
await Promise.allSettled([
66+
relayClient.fetchEvents({
67+
kinds: [KIND_GIT_ISSUE, KIND_GIT_PULL_REQUEST],
68+
"#a": repoAddresses,
69+
limit: 2_000,
70+
}),
71+
relayClient.fetchEvents({
72+
kinds: [KIND_GIT_PR_UPDATE],
73+
"#a": repoAddresses,
74+
limit: 2_000,
75+
}),
76+
relayClient.fetchEvents({
77+
kinds: [KIND_TEXT_NOTE],
78+
"#a": repoAddresses,
79+
limit: 2_000,
80+
}),
81+
relayClient.fetchEvents({
82+
kinds: [
83+
KIND_GIT_STATUS_OPEN,
84+
KIND_GIT_STATUS_MERGED,
85+
KIND_GIT_STATUS_CLOSED,
86+
KIND_GIT_STATUS_DRAFT,
87+
],
88+
"#a": repoAddresses,
89+
limit: 2_000,
90+
}),
91+
]);
92+
93+
if (rootResult.status === "rejected") {
94+
throw rootResult.reason instanceof Error
95+
? rootResult.reason
96+
: new Error("Could not load project issues and pull requests.");
97+
}
98+
99+
const updateEvents =
100+
updateResult.status === "fulfilled" ? updateResult.value : [];
101+
const commentEvents =
102+
commentResult.status === "fulfilled" ? commentResult.value : [];
103+
const statusEvents =
104+
statusResult.status === "fulfilled" ? statusResult.value : [];
105+
const rootsByRepo = groupByRepoAddress(rootResult.value);
106+
const updatesByRepo = groupByRepoAddress(updateEvents);
107+
const commentsByRepo = groupByRepoAddress(commentEvents);
108+
const statusesByRepo = groupByRepoAddress(statusEvents);
109+
110+
const pullRequests = projects
111+
.flatMap((project) =>
112+
projectPullRequestEventsToPullRequests(
113+
(rootsByRepo.get(project.repoAddress) ?? []).filter(
114+
(event) => event.kind === KIND_GIT_PULL_REQUEST,
115+
),
116+
updatesByRepo.get(project.repoAddress) ?? [],
117+
commentsByRepo.get(project.repoAddress) ?? [],
118+
statusesByRepo.get(project.repoAddress) ?? [],
119+
).map((pullRequest) => ({ project, pullRequest })),
120+
)
121+
.sort(
122+
(left, right) => right.pullRequest.updatedAt - left.pullRequest.updatedAt,
123+
);
124+
const issues = projects
125+
.flatMap((project) =>
126+
projectIssueEventsToIssues(
127+
(rootsByRepo.get(project.repoAddress) ?? []).filter(
128+
(event) => event.kind === KIND_GIT_ISSUE,
129+
),
130+
statusesByRepo.get(project.repoAddress) ?? [],
131+
commentsByRepo.get(project.repoAddress) ?? [],
132+
).map((issue) => ({ project, issue })),
133+
)
134+
.sort((left, right) => right.issue.updatedAt - left.issue.updatedAt);
135+
const sharedFailedSections: ProjectWorkItemSection[] = [];
136+
if (commentResult.status === "rejected") {
137+
sharedFailedSections.push("comments");
138+
}
139+
if (statusResult.status === "rejected") {
140+
sharedFailedSections.push("statuses");
141+
}
142+
const pullRequestFailedSections = [...sharedFailedSections];
143+
if (updateResult.status === "rejected") {
144+
pullRequestFailedSections.unshift("pull-request-updates");
145+
}
146+
147+
return {
148+
issues: {
149+
items: issues,
150+
failedSections: sharedFailedSections,
151+
},
152+
pullRequests: {
153+
items: pullRequests,
154+
failedSections: pullRequestFailedSections,
155+
},
156+
};
157+
}

‎desktop/src/features/projects/pullRequestReviews.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export function useProjectPullRequestWriteInvalidation(
160160
queryKey: ["project", project?.id ?? "none", "pull-requests"],
161161
});
162162
void queryClient.invalidateQueries({
163-
queryKey: ["projects", "pull-requests"],
163+
queryKey: ["projects", "work-items"],
164164
});
165165
void queryClient.invalidateQueries({
166166
queryKey: ["projects", "activity-summaries"],

‎desktop/src/features/projects/ui/ProjectsIssuesList.tsx‎

Lines changed: 51 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type {
55
ProjectIssue,
66
ProjectIssueListItem,
77
} from "@/features/projects/hooks";
8+
import type { ProjectWorkItemSection } from "@/features/projects/projectWorkItems";
89
import {
910
resolveUserLabel,
1011
type UserProfileLookup,
@@ -15,6 +16,7 @@ import { Card } from "@/shared/ui/card";
1516
import { DropdownMenuItem } from "@/shared/ui/dropdown-menu";
1617
import { ProjectEventTypeIcon } from "./ProjectEventTypeIcon";
1718
import { ProjectListRowMenu } from "./ProjectListRowMenu";
19+
import { ProjectsWorkItemsLoadNotice } from "./ProjectsWorkItemsLoadNotice";
1820
import {
1921
PROJECT_LIST_CONTAINER_CLASS,
2022
PROJECT_LIST_ROW_CLASS,
@@ -27,8 +29,12 @@ import {
2729
} from "./projectListRowStyles";
2830

2931
type ProjectsIssuesListProps = {
32+
error: unknown;
33+
failedSections: ProjectWorkItemSection[];
3034
isLoading: boolean;
35+
isRetrying: boolean;
3136
onOpen: (project: Project, issue: ProjectIssue) => void;
37+
onRetry: () => void;
3238
profiles?: UserProfileLookup;
3339
issues: ProjectIssueListItem[];
3440
viewMode: "grid" | "list";
@@ -228,9 +234,13 @@ function IssueListRow({
228234
}
229235

230236
export function ProjectsIssuesList({
237+
error,
238+
failedSections,
231239
isLoading,
240+
isRetrying,
232241
issues,
233242
onOpen,
243+
onRetry,
234244
profiles,
235245
viewMode,
236246
}: ProjectsIssuesListProps) {
@@ -242,19 +252,56 @@ export function ProjectsIssuesList({
242252
);
243253
}
244254

255+
const loadNotice = (
256+
<ProjectsWorkItemsLoadNotice
257+
error={error}
258+
failedSections={failedSections}
259+
isRetrying={isRetrying}
260+
onRetry={onRetry}
261+
subject="issues"
262+
/>
263+
);
264+
265+
if (error && issues.length === 0) {
266+
return loadNotice;
267+
}
268+
245269
if (issues.length === 0) {
246270
return (
247-
<div className="border border-dashed border-border/60 px-4 py-12 text-center text-sm text-muted-foreground">
248-
No issues yet.
271+
<div className="space-y-3">
272+
{loadNotice}
273+
<div className="border border-dashed border-border/60 px-4 py-12 text-center text-sm text-muted-foreground">
274+
No issues yet.
275+
</div>
249276
</div>
250277
);
251278
}
252279

253280
if (viewMode === "grid") {
254281
return (
255-
<div className="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
282+
<div className="space-y-3">
283+
{loadNotice}
284+
<div className="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
285+
{issues.map(({ project, issue }) => (
286+
<IssueGridCard
287+
issue={issue}
288+
key={issue.id}
289+
onOpen={onOpen}
290+
profiles={profiles}
291+
project={project}
292+
/>
293+
))}
294+
</div>
295+
</div>
296+
);
297+
}
298+
299+
return (
300+
<div className="space-y-3">
301+
{loadNotice}
302+
<div className={PROJECT_LIST_CONTAINER_CLASS}>
256303
{issues.map(({ project, issue }) => (
257-
<IssueGridCard
304+
<IssueListRow
258305
issue={issue}
259306
key={issue.id}
260307
onOpen={onOpen}
@@ -263,20 +310,6 @@ export function ProjectsIssuesList({
263310
/>
264311
))}
265312
</div>
266-
);
267-
}
268-
269-
return (
270-
<div className={PROJECT_LIST_CONTAINER_CLASS}>
271-
{issues.map(({ project, issue }) => (
272-
<IssueListRow
273-
issue={issue}
274-
key={issue.id}
275-
onOpen={onOpen}
276-
profiles={profiles}
277-
project={project}
278-
/>
279-
))}
280313
</div>
281314
);
282315
}

0 commit comments

Comments
 (0)