From 7d2081a8aaad4ee2cfb7ad4eed325fd8188d6107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Wed, 30 Sep 2026 15:25:50 +0200 Subject: [PATCH] Move ref sorting out of the peer selector --- src/components/PeerSelector/Peer.svelte | 20 ++--- .../PeerSelector/PeerSelector.svelte | 60 +++------------ src/lib/refs.ts | 44 +++++++++++ tests/unit/refs.test.ts | 77 +++++++++++++++++++ 4 files changed, 140 insertions(+), 61 deletions(-) create mode 100644 src/lib/refs.ts create mode 100644 tests/unit/refs.test.ts diff --git a/src/components/PeerSelector/Peer.svelte b/src/components/PeerSelector/Peer.svelte index 097085f3b..0bc8169ff 100644 --- a/src/components/PeerSelector/Peer.svelte +++ b/src/components/PeerSelector/Peer.svelte @@ -3,8 +3,9 @@ import type { Remote } from "@bindings/repo/Remote"; import type { Tag } from "@bindings/repo/Tag"; + import { sortedTags } from "@app/lib/refs"; import * as router from "@app/lib/router"; - import { truncateId } from "@app/lib/utils"; + import { formatOid, truncateId } from "@app/lib/utils"; import Icon from "@app/components/Icon.svelte"; import TagIcon from "@app/components/PeerSelector/TagIcon.svelte"; @@ -34,12 +35,11 @@ .sort(([a], [b]) => a.localeCompare(b)) .map(([name, oid]) => ({ name, oid })); } - return Object.entries(remote.tags) - .sort(([nameA, a], [nameB, b]) => { - if (a.timestamp !== b.timestamp) return b.timestamp - a.timestamp; - return nameB.localeCompare(nameA); - }) - .map(([name, tag]) => ({ name, oid: tag.oid, tag })); + return sortedTags(remote.tags).map(([name, tag]) => ({ + name, + oid: tag.oid, + tag, + })); }, ); @@ -50,10 +50,6 @@ revision: name, }); } - - function shortOid(oid: string): string { - return oid.slice(0, 7); - }