Skip to content

Commit 6491117

Browse files
only21milcodex
andcommitted
fix(web): sort pull request activity by timestamp value
Co-Authored-By: GPT-6.1 Sol <[email protected]>
1 parent 2a6e85e commit 6491117

4 files changed

Lines changed: 30 additions & 27 deletions

File tree

‎apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,12 +317,8 @@ describe("pull request timeline", () => {
317317
const events = buildPullRequestTimeline({
318318
...TIMELINE_SOURCE,
319319
createdAt: "2026-07-05T01:00:00+02:00",
320-
commits: [
321-
{ oid: "commit", messageHeadline: "", committedDate: "2026-07-05T00:30:00Z" },
322-
],
323-
comments: [
324-
{ ...TIMELINE_SOURCE.comments[0]!, createdAt: "2026-07-05T00:30:00.5Z" },
325-
],
320+
commits: [{ oid: "commit", messageHeadline: "", committedDate: "2026-07-05T00:30:00Z" }],
321+
comments: [{ ...TIMELINE_SOURCE.comments[0]!, createdAt: "2026-07-05T00:30:00.5Z" }],
326322
mergedAt: null,
327323
closedAt: null,
328324
});

‎apps/web/src/components/pullRequest/pullRequestDetail.logic.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ export function buildPullRequestTimeline(
762762
},
763763
]
764764
: []),
765-
].toSorted((left, right) => right.at.localeCompare(left.at));
765+
].toSorted((left, right) => instant(right.at) - instant(left.at));
766766
}
767767

768768
const FINDING_LIMIT = 20;

‎apps/web/src/components/pullRequest/pullRequestList.logic.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -482,12 +482,12 @@ describe("merging the environments' own listings", () => {
482482

483483
expect.soft(merged?.entries.map((row) => row.number)).toEqual([3, 2, 1]);
484484
expect.soft(groups[0]?.entries.map((row) => row.number)).toEqual([3, 2, 1]);
485-
expect.soft(rankPullRequestMatches(entries, "pull").map((row) => row.number)).toEqual([
486-
3, 2, 1,
487-
]);
488-
expect.soft(rankPullRequestsByMergeReadiness(entries).map((row) => row.number)).toEqual([
489-
3, 2, 1,
490-
]);
485+
expect
486+
.soft(rankPullRequestMatches(entries, "pull").map((row) => row.number))
487+
.toEqual([3, 2, 1]);
488+
expect
489+
.soft(rankPullRequestsByMergeReadiness(entries).map((row) => row.number))
490+
.toEqual([3, 2, 1]);
491491
});
492492

493493
it("tags every row with the environment that read it, newest first", () => {

‎apps/web/src/components/pullRequest/pullRequestList.logic.ts‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,16 @@ export function partitionPullRequestsWithPriority<Entry extends PullRequestListE
404404
others.push(entry);
405405
}
406406
}
407-
const byRecency = (left: Entry, right: Entry) => right.updatedAt.localeCompare(left.updatedAt);
408407
return (
409408
[
410-
{ key: "authored", entries: [...authoredByKey.values()].toSorted(byRecency) },
411-
{ key: "reviewRequested", entries: [...reviewByKey.values()].toSorted(byRecency) },
409+
{
410+
key: "authored",
411+
entries: [...authoredByKey.values()].toSorted(comparePullRequestsByRecency),
412+
},
413+
{
414+
key: "reviewRequested",
415+
entries: [...reviewByKey.values()].toSorted(comparePullRequestsByRecency),
416+
},
412417
{ key: "others", entries: others },
413418
] as const
414419
)
@@ -503,7 +508,7 @@ export function mergePullRequestLists(
503508
return {
504509
viewers,
505510
providers: [...providers.values()],
506-
entries: entries.toSorted((left, right) => right.updatedAt.localeCompare(left.updatedAt)),
511+
entries: entries.toSorted(comparePullRequestsByRecency),
507512
errors,
508513
truncated,
509514
nextCursors,
@@ -697,7 +702,7 @@ export function rankPullRequestMatches<Entry extends PullRequestListEntry>(
697702
if (query.trim().length === 0) return entries;
698703
return entries.toSorted((left, right) => {
699704
const byScore = scorePullRequestMatch(right, query) - scorePullRequestMatch(left, query);
700-
return byScore !== 0 ? byScore : right.updatedAt.localeCompare(left.updatedAt);
705+
return byScore !== 0 ? byScore : comparePullRequestsByRecency(left, right);
701706
});
702707
}
703708

@@ -718,24 +723,26 @@ export function rankPullRequestsByMergeReadiness<Entry extends PullRequestListEn
718723
if (byTier !== 0) return byTier;
719724
const measured = Number(hasMeasuredSize(right)) - Number(hasMeasuredSize(left));
720725
const sized = left.additions + left.deletions - (right.additions + right.deletions);
721-
return measured || sized || right.updatedAt.localeCompare(left.updatedAt);
726+
return measured || sized || comparePullRequestsByRecency(left, right);
722727
});
723728
}
724729

730+
function comparePullRequestsByRecency(left: PullRequestListEntry, right: PullRequestListEntry) {
731+
const leftUpdated = toSortableTimestamp(left.updatedAt);
732+
const rightUpdated = toSortableTimestamp(right.updatedAt);
733+
const measured = Number(leftUpdated === null) - Number(rightUpdated === null);
734+
if (measured !== 0) return measured;
735+
if (leftUpdated === null || rightUpdated === null) return 0;
736+
return rightUpdated - leftUpdated;
737+
}
738+
725739
function rankByTierThenRecency<Entry extends PullRequestListEntry>(
726740
entries: ReadonlyArray<Entry>,
727741
tier: (entry: Entry) => number,
728742
): ReadonlyArray<Entry> {
729-
const timestamp = (entry: Entry) => toSortableTimestamp(entry.updatedAt);
730743
return entries.toSorted((left, right) => {
731744
const byTier = tier(left) - tier(right);
732-
if (byTier !== 0) return byTier;
733-
const leftUpdated = timestamp(left);
734-
const rightUpdated = timestamp(right);
735-
const measured = Number(leftUpdated === null) - Number(rightUpdated === null);
736-
if (measured !== 0) return measured;
737-
if (leftUpdated === null || rightUpdated === null) return 0;
738-
return rightUpdated - leftUpdated;
745+
return byTier !== 0 ? byTier : comparePullRequestsByRecency(left, right);
739746
});
740747
}
741748

0 commit comments

Comments
 (0)