peter
80cdafdbfe
Three low-severity findings from the /code-review high self-pass: - Plex duration: the "Any" chip no longer false-highlights when durationMin/Max hold a set-but-off-bucket value (stale/version-skew state) — it selects nothing then, matching the pre-sweep behaviour, instead of colliding on the empty-string sentinel. - FilterChipGroup: count badge now guards on count > 0 (was `!= null`), matching the Tabs badge so a future count:0 can't render a stray "0" pill. - Extract the shared CountBadge component; Tabs and FilterChipGroup now render the count-badge token from one source (was two near-identical inline spans). gate green (tsc/eslint-0/vitest 136/knip/prettier). Duration self-E2E'd: bucket select + Any toggle intact. Branch not merged.
505 lines
18 KiB
TypeScript
505 lines
18 KiB
TypeScript
import { useState } from "react";
|
||
import { qk } from "../lib/queryKeys";
|
||
import { useTranslation } from "react-i18next";
|
||
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
||
import { Layers, ListMusic, Plus, SlidersHorizontal, X } from "lucide-react";
|
||
import { api, plexFilterCount, type PlexFilters } from "../lib/api";
|
||
import { healPlexSort, plexSortOptions, PLEX_SORT_FALLBACK } from "../lib/plexSort";
|
||
import { defaultLayout, type PanelLayout } from "../lib/panelLayout";
|
||
import { useDebounced } from "../lib/useDebounced";
|
||
import { useScrollFade } from "../lib/useScrollFade";
|
||
import SidePanel from "./SidePanel";
|
||
import PanelGroups, { type PanelItem } from "./PanelGroups";
|
||
import SortControl from "./SortControl";
|
||
import SegmentedToggle from "./SegmentedToggle";
|
||
import FilterChipGroup, { filterChipClass } from "./FilterChipGroup";
|
||
import { usePlexClearFilters } from "./usePlexActiveFilters";
|
||
import { usePlex, usePlexActions } from "./PlexProvider";
|
||
|
||
// The Plex module's left filter column — now the shared floating SidePanel with its filter groups
|
||
// as reorderable "islands" (same system as the feed rail). Movie libraries get the full metadata
|
||
// set; shows keep library + sort. State is owned by App (per-account persisted); facets come from
|
||
// the backend so the panel only offers what the library actually contains.
|
||
|
||
type Props = {
|
||
layout: PanelLayout;
|
||
setLayout: (l: PanelLayout) => void;
|
||
collapsed: boolean;
|
||
onToggleCollapse: () => void;
|
||
};
|
||
|
||
const SHOW_OPTS = ["all", "unwatched", "in_progress", "watched"] as const;
|
||
const RATING_STEPS = [5, 6, 7, 8, 9];
|
||
const ADDED_OPTS = ["24h", "1w", "1m", "6m", "1y"] as const;
|
||
const DURATION_BUCKETS: { key: string; min: number | null; max: number | null }[] = [
|
||
{ key: "short", min: null, max: 90 * 60 },
|
||
{ key: "mid", min: 90 * 60, max: 120 * 60 },
|
||
{ key: "long", min: 120 * 60, max: null },
|
||
];
|
||
|
||
// The any/all combine toggle for a multi-value filter (genres, actors) — a thin binding of the shared
|
||
// SegmentedToggle to the Plex match vocabulary (same look as the feed rail's tag MATCH toggle).
|
||
function MatchToggle({
|
||
mode,
|
||
onChange,
|
||
}: {
|
||
mode: "any" | "all";
|
||
onChange: (m: "any" | "all") => void;
|
||
}) {
|
||
const { t } = useTranslation();
|
||
return (
|
||
<SegmentedToggle
|
||
label={t("plex.filter.matchLabel")}
|
||
ariaLabel={t("plex.filter.matchLabel")}
|
||
options={[
|
||
{ value: "any", label: t("plex.filter.match.any") },
|
||
{ value: "all", label: t("plex.filter.match.all") },
|
||
]}
|
||
value={mode}
|
||
onChange={onChange}
|
||
/>
|
||
);
|
||
}
|
||
|
||
export default function PlexSidebar({ layout, setLayout, collapsed, onToggleCollapse }: Props) {
|
||
const { t } = useTranslation();
|
||
// Scope / watch-state / sort / expanded filters live in PlexProvider (shared with PlexBrowse and
|
||
// the header search box); this rail is the primary editor of them. Opening a playlist is a
|
||
// hand-off to PlexBrowse via the shared `playlistOpen` slot.
|
||
const { scope, show, sort, filters } = usePlex();
|
||
const {
|
||
setScope,
|
||
setShow,
|
||
setSort,
|
||
setFilters,
|
||
setPlaylistOpen: onOpenPlaylist,
|
||
} = usePlexActions();
|
||
const collFade = useScrollFade();
|
||
const playlistsQ = useQuery({ queryKey: qk.plexPlaylists(), queryFn: () => api.plexPlaylists() });
|
||
const [newPlaylist, setNewPlaylist] = useState("");
|
||
const [editing, setEditing] = useState(false);
|
||
const qc = useQueryClient();
|
||
async function createPlaylist() {
|
||
const title = newPlaylist.trim();
|
||
if (!title) return;
|
||
const pl = await api.plexCreatePlaylist(title);
|
||
setNewPlaylist("");
|
||
qc.invalidateQueries({ queryKey: qk.plexPlaylists() });
|
||
onOpenPlaylist(pl.id);
|
||
}
|
||
const { collectionTitle: _ct, ...facetKey } = filters;
|
||
const facetsQ = useQuery({
|
||
queryKey: qk.plexFacets(scope, show, facetKey),
|
||
queryFn: () => api.plexFacets(scope, filters, show),
|
||
enabled: !!scope,
|
||
placeholderData: (prev) => prev,
|
||
});
|
||
const facets = facetsQ.data;
|
||
|
||
const [collSearch, setCollSearch] = useState("");
|
||
const collSearchDeb = useDebounced(collSearch.trim(), 300);
|
||
const collectionsQ = useQuery({
|
||
queryKey: qk.plexCollections("union", collSearchDeb),
|
||
queryFn: () => api.plexCollections(undefined, collSearchDeb || undefined),
|
||
enabled: !filters.collection,
|
||
});
|
||
const collections = collectionsQ.data?.collections ?? [];
|
||
|
||
const fCount = plexFilterCount(filters);
|
||
// Heal against the current scope so a stale out-of-scope key (e.g. movie "duration" after switching
|
||
// to shows) doesn't inflate the active-filter count while the control + grid show the default.
|
||
const healedSort = healPlexSort(sort, scope);
|
||
const activeCount = fCount + (show !== "all" ? 1 : 0) + (healedSort.key !== "title" ? 1 : 0);
|
||
const anyActive = activeCount > 0;
|
||
|
||
const patch = (p: Partial<PlexFilters>) => setFilters({ ...filters, ...p });
|
||
const toggleIn = (arr: string[], v: string) =>
|
||
arr.includes(v) ? arr.filter((x) => x !== v) : [...arr, v];
|
||
const clearAll = usePlexClearFilters();
|
||
|
||
const sortOptions = plexSortOptions(scope, (k) => t(`plex.sort.${k}`));
|
||
const durBucketKey = DURATION_BUCKETS.find(
|
||
(b) => (filters.durationMin ?? null) === b.min && (filters.durationMax ?? null) === b.max,
|
||
)?.key;
|
||
const peopleActive =
|
||
filters.directors.length + filters.actors.length + filters.studios.length > 0;
|
||
|
||
// Group bodies (no title — the PanelGroup card supplies it). Only available groups are pushed,
|
||
// so facet-gated / scope-gated sections drop out cleanly; PanelGroups orders them by the saved
|
||
// layout and lets the user reorder / hide / collapse them.
|
||
const items: PanelItem[] = [
|
||
{
|
||
id: "scope",
|
||
title: t("plex.filter.scope"),
|
||
body: (
|
||
<SegmentedToggle
|
||
ariaLabel={t("plex.filter.scope")}
|
||
fullWidth
|
||
size="md"
|
||
options={(["both", "movie", "show"] as const).map((s) => ({
|
||
value: s,
|
||
label: t(`plex.filter.scopeOpt.${s}`),
|
||
}))}
|
||
value={scope}
|
||
onChange={setScope}
|
||
/>
|
||
),
|
||
},
|
||
{
|
||
id: "playlists",
|
||
title: t("plex.playlist.section"),
|
||
body: (
|
||
<>
|
||
<div className="mb-1.5 flex gap-1.5">
|
||
<input
|
||
value={newPlaylist}
|
||
onChange={(e) => setNewPlaylist(e.target.value)}
|
||
onKeyDown={(e) => e.key === "Enter" && createPlaylist()}
|
||
placeholder={t("plex.playlist.newPlaceholder")}
|
||
className="glass-card min-w-0 flex-1 rounded-lg px-2 py-1 text-xs focus:outline-hidden focus:ring-2 focus:ring-accent/40"
|
||
/>
|
||
<button
|
||
onClick={createPlaylist}
|
||
disabled={!newPlaylist.trim()}
|
||
title={t("plex.playlist.create")}
|
||
className="glass-card glass-hover shrink-0 rounded-lg p-1.5 disabled:opacity-50"
|
||
>
|
||
<Plus className="h-3.5 w-3.5" />
|
||
</button>
|
||
</div>
|
||
{(playlistsQ.data?.playlists ?? []).length === 0 ? (
|
||
<p className="text-xs text-muted">{t("plex.playlist.none")}</p>
|
||
) : (
|
||
<div className="space-y-0.5">
|
||
{playlistsQ.data!.playlists.map((p) => (
|
||
<button
|
||
key={p.id}
|
||
onClick={() => onOpenPlaylist(p.id)}
|
||
className="glass-hover flex w-full items-center gap-2 rounded-sm px-1.5 py-1 text-left text-sm"
|
||
>
|
||
<ListMusic className="h-3.5 w-3.5 shrink-0 text-muted" />
|
||
<span className="min-w-0 flex-1 truncate">{p.title}</span>
|
||
<span className="shrink-0 text-xs text-muted">{p.item_count}</span>
|
||
</button>
|
||
))}
|
||
</div>
|
||
)}
|
||
</>
|
||
),
|
||
},
|
||
{
|
||
id: "watch",
|
||
title: t("plex.filter.show"),
|
||
body: (
|
||
<FilterChipGroup
|
||
ariaLabel={t("plex.filter.show")}
|
||
options={SHOW_OPTS.map((s) => ({ value: s, label: t(`plex.filter.showOpt.${s}`) }))}
|
||
value={show}
|
||
onChange={setShow}
|
||
/>
|
||
),
|
||
},
|
||
{
|
||
id: "sort",
|
||
title: t("plex.filter.sort"),
|
||
body: (
|
||
<SortControl
|
||
options={sortOptions}
|
||
sort={healedSort}
|
||
onChange={(next) => setSort(next ?? PLEX_SORT_FALLBACK)}
|
||
label={t("plex.filter.sort")}
|
||
ascLabel={t("plex.filter.dir.asc")}
|
||
descLabel={t("plex.filter.dir.desc")}
|
||
/>
|
||
),
|
||
},
|
||
...(peopleActive
|
||
? [
|
||
{
|
||
id: "people",
|
||
title: t("plex.filter.active"),
|
||
body: (
|
||
<div className="flex flex-wrap gap-1.5">
|
||
{filters.directors.map((d) => (
|
||
<RemovableChip
|
||
key={`d:${d}`}
|
||
label={d}
|
||
onRemove={() => patch({ directors: filters.directors.filter((x) => x !== d) })}
|
||
/>
|
||
))}
|
||
{filters.actors.length > 1 && (
|
||
<div className="w-full">
|
||
<MatchToggle
|
||
mode={filters.actorMode ?? "any"}
|
||
onChange={(m) => patch({ actorMode: m })}
|
||
/>
|
||
</div>
|
||
)}
|
||
{filters.actors.map((a) => (
|
||
<RemovableChip
|
||
key={`a:${a}`}
|
||
label={a}
|
||
onRemove={() => patch({ actors: filters.actors.filter((x) => x !== a) })}
|
||
/>
|
||
))}
|
||
{filters.studios.map((s) => (
|
||
<RemovableChip
|
||
key={`s:${s}`}
|
||
label={s}
|
||
onRemove={() => patch({ studios: filters.studios.filter((x) => x !== s) })}
|
||
/>
|
||
))}
|
||
</div>
|
||
),
|
||
},
|
||
]
|
||
: []),
|
||
{
|
||
id: "collection",
|
||
title: t("plex.filter.collection"),
|
||
body: filters.collection ? (
|
||
<div className="flex flex-wrap gap-1.5">
|
||
<RemovableChip
|
||
label={filters.collectionTitle || filters.collection}
|
||
onRemove={() => patch({ collection: null, collectionTitle: null })}
|
||
/>
|
||
</div>
|
||
) : (
|
||
<div>
|
||
<input
|
||
value={collSearch}
|
||
onChange={(e) => setCollSearch(e.target.value)}
|
||
placeholder={t("plex.filter.collectionSearch")}
|
||
className="mb-1.5 w-full rounded-lg border border-border bg-surface px-2 py-1 text-sm focus:outline-hidden focus:ring-2 focus:ring-accent/40"
|
||
/>
|
||
<div
|
||
ref={collFade.ref}
|
||
style={collFade.style}
|
||
className="flex max-h-56 flex-col gap-0.5 overflow-y-auto no-scrollbar"
|
||
>
|
||
{collections.map((c) => (
|
||
<button
|
||
key={c.id}
|
||
onClick={() => patch({ collection: c.id, collectionTitle: c.title })}
|
||
className="glass-hover flex items-center gap-2 rounded-lg px-2 py-1 text-left text-sm"
|
||
>
|
||
<Layers className="w-3.5 h-3.5 shrink-0 text-muted" />
|
||
<span className="flex-1 truncate">{c.title}</span>
|
||
<span className="text-xs text-muted">{c.child_count}</span>
|
||
</button>
|
||
))}
|
||
{collections.length === 0 && (
|
||
<span className="px-2 py-1 text-xs text-muted">
|
||
{t("plex.filter.collectionEmpty")}
|
||
</span>
|
||
)}
|
||
</div>
|
||
</div>
|
||
),
|
||
},
|
||
{
|
||
id: "rating",
|
||
title: t("plex.filter.rating"),
|
||
body: (
|
||
<FilterChipGroup
|
||
ariaLabel={t("plex.filter.rating")}
|
||
value={filters.ratingMin == null ? "" : String(filters.ratingMin)}
|
||
options={[
|
||
{ value: "", label: t("plex.filter.any") },
|
||
...RATING_STEPS.map((r) => ({ value: String(r), label: `${r}+` })),
|
||
]}
|
||
onChange={(v) => patch({ ratingMin: v === "" ? null : Number(v) })}
|
||
/>
|
||
),
|
||
},
|
||
...(facets && facets.genres.length > 0
|
||
? [
|
||
{
|
||
id: "genre",
|
||
title: t("plex.filter.genre"),
|
||
body: (
|
||
<>
|
||
{filters.genres.length > 1 && (
|
||
<MatchToggle
|
||
mode={filters.genreMode ?? "any"}
|
||
onChange={(m) => patch({ genreMode: m })}
|
||
/>
|
||
)}
|
||
<div
|
||
className="flex flex-wrap gap-1.5"
|
||
role="group"
|
||
aria-label={t("plex.filter.genre")}
|
||
>
|
||
{facets.genres.map((g) => (
|
||
<button
|
||
key={g.value}
|
||
onClick={() => patch({ genres: toggleIn(filters.genres, g.value) })}
|
||
aria-pressed={filters.genres.includes(g.value)}
|
||
className={filterChipClass}
|
||
>
|
||
{g.value}
|
||
</button>
|
||
))}
|
||
</div>
|
||
</>
|
||
),
|
||
},
|
||
]
|
||
: []),
|
||
{
|
||
id: "year",
|
||
title: t("plex.filter.year"),
|
||
body: (
|
||
<div className="flex items-center gap-2">
|
||
<NumberInput
|
||
value={filters.yearMin ?? null}
|
||
placeholder={facets?.year_min ?? undefined}
|
||
onChange={(v) => patch({ yearMin: v })}
|
||
/>
|
||
<span className="text-muted text-xs">–</span>
|
||
<NumberInput
|
||
value={filters.yearMax ?? null}
|
||
placeholder={facets?.year_max ?? undefined}
|
||
onChange={(v) => patch({ yearMax: v })}
|
||
/>
|
||
</div>
|
||
),
|
||
},
|
||
...(scope === "movie"
|
||
? [
|
||
{
|
||
id: "duration",
|
||
title: t("plex.filter.duration"),
|
||
body: (
|
||
<FilterChipGroup
|
||
ariaLabel={t("plex.filter.duration")}
|
||
// "Any" is selected only when there is genuinely no duration filter; a set-but-off-bucket
|
||
// duration (e.g. stale state after a bucket-boundary change) selects nothing, not "Any".
|
||
value={
|
||
durBucketKey ??
|
||
(filters.durationMin == null && filters.durationMax == null ? "" : " ")
|
||
}
|
||
options={[
|
||
{ value: "", label: t("plex.filter.any") },
|
||
...DURATION_BUCKETS.map((b) => ({
|
||
value: b.key,
|
||
label: t(`plex.filter.durationOpt.${b.key}`),
|
||
})),
|
||
]}
|
||
onChange={(key) => {
|
||
const b = DURATION_BUCKETS.find((x) => x.key === key);
|
||
patch({ durationMin: b?.min ?? null, durationMax: b?.max ?? null });
|
||
}}
|
||
/>
|
||
),
|
||
},
|
||
]
|
||
: []),
|
||
{
|
||
id: "added",
|
||
title: t("plex.filter.added"),
|
||
body: (
|
||
<FilterChipGroup
|
||
ariaLabel={t("plex.filter.added")}
|
||
value={filters.addedWithin || ""}
|
||
options={[
|
||
{ value: "", label: t("plex.filter.any") },
|
||
...ADDED_OPTS.map((a) => ({ value: a, label: t(`plex.filter.addedOpt.${a}`) })),
|
||
]}
|
||
onChange={(v) => patch({ addedWithin: v })}
|
||
/>
|
||
),
|
||
},
|
||
...(facets && facets.content_ratings.length > 0
|
||
? [
|
||
{
|
||
id: "contentrating",
|
||
title: t("plex.filter.contentRating"),
|
||
body: (
|
||
<div
|
||
className="flex flex-wrap gap-1.5"
|
||
role="group"
|
||
aria-label={t("plex.filter.contentRating")}
|
||
>
|
||
{facets.content_ratings.map((c) => (
|
||
<button
|
||
key={c.value}
|
||
onClick={() =>
|
||
patch({ contentRatings: toggleIn(filters.contentRatings, c.value) })
|
||
}
|
||
aria-pressed={filters.contentRatings.includes(c.value)}
|
||
className={filterChipClass}
|
||
>
|
||
{c.value}
|
||
</button>
|
||
))}
|
||
</div>
|
||
),
|
||
},
|
||
]
|
||
: []),
|
||
];
|
||
|
||
return (
|
||
<SidePanel
|
||
title={t("sidebar.filters")}
|
||
icon={<SlidersHorizontal className="w-4 h-4" />}
|
||
count={activeCount}
|
||
collapsed={collapsed}
|
||
onToggleCollapse={onToggleCollapse}
|
||
editing={editing}
|
||
onToggleEditing={() => setEditing((e) => !e)}
|
||
onReset={() => setLayout(defaultLayout("plex"))}
|
||
editHint={t("sidebar.editHint")}
|
||
actions={
|
||
anyActive ? (
|
||
<button
|
||
onClick={clearAll}
|
||
className="inline-flex items-center gap-1 text-xs text-muted hover:text-accent transition px-1 whitespace-nowrap"
|
||
>
|
||
<X className="w-3.5 h-3.5" />
|
||
{t("plex.filter.clearAll")}
|
||
</button>
|
||
) : undefined
|
||
}
|
||
>
|
||
<PanelGroups items={items} layout={layout} setLayout={setLayout} editing={editing} />
|
||
</SidePanel>
|
||
);
|
||
}
|
||
|
||
function RemovableChip({ label, onRemove }: { label: string; onRemove: () => void }) {
|
||
return (
|
||
<span className="chip px-2 py-1 text-xs">
|
||
<span className="truncate max-w-36">{label}</span>
|
||
<button onClick={onRemove} className="hover:opacity-70" aria-label="remove">
|
||
<X className="w-3 h-3" />
|
||
</button>
|
||
</span>
|
||
);
|
||
}
|
||
|
||
function NumberInput({
|
||
value,
|
||
placeholder,
|
||
onChange,
|
||
}: {
|
||
value: number | null;
|
||
placeholder?: number;
|
||
onChange: (v: number | null) => void;
|
||
}) {
|
||
return (
|
||
<input
|
||
type="number"
|
||
inputMode="numeric"
|
||
value={value ?? ""}
|
||
placeholder={placeholder != null ? String(placeholder) : ""}
|
||
onChange={(e) => {
|
||
const n = e.target.value === "" ? null : Number(e.target.value);
|
||
onChange(n != null && Number.isFinite(n) ? n : null);
|
||
}}
|
||
className="w-20 rounded-lg border border-border bg-surface px-2 py-1 text-sm tabular-nums focus:outline-hidden focus:ring-2 focus:ring-accent/40"
|
||
/>
|
||
);
|
||
}
|