Skip to content

Commit f516caa

Browse files
TonybynMp4claude
andcommitted
fix(gitlab): the failing-checks list filter works
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent b183048 commit f516caa

8 files changed

Lines changed: 184 additions & 102 deletions

File tree

‎apps/server/src/pullRequest/PullRequestService.test.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,7 +3481,7 @@ it.effect("hands a host's own resume position back on the next read", () =>
34813481
}),
34823482
);
34833483

3484-
it.effect("judges the review filter only on a host that summarises its reviews", () =>
3484+
it.effect("judges review and checks filters only on a host that summarises them", () =>
34853485
Effect.gen(function* () {
34863486
const service = yield* makeService({
34873487
projects: [
@@ -3499,10 +3499,15 @@ it.effect("judges the review filter only on a host that summarises its reviews",
34993499
listChangeRequests: () =>
35003500
Effect.succeed({
35013501
items: [
3502-
{ ...changeRequest(1, "2026-07-02T00:00:00Z"), reviewDecision: null },
3502+
{
3503+
...changeRequest(1, "2026-07-02T00:00:00Z"),
3504+
reviewDecision: null,
3505+
checksState: "failing" as const,
3506+
},
35033507
{
35043508
...changeRequest(2, "2026-07-02T00:00:00Z"),
35053509
reviewDecision: "approved" as const,
3510+
checksState: null,
35063511
},
35073512
],
35083513
truncated: false,
@@ -3525,6 +3530,12 @@ it.effect("judges the review filter only on a host that summarises its reviews",
35253530

35263531
const approved = yield* service.list({ state: "open", filters: { review: "approved" } });
35273532
assert.deepStrictEqual(approved.entries.map((entry) => entry.number).toSorted(), [2, 3]);
3533+
3534+
const failing = yield* service.list({ state: "open", filters: { checks: "failing" } });
3535+
assert.deepStrictEqual(failing.entries.map((entry) => entry.number).toSorted(), [1, 3]);
3536+
3537+
const passing = yield* service.list({ state: "open", filters: { checks: "passing" } });
3538+
assert.deepStrictEqual(passing.entries.map((entry) => entry.number).toSorted(), [3]);
35283539
}),
35293540
);
35303541

‎apps/server/src/pullRequest/PullRequestService.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,6 @@ export const make = Effect.gen(function* () {
11931193
{ concurrency: REPOSITORY_CONCURRENCY },
11941194
);
11951195

1196-
// Only the host can filter checks; listed rows have no check state.
11971196
const matchesRowFilters = (
11981197
item: ProviderChangeRequest,
11991198
filters: PullRequestListFilters | undefined,
@@ -1209,6 +1208,9 @@ export const make = Effect.gen(function* () {
12091208
(filters.review === "none"
12101209
? item.reviewDecision === null
12111210
: item.reviewDecision === filters.review)) &&
1211+
(filters.checks === undefined ||
1212+
item.checksState === undefined ||
1213+
item.checksState === filters.checks) &&
12121214
(filters.labels === undefined || filters.labels.every((group) => group.some(holds))) &&
12131215
(filters.excludedLabels === undefined || !filters.excludedLabels.some(holds)) &&
12141216
(filters.author === undefined ||

‎packages/source-control-gitlab/src/server/GitLabPullRequestCli.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,16 @@ layer("GitLabPullRequestCli.layer", (it) => {
121121
});
122122
const cli = yield* GitLabPullRequestCli.GitLabPullRequestCli;
123123
const reference = { cwd: "/w", repository: "acme/web", host: "gitlab.internal" };
124-
expect(yield* cli.getReviewDecisions({ ...reference, numbers: [] })).toEqual(new Map());
124+
expect(yield* cli.getListStates({ ...reference, numbers: [] })).toEqual(new Map());
125125
expect(mockedExecute).not.toHaveBeenCalled();
126-
const decisions = yield* cli.getReviewDecisions({
126+
const decisions = yield* cli.getListStates({
127127
...reference,
128128
numbers: Array.from({ length: 101 }, (_, index) => index + 1),
129129
});
130130
expect(callAt(0).host).toBe(reference.host);
131131
expect(callAt(1).host).toBe(reference.host);
132132
expect(decisions.size).toBe(101);
133-
expect(decisions.get(101)).toBe("approved");
133+
expect(decisions.get(101)).toEqual({ reviewDecision: "approved", checksState: null });
134134
expect(mockedExecute).toHaveBeenCalledTimes(2);
135135
expect(
136136
[0, 1].map((index) => JSON.parse(callAt(index).stdin ?? "{}").variables.iids.length),

‎packages/source-control-gitlab/src/server/GitLabPullRequestCli.ts‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import type {
2020
PullRequestReaction,
2121
PullRequestReactionContent,
2222
PullRequestReviewCommentDraft,
23-
PullRequestReviewDecision,
2423
PullRequestReviewPosition,
2524
PullRequestReviewThread,
2625
PullRequestReviewVerdict,
@@ -47,17 +46,18 @@ import {
4746
decodeProjectLabelsJson,
4847
decodeProjectUsersJson,
4948
decodeRepositoryBlobsJson,
50-
decodeReviewDecisionsJson,
49+
decodeListStatesJson,
5150
decodeTriggerJobChecksJson,
5251
decodeViewerJson,
5352
gitLabAwardName,
5453
MERGE_REQUEST_FILE_STATS_GRAPHQL_QUERY,
5554
MERGE_REQUEST_STATS_GRAPHQL_QUERY,
5655
REPOSITORY_BLOBS_GRAPHQL_QUERY,
57-
REVIEW_DECISIONS_GRAPHQL_QUERY,
56+
LIST_STATES_GRAPHQL_QUERY,
5857
type GitLabDiffRefs,
5958
type GitLabMergeRequestDetail,
6059
type GitLabMergeRequestListItem,
60+
type GitLabMergeRequestListState,
6161
type GitLabProjectUsers,
6262
} from "./gitLabMergeRequestJson.ts";
6363
import type {
@@ -254,13 +254,14 @@ export class GitLabPullRequestCli extends Context.Service<
254254
readonly downstreamChecks?: boolean;
255255
}) => Effect.Effect<GitLabMergeRequestDetail, GitLabPullRequestCliError>;
256256

257-
readonly getReviewDecisions: (input: {
257+
/** Approval and head pipeline state, read in one GraphQL request per 100 merge requests. */
258+
readonly getListStates: (input: {
258259
readonly cwd: string;
259260
readonly host?: string | undefined;
260261
readonly repository: string;
261262
readonly numbers: ReadonlyArray<number>;
262263
}) => Effect.Effect<
263-
ReadonlyMap<number, PullRequestReviewDecision | null>,
264+
ReadonlyMap<number, GitLabMergeRequestListState>,
264265
GitLabPullRequestCliError
265266
>;
266267

@@ -1308,22 +1309,19 @@ export const make = Effect.gen(function* () {
13081309
}),
13091310
);
13101311

1311-
const reviewDecisionsOf = (input: {
1312+
const listStatesOf = (input: {
13121313
readonly cwd: string;
13131314
readonly host?: string | undefined;
13141315
readonly repository: string;
13151316
readonly numbers: ReadonlyArray<number>;
1316-
}): Effect.Effect<
1317-
ReadonlyMap<number, PullRequestReviewDecision | null>,
1318-
GitLabPullRequestCliError
1319-
> =>
1317+
}): Effect.Effect<ReadonlyMap<number, GitLabMergeRequestListState>, GitLabPullRequestCliError> =>
13201318
graphqlRead({
13211319
cwd: input.cwd,
13221320
host: input.host,
1323-
operation: "getReviewDecisions",
1324-
query: REVIEW_DECISIONS_GRAPHQL_QUERY,
1321+
operation: "getListStates",
1322+
query: LIST_STATES_GRAPHQL_QUERY,
13251323
variables: { fullPath: input.repository, iids: input.numbers.map(String) },
1326-
decode: decodeReviewDecisionsJson,
1324+
decode: decodeListStatesJson,
13271325
});
13281326

13291327
const viewerUsername = (input: { readonly cwd: string; readonly host?: string | undefined }) =>
@@ -1369,12 +1367,12 @@ export const make = Effect.gen(function* () {
13691367
},
13701368
),
13711369

1372-
getReviewDecisions: Effect.fn("GitLabPullRequestCli.getReviewDecisions")(function (input) {
1370+
getListStates: Effect.fn("GitLabPullRequestCli.getListStates")(function (input) {
13731371
const batches: Array<ReadonlyArray<number>> = [];
13741372
for (let at = 0; at < input.numbers.length; at += MAX_PAGE_SIZE) {
13751373
batches.push(input.numbers.slice(at, at + MAX_PAGE_SIZE));
13761374
}
1377-
return Effect.forEach(batches, (numbers) => reviewDecisionsOf({ ...input, numbers }), {
1375+
return Effect.forEach(batches, (numbers) => listStatesOf({ ...input, numbers }), {
13781376
concurrency: 2,
13791377
}).pipe(Effect.map((pages) => new Map(pages.flatMap((page) => [...page]))));
13801378
}),

‎packages/source-control-gitlab/src/server/GitLabPullRequestProvider.test.ts‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ describe("getChangeRequest base freshness", () => {
187187
Effect.provide(
188188
Layer.mock(GitLabPullRequestCli.GitLabPullRequestCli)({
189189
getMergeRequestDetail: () => Effect.succeed(detail),
190-
getReviewDecisions: () => Effect.succeed(new Map()),
190+
getListStates: () => Effect.succeed(new Map()),
191191

192192
listMergeRequestStats: () => Effect.succeed([]),
193193
}),
@@ -288,7 +288,7 @@ describe("getChangeRequest base freshness", () => {
288288
Layer.mock(GitLabPullRequestCli.GitLabPullRequestCli)({
289289
getMergeRequestDetail: () => Effect.succeed(detail),
290290
getProjectMergeCapabilities: () => Effect.die("linked threads skip merge settings"),
291-
getReviewDecisions: () => Effect.succeed(new Map()),
291+
getListStates: () => Effect.succeed(new Map()),
292292
listMergeRequestStats: () =>
293293
Effect.succeed([{ repository: "acme/web", number: 7, additions: 40, deletions: 2 }]),
294294
}),
@@ -336,7 +336,7 @@ describe("merge request reads", () => {
336336
Effect.provide(
337337
Layer.mock(GitLabPullRequestCli.GitLabPullRequestCli)({
338338
listMergeRequestStats: () => Effect.succeed([]),
339-
getReviewDecisions: () => Effect.succeed(new Map()),
339+
getListStates: () => Effect.succeed(new Map()),
340340
getMergeRequestDetail: (input) =>
341341
Effect.sync(() => {
342342
calls.detail += 1;
@@ -594,7 +594,7 @@ describe("review decisions", () => {
594594
reviewerIds: [],
595595
};
596596
const providerWith = (
597-
getReviewDecisions: GitLabPullRequestCli.GitLabPullRequestCli["Service"]["getReviewDecisions"],
597+
getListStates: GitLabPullRequestCli.GitLabPullRequestCli["Service"]["getListStates"],
598598
) =>
599599
make.pipe(
600600
Effect.provide(
@@ -606,7 +606,7 @@ describe("review decisions", () => {
606606
cursorAdvance: 2,
607607
}),
608608
getMergeRequestDetail: () => Effect.succeed(detail),
609-
getReviewDecisions,
609+
getListStates,
610610
listMergeRequestStats: () =>
611611
Effect.succeed([{ repository: "acme/web", number: 7, additions: 40, deletions: 2 }]),
612612
}),
@@ -622,26 +622,33 @@ describe("review decisions", () => {
622622
limit: 2,
623623
};
624624

625-
it.effect("puts GitLab's approval state on listed and summarized merge requests", () =>
626-
Effect.gen(function* () {
627-
const provider = yield* providerWith((input) => {
628-
expect(input.host).toBe(reference.host);
629-
return Effect.succeed(
630-
new Map([
631-
[7, "approved" as const],
632-
[8, null],
633-
]),
634-
);
635-
});
636-
const listed = yield* provider.listChangeRequests(listing);
637-
assert.isDefined(provider.getChangeRequestSummary);
638-
const summary = yield* provider.getChangeRequestSummary(reference);
639-
640-
expect(listed.items.map(({ reviewDecision }) => reviewDecision)).toEqual(["approved", null]);
641-
expect(summary.reviewDecision).toBe("approved");
642-
expect(summary.additions).toBe(40);
643-
expect(summary.deletions).toBe(2);
644-
}),
625+
it.effect(
626+
"puts GitLab's approval and pipeline state on listed and summarized merge requests",
627+
() =>
628+
Effect.gen(function* () {
629+
const provider = yield* providerWith((input) => {
630+
expect(input.host).toBe(reference.host);
631+
return Effect.succeed(
632+
new Map([
633+
[7, { reviewDecision: "approved" as const, checksState: "failing" as const }],
634+
[8, { reviewDecision: null, checksState: null }],
635+
]),
636+
);
637+
});
638+
const listed = yield* provider.listChangeRequests(listing);
639+
assert.isDefined(provider.getChangeRequestSummary);
640+
const summary = yield* provider.getChangeRequestSummary(reference);
641+
642+
expect(listed.items.map(({ reviewDecision }) => reviewDecision)).toEqual([
643+
"approved",
644+
null,
645+
]);
646+
expect(listed.items.map(({ checksState }) => checksState)).toEqual(["failing", null]);
647+
expect(summary.reviewDecision).toBe("approved");
648+
expect(summary.checksState).toBe("failing");
649+
expect(summary.additions).toBe(40);
650+
expect(summary.deletions).toBe(2);
651+
}),
645652
);
646653

647654
it.effect.each([
@@ -650,7 +657,7 @@ describe("review decisions", () => {
650657
error: new GitLabPullRequestCli.GitLabMergeRequestReadError({
651658
command: "glab",
652659
cwd: "/w",
653-
operation: "getReviewDecisions",
660+
operation: "getListStates",
654661
cause: null,
655662
}),
656663
},

‎packages/source-control-gitlab/src/server/GitLabPullRequestProvider.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import * as Exit from "effect/Exit";
66
import type {
77
PullRequestCapabilities,
88
PullRequestReaction,
9-
PullRequestReviewDecision,
109
PullRequestViewerPermissions,
1110
} from "@t3tools/contracts";
1211

1312
import * as GitLabPullRequestCli from "./GitLabPullRequestCli.ts";
13+
import type { GitLabMergeRequestListState } from "./gitLabMergeRequestJson.ts";
1414
import {
1515
PullRequestProviderError,
1616
type PullRequestProviderFailure,
@@ -181,14 +181,14 @@ export const make = Effect.gen(function* () {
181181
}),
182182
);
183183

184-
// The rows were already read, so even a rate limit only leaves their decision unknown.
185-
const reviewDecisions = (input: Parameters<typeof cli.getReviewDecisions>[0]) =>
186-
cli.getReviewDecisions(input).pipe(
184+
// The rows were already read, so even a rate limit only leaves their states unknown.
185+
const listStates = (input: Parameters<typeof cli.getListStates>[0]) =>
186+
cli.getListStates(input).pipe(
187187
Effect.catch((error) =>
188-
Effect.logWarning("GitLab merge request approval read failed", {
188+
Effect.logWarning("GitLab merge request approval and pipeline read failed", {
189189
repository: input.repository,
190190
reason: error._tag,
191-
}).pipe(Effect.as<ReadonlyMap<number, PullRequestReviewDecision | null>>(new Map())),
191+
}).pipe(Effect.as<ReadonlyMap<number, GitLabMergeRequestListState>>(new Map())),
192192
),
193193
);
194194

@@ -241,15 +241,15 @@ export const make = Effect.gen(function* () {
241241
})
242242
.pipe(
243243
Effect.flatMap((batch) =>
244-
reviewDecisions({
244+
listStates({
245245
cwd: input.cwd,
246246
host: input.host,
247247
repository: input.repository,
248248
numbers: batch.items.map((item) => item.number),
249249
}).pipe(
250-
Effect.map((decisions) => ({
250+
Effect.map((states) => ({
251251
...batch,
252-
items: batch.items.map((item) => withReviewDecision(item, decisions)),
252+
items: batch.items.map((item) => withListState(item, states)),
253253
continues: true,
254254
})),
255255
),
@@ -277,7 +277,7 @@ export const make = Effect.gen(function* () {
277277
Effect.all(
278278
[
279279
mergeRequestWithStats(input),
280-
reviewDecisions({
280+
listStates({
281281
cwd: input.cwd,
282282
host: input.host,
283283
repository: input.repository,
@@ -286,7 +286,7 @@ export const make = Effect.gen(function* () {
286286
],
287287
{ concurrency: 2 },
288288
).pipe(
289-
Effect.map(([mergeRequest, decisions]) => withReviewDecision(mergeRequest, decisions)),
289+
Effect.map(([mergeRequest, states]) => withListState(mergeRequest, states)),
290290
Effect.mapError(fail("getChangeRequestSummary")),
291291
),
292292

@@ -523,10 +523,10 @@ export const make = Effect.gen(function* () {
523523
return provider;
524524
});
525525

526-
function withReviewDecision<Item extends { readonly number: number }>(
526+
function withListState<Item extends { readonly number: number }>(
527527
item: Item,
528-
decisions: ReadonlyMap<number, PullRequestReviewDecision | null>,
529-
): Item & { readonly reviewDecision?: PullRequestReviewDecision | null } {
530-
const reviewDecision = decisions.get(item.number);
531-
return reviewDecision === undefined ? item : { ...item, reviewDecision };
528+
states: ReadonlyMap<number, GitLabMergeRequestListState>,
529+
): Item & Partial<GitLabMergeRequestListState> {
530+
const state = states.get(item.number);
531+
return state === undefined ? item : { ...item, ...state };
532532
}

0 commit comments

Comments
 (0)