Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions packages/client-runtime/src/issueList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,34 @@ describe("issueFilterScopes", () => {
});

describe("groupIssues", () => {
it("sorts by the selected timestamp and keeps order for equal instants", () => {
const tracker = {
tracker: "github",
host: "github.com",
projectCount: 1,
configured: true,
detail: null,
} as IssueTrackerSummary;
const first = entry({
key: "first",
createdAt: "2026-10-01T02:00:00+02:00",
updatedAt: "2026-10-02T00:00:00Z",
});
const second = entry({ key: "second", createdAt: "2026-10-01T00:00:00Z" });
const newer = entry({ key: "newer", createdAt: "2026-10-01T01:00:00Z" });
const held = holdIssuePages(
[
[environmentId, answer({ trackers: [tracker], entries: [first, second] })],
["env-2" as EnvironmentId, answer({ trackers: [tracker], entries: [newer] })],
],
new Map(),
);
const keys = (sort: "created" | "updated") =>
groupIssues(held, "", [], sort)[0]?.rows.map((row) => row.key);
expect(keys("created")).toEqual(["newer", "first", "second"]);
expect(keys("updated")).toEqual(["first", "second", "newer"]);
});

it("lists an issue once when two environments hold the same repository", () => {
const github = {
tracker: "github",
Expand Down
14 changes: 13 additions & 1 deletion packages/client-runtime/src/issueList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@ export function issueOrder(sort: IssueListSort) {
return (left: IssueListEntry, right: IssueListEntry) => date(right) - date(left);
}

function sortIssueRows(
rows: EnvironmentIssueEntry[],
sort: IssueListSort,
): EnvironmentIssueEntry[] {
if (rows.length < 2) return rows;
const field = sort === "created" ? "createdAt" : "updatedAt";
return rows
.map((row) => ({ row, timestamp: Date.parse(row[field]) }))
.sort((left, right) => right.timestamp - left.timestamp)
.map(({ row }) => row);
}

export function groupIssues(
held: ReadonlyMap<EnvironmentId, HeldIssuePage>,
query: string,
Expand Down Expand Up @@ -158,7 +170,7 @@ export function groupIssues(
group?.errors.push({ ...error, environmentId });
}
}
for (const group of byTracker.values()) group.rows.sort(issueOrder(sort));
for (const group of byTracker.values()) group.rows = sortIssueRows(group.rows, sort);
return [...byTracker.values()].sort((a, b) =>
issueTrackerKey(a.tracker).localeCompare(issueTrackerKey(b.tracker)),
);
Expand Down
Loading