Skip to content

fix: actually sort layouts by collection order #3526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tefkah merged 2 commits into from
Mar 9, 2026
Merged

fix: actually sort layouts by collection order #3526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6e94d
fix: actually sort layouts by collection order
tefkah Mar 9, 2026
83e8e74
fix: remove title
tefkah Mar 9, 2026
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
72 changes: 59 additions & 13 deletions server/utils/layouts/layoutPubs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,47 @@ const getPublishDate = (pub: PubWithMetadata): Date | null => {
return pub.customPublishedAt || pub.firstReleaseDate || null;
};

const getLowestRelevantCollectionRank = (
pub: PubWithMetadata,
collectionIdsSet: Set<string> | null,
): string | null => {
let lowestRank: string | null = null;

for (const collectionPub of pub.collectionPubs) {
if (collectionIdsSet && !collectionIdsSet.has(collectionPub.collectionId)) {
continue;
}

const rank = collectionPub.rank || '';
if (lowestRank === null || rank.localeCompare(lowestRank) < 0) {
lowestRank = rank;
}
}

return lowestRank;
};

const compareCollectionRanks = (
aRank: string | null,
bRank: string | null,
direction: PubsQueryOrdering['direction'],
): number => {
if (aRank === null && bRank === null) {
return 0;
}

if (aRank === null) {
return direction === 'ASC' ? 1 : -1;
}

if (bRank === null) {
return direction === 'ASC' ? -1 : 1;
}

const rankComparison = aRank.localeCompare(bRank);
return direction === 'ASC' ? rankComparison : rankComparison * -1;
};

const filterPubsByCollection = (
pubs: PubWithMetadata[],
collectionIds: string[],
Expand Down Expand Up @@ -117,23 +158,28 @@ const sortPubs = (
const sorted = [...pubs];
const ordering = getQueryOrdering(sort);

if (ordering.field === 'collectionRank') {
const collectionIdsSet = collectionIds.length > 0 ? new Set(collectionIds) : null;
const lowestRankByPubId = new Map(
sorted.map((pub) => [pub.id, getLowestRelevantCollectionRank(pub, collectionIdsSet)]),
);

sorted.sort((a, b) =>
compareCollectionRanks(
lowestRankByPubId.get(a.id) ?? null,
lowestRankByPubId.get(b.id) ?? null,
ordering.direction,
),
);

return sorted;
}

sorted.sort((a, b) => {
let aValue: number | null = null;
let bValue: number | null = null;

if (ordering.field === 'collectionRank') {
const getMinRank = (pub: PubWithMetadata) => {
const relevantRanks = pub.collectionPubs
.filter(
(cp) =>
collectionIds.length === 0 || collectionIds.includes(cp.collectionId),
)
.map((cp) => parseFloat(cp.rank));
return relevantRanks.length > 0 ? Math.min(...relevantRanks) : Number.MAX_VALUE;
};
aValue = getMinRank(a);
bValue = getMinRank(b);
} else if (ordering.field === 'creationDate') {
if (ordering.field === 'creationDate') {
aValue = a.createdAt.getTime();
bValue = b.createdAt.getTime();
} else if (ordering.field === 'publishDate') {
Expand Down