Skip to content

Commit 5884d43

Browse files
only21milcodexclaude
authored
fix(web): sort pull request lists and timelines by time (pingdotgg#23588)
Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 0997948 commit 5884d43

6 files changed

Lines changed: 56 additions & 19 deletions

File tree

‎apps/web/src/components/pullRequest/PullRequestsPage.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import {
4343
pullRequestOverrideAfterAction,
4444
reusePullRequestEntries,
4545
settlePullRequestOverrides,
46+
comparePullRequestsByRecency,
4647
largestPullRequestReadCount,
4748
} from "./pullRequestList.logic";
4849
import {
@@ -564,7 +565,7 @@ export function PullRequestsPage() {
564565
const held = new Set(ordered.entries.map(pullRequestEntryKey));
565566
const arrived = answered.entries.filter((entry) => !held.has(pullRequestEntryKey(entry)));
566567
const appended = rankPullRequestMatches(
567-
arrived.toSorted((left, right) => right.updatedAt.localeCompare(left.updatedAt)),
568+
arrived.toSorted(comparePullRequestsByRecency),
568569
sentParsed.text,
569570
);
570571
setOrdered({ key: filterKey, source: answered, entries: [...ordered.entries, ...appended] });

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,19 @@ describe("review verdicts", () => {
316316
});
317317

318318
describe("pull request timeline", () => {
319+
it("orders host timestamps by instant across offsets and fractional seconds", () => {
320+
const events = buildPullRequestTimeline({
321+
...TIMELINE_SOURCE,
322+
createdAt: "2026-07-05T01:00:00+02:00",
323+
commits: [{ oid: "commit", messageHeadline: "", committedDate: "2026-07-05T00:30:00Z" }],
324+
comments: [{ ...TIMELINE_SOURCE.comments[0]!, createdAt: "2026-07-05T00:30:00.5Z" }],
325+
mergedAt: null,
326+
closedAt: null,
327+
});
328+
329+
expect(events.map((event) => event.id)).toEqual(["c1", "commit", "created"]);
330+
});
331+
319332
it("drops a body that is nothing but a bot's HTML comment, and keeps one that says more", () => {
320333
const events = buildPullRequestTimeline({
321334
...TIMELINE_SOURCE,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ export function buildPullRequestTimeline(
753753
},
754754
]
755755
: []),
756-
].toSorted((left, right) => right.at.localeCompare(left.at));
756+
].toSorted((left, right) => (instant(right.at) || 0) - (instant(left.at) || 0));
757757
}
758758

759759
const FINDING_LIMIT = 20;

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,20 @@ describe("merging the environments' own listings", () => {
406406
...overrides,
407407
}) as Parameters<typeof mergePullRequestLists>[0][number][1];
408408

409+
it("orders host timestamps by instant across offsets and fractional seconds", () => {
410+
const entries = [
411+
entry({ number: 1, updatedAt: "2026-07-05T01:00:00+02:00" }),
412+
entry({ number: 2, updatedAt: "2026-07-05T00:30:00Z" }),
413+
entry({ number: 3, updatedAt: "2026-07-05T00:30:00.5Z" }),
414+
];
415+
const merged = mergePullRequestLists([
416+
[ENV_1, answer({ entries: entries.slice(0, 2) })],
417+
[ENV_2, answer({ entries: entries.slice(2) })],
418+
]);
419+
420+
expect(merged?.entries.map((row) => row.number)).toEqual([3, 2, 1]);
421+
});
422+
409423
it("tags every row with the environment that read it, newest first", () => {
410424
const merged = mergePullRequestLists([
411425
[ENV_1, answer({ entries: [entry({ number: 1, updatedAt: "2026-07-01T00:00:00Z" })] })],

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

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,16 @@ export function partitionPullRequestsWithPriority<Entry extends PullRequestListE
469469
others.push(entry);
470470
}
471471
}
472-
const byRecency = (left: Entry, right: Entry) => right.updatedAt.localeCompare(left.updatedAt);
473472
return (
474473
[
475-
{ key: "authored", entries: [...authoredByKey.values()].toSorted(byRecency) },
476-
{ key: "reviewRequested", entries: [...reviewByKey.values()].toSorted(byRecency) },
474+
{
475+
key: "authored",
476+
entries: [...authoredByKey.values()].toSorted(comparePullRequestsByRecency),
477+
},
478+
{
479+
key: "reviewRequested",
480+
entries: [...reviewByKey.values()].toSorted(comparePullRequestsByRecency),
481+
},
477482
{ key: "others", entries: others },
478483
] as const
479484
)
@@ -564,7 +569,7 @@ export function mergePullRequestLists(
564569
return {
565570
viewers,
566571
providers: [...providers.values()],
567-
entries: entries.toSorted((left, right) => right.updatedAt.localeCompare(left.updatedAt)),
572+
entries: entries.toSorted(comparePullRequestsByRecency),
568573
errors,
569574
truncated,
570575
nextCursors,
@@ -660,7 +665,7 @@ export function rankPullRequestMatches<Entry extends PullRequestListEntry>(
660665
if (query.trim().length === 0) return entries;
661666
return entries.toSorted((left, right) => {
662667
const byScore = scorePullRequestMatch(right, query) - scorePullRequestMatch(left, query);
663-
return byScore !== 0 ? byScore : right.updatedAt.localeCompare(left.updatedAt);
668+
return byScore !== 0 ? byScore : comparePullRequestsByRecency(left, right);
664669
});
665670
}
666671

@@ -681,24 +686,29 @@ export function rankPullRequestsByMergeReadiness<Entry extends PullRequestListEn
681686
if (byTier !== 0) return byTier;
682687
const measured = Number(hasMeasuredSize(right)) - Number(hasMeasuredSize(left));
683688
const sized = left.additions + left.deletions - (right.additions + right.deletions);
684-
return measured || sized || right.updatedAt.localeCompare(left.updatedAt);
689+
return measured || sized || comparePullRequestsByRecency(left, right);
685690
});
686691
}
687692

693+
export function comparePullRequestsByRecency(
694+
left: PullRequestListEntry,
695+
right: PullRequestListEntry,
696+
) {
697+
const leftUpdated = toSortableTimestamp(left.updatedAt);
698+
const rightUpdated = toSortableTimestamp(right.updatedAt);
699+
const measured = Number(leftUpdated === null) - Number(rightUpdated === null);
700+
if (measured !== 0) return measured;
701+
if (leftUpdated === null || rightUpdated === null) return 0;
702+
return rightUpdated - leftUpdated;
703+
}
704+
688705
function rankByTierThenRecency<Entry extends PullRequestListEntry>(
689706
entries: ReadonlyArray<Entry>,
690707
tier: (entry: Entry) => number,
691708
): ReadonlyArray<Entry> {
692-
const timestamp = (entry: Entry) => toSortableTimestamp(entry.updatedAt);
693709
return entries.toSorted((left, right) => {
694710
const byTier = tier(left) - tier(right);
695-
if (byTier !== 0) return byTier;
696-
const leftUpdated = timestamp(left);
697-
const rightUpdated = timestamp(right);
698-
const measured = Number(leftUpdated === null) - Number(rightUpdated === null);
699-
if (measured !== 0) return measured;
700-
if (leftUpdated === null || rightUpdated === null) return 0;
701-
return rightUpdated - leftUpdated;
711+
return byTier !== 0 ? byTier : comparePullRequestsByRecency(left, right);
702712
});
703713
}
704714

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import type {
77
import type { PullRequestTabStatusSeed } from "~/components/RightPanelTabs";
88
import { pullRequestSurfaceId } from "~/rightPanelStore";
99
import {
10+
comparePullRequestsByRecency,
1011
filterPullRequestsByInvolvement,
1112
groupPullRequestsByInvolvement,
1213
matchesPullRequestFilters,
@@ -65,9 +66,7 @@ export function pullRequestGroups({
6566
)
6667
: involvementEntries;
6768
if (text.length === 0) {
68-
return narrowedEntries.toSorted((left, right) =>
69-
right.updatedAt.localeCompare(left.updatedAt),
70-
);
69+
return narrowedEntries.toSorted(comparePullRequestsByRecency);
7170
}
7271
return narrowedEntries.filter(
7372
(entry) =>

0 commit comments

Comments
 (0)