Share repo ordering between the sidebar and the inbox

Both toggled pins and ordered pinned repos with their own copies.
This commit is contained in:
Rūdolfs Ošiņš
2026-10-01 18:20:24 +02:00
parent ceeab4e2c6
commit bda26136c9
4 changed files with 145 additions and 86 deletions
+27 -74
View File
@@ -3,11 +3,9 @@
import { array, string } from "zod";
import {
type FilteredRepo,
filterNotifications,
rowIdsOf,
} from "@app/lib/inboxFilter";
import { filterNotifications, rowIdsOf } from "@app/lib/inboxFilter";
import { inboxRepoOrder, togglePinned } from "@app/lib/repoOrdering";
import useLocalStorage from "@app/lib/useLocalStorage.svelte";
import { modifierKey, preserveFocus } from "@app/lib/utils";
import Button from "@app/components/Button.svelte";
@@ -53,7 +51,7 @@
const searchableRepos = $derived(
isFiltering
? notificationsByRepo.filter(r => !hiddenRepos.includes(r.rid))
? notificationsByRepo.filter(r => !hiddenRepos.value.includes(r.rid))
: notificationsByRepo,
);
@@ -89,82 +87,37 @@
: clearByRepo(rid);
}
// Stored data can be anything, so an invalid list reads as empty instead of
// breaking the inbox.
function loadStoredRepos(key: string): string[] {
try {
const parsed = array(string()).safeParse(
JSON.parse(localStorage?.getItem(key) ?? "[]"),
);
return parsed.success ? parsed.data : [];
} catch {
return [];
}
}
let pinnedRepos: string[] = $state(loadPinnedRepos());
let hiddenRepos: string[] = $state(loadHiddenRepos());
function loadPinnedRepos(): string[] {
return loadStoredRepos("pinnedInboxRepos");
}
function updatePinnedRepos(newRepos: string[]) {
pinnedRepos = newRepos;
localStorage.setItem("pinnedInboxRepos", JSON.stringify(newRepos));
}
const pinnedRepos = useLocalStorage(
"pinnedInboxRepos",
array(string()),
[],
!window.localStorage,
);
const hiddenRepos = useLocalStorage(
"hiddenInboxRepos",
array(string()),
[],
!window.localStorage,
);
function togglePin(rid: string) {
const repos = loadPinnedRepos();
if (repos.includes(rid)) {
updatePinnedRepos(repos.filter(r => r !== rid));
} else {
updatePinnedRepos([rid, ...repos]);
}
}
function loadHiddenRepos(): string[] {
return loadStoredRepos("hiddenInboxRepos");
}
function updateHiddenRepos(newRepos: string[]) {
hiddenRepos = newRepos;
localStorage.setItem("hiddenInboxRepos", JSON.stringify(newRepos));
pinnedRepos.value = togglePinned(pinnedRepos.value, rid);
}
function toggleHide(rid: string) {
const repos = loadHiddenRepos();
if (repos.includes(rid)) {
updateHiddenRepos(repos.filter(r => r !== rid));
} else {
updateHiddenRepos([rid, ...repos]);
}
hiddenRepos.value = togglePinned(hiddenRepos.value, rid);
}
const displayRepos = $derived(
sortedRepos(filteredRepos, pinnedRepos, hiddenRepos),
inboxRepoOrder(
filteredRepos,
pinnedRepos.value,
hiddenRepos.value,
r => r.repo.rid,
r => r.repo.name,
),
);
function sortedRepos(
allRepos: FilteredRepo[],
pinned: string[],
hidden: string[],
) {
// Preserve pinning order.
const pinnedRepos = pinned
.map(p => allRepos.find(r => r.repo.rid === p))
.filter((r): r is FilteredRepo => r !== undefined);
const sortedRepos = allRepos
.filter(r => !pinned.includes(r.repo.rid) && !hidden.includes(r.repo.rid))
.sort((a, b) => a.repo.name.localeCompare(b.repo.name));
const hiddenRepos = allRepos
.filter(r => hidden.includes(r.repo.rid))
.sort((a, b) => a.repo.name.localeCompare(b.repo.name));
return [...pinnedRepos, ...sortedRepos, ...hiddenRepos];
}
function loadedNotificationCount() {
return notificationsByRepo.reduce((acc, repo) => {
return acc + repo.count;
@@ -275,9 +228,9 @@
excludeGroup={isFiltering ? excludeGroup : undefined}
{isFiltering}
groupedNotifications={r.groups}
hidden={hiddenRepos.includes(r.repo.rid)}
hidden={hiddenRepos.value.includes(r.repo.rid)}
name={r.repo.name}
pinned={pinnedRepos.includes(r.repo.rid)}
pinned={pinnedRepos.value.includes(r.repo.rid)}
rid={r.repo.rid}
{clearByIds}
clearByRepo={effectiveClearByRepo}
+4 -12
View File
@@ -3,6 +3,7 @@
import { array, boolean, string } from "zod";
import { pinnedFirst, pinnedIn, togglePinned } from "@app/lib/repoOrdering";
import useLocalStorage from "@app/lib/useLocalStorage.svelte";
let filterOpen = $state(false);
@@ -23,10 +24,7 @@
);
function pinnedFrom(repos: RepoSummary[]): RepoSummary[] {
const byRid = new Map(repos.map(r => [r.rid, r]));
return pinnedRepoIds.value
.map(rid => byRid.get(rid))
.filter((r): r is RepoSummary => r !== undefined);
return pinnedIn(repos, pinnedRepoIds.value, r => r.rid);
}
// The sidebar's top-to-bottom order: pinned repos first, in the order they
@@ -34,9 +32,7 @@
// filter query, which is transient, so the numbering stays put while typing
// in it.
function orderRepos(repos: RepoSummary[]): RepoSummary[] {
return pinnedFrom(repos).concat(
repos.filter(r => !pinnedRepoIds.value.includes(r.rid)),
);
return pinnedFirst(repos, pinnedRepoIds.value, r => r.rid);
}
export function revealRepoInSidebar(rid: string) {
@@ -343,11 +339,7 @@
function togglePin(rid: string) {
withPinAnimation(() => {
if (pinnedRepoIds.value.includes(rid)) {
pinnedRepoIds.value = pinnedRepoIds.value.filter(r => r !== rid);
} else {
pinnedRepoIds.value = [rid, ...pinnedRepoIds.value];
}
pinnedRepoIds.value = togglePinned(pinnedRepoIds.value, rid);
});
}