diff --git a/client/src/pages/AdminPage.jsx b/client/src/pages/AdminPage.jsx
index cda2d2f..a6fcd46 100644
--- a/client/src/pages/AdminPage.jsx
+++ b/client/src/pages/AdminPage.jsx
@@ -5,8 +5,40 @@ import { FORMAT_LABEL, serverLabel } from '../lib/labels.js';
import CopyField from '../components/CopyField.jsx';
const KEY = 'cs2mv:admin';
+const FILTER_KEY = 'cs2mv:admin:filter';
const REFRESH_MS = 3000;
+const RUNNING = ['lobby', 'veto', 'server_setup', 'live'];
+const CLOSED = ['finished', 'cancelled'];
+const SERVER_ERRORS = ['start_failed', 'failed', 'config_failed'];
+const hasError = (m) => SERVER_ERRORS.includes(m.server?.status);
+
+/** Filter der Matchliste. "archive" lädt eine eigene Liste vom Server. */
+const FILTERS = [
+ { key: 'all', label: 'Alle', test: () => true },
+ { key: 'running', label: 'Laufend', test: (m) => RUNNING.includes(m.status) },
+ { key: 'errors', label: 'Fehler', test: hasError },
+ { key: 'closed', label: 'Abgeschlossen', test: (m) => CLOSED.includes(m.status) },
+ { key: 'archive', label: 'Archiv', test: () => true },
+];
+
+const readFilter = () => {
+ try {
+ const f = localStorage.getItem(FILTER_KEY);
+ return FILTERS.some((x) => x.key === f) ? f : 'all';
+ } catch {
+ return 'all';
+ }
+};
+
+/** Suche nach Teamnamen, Spielern und Match-ID, ohne Groß-/Kleinschreibung. */
+function matchesSearch(m, query) {
+ const q = query.trim().toLowerCase();
+ if (!q) return true;
+ const hay = [m.id, m.teams.A.name, m.teams.B.name, ...['A', 'B'].flatMap((t) => m.teams[t].players.map((p) => p.nickname))];
+ return hay.some((x) => String(x ?? '').toLowerCase().includes(q));
+}
+
const getToken = () => {
try {
return sessionStorage.getItem(KEY);
@@ -31,6 +63,19 @@ export default function AdminPage() {
const [notice, setNotice] = useState(null);
const [busy, setBusy] = useState(null);
const [tab, setTab] = useState('matches');
+ const [filter, setFilterState] = useState(readFilter);
+ const [query, setQuery] = useState('');
+ const [archivedCount, setArchivedCount] = useState(0);
+ const setFilter = (f) => {
+ setFilterState(f);
+ // Beim Wechsel zwischen Archiv und normaler Liste neu laden
+ if ((f === 'archive') !== (filter === 'archive')) setMatches(null);
+ try {
+ localStorage.setItem(FILTER_KEY, f);
+ } catch {
+ /* ignorieren */
+ }
+ };
const logout = useCallback(() => {
api('/admin/logout', { method: 'POST', token }).catch(() => {});
@@ -41,8 +86,9 @@ export default function AdminPage() {
const load = useCallback(async () => {
try {
- const res = await api('/admin/matches', { token });
+ const res = await api(`/admin/matches${filter === 'archive' ? '?archived=1' : ''}`, { token });
setMatches(res.matches);
+ setArchivedCount(res.archivedCount ?? 0);
setHosts(res.hosts ?? []);
setError(null);
} catch (err) {
@@ -53,7 +99,7 @@ export default function AdminPage() {
setError(err.message);
}
}
- }, [token]);
+ }, [token, filter]);
useEffect(() => {
if (!token) return undefined;
@@ -107,13 +153,31 @@ export default function AdminPage() {
{error && {error}
}
{tab === 'matches' && }
{tab === 'matches' && matches === null && !error && Lade Matches …
}
- {tab === 'matches' && matches && matches.length === 0 && Noch keine Matches.
}
-
- {tab === 'matches' &&
- {matches?.map((m) => (
-
- ))}
-
}
+ {tab === 'matches' && (
+
+ )}
+ {tab === 'matches' && matches && (() => {
+ const active = FILTERS.find((f) => f.key === filter);
+ const shown = matches.filter((m) => active.test(m) && matchesSearch(m, query));
+ if (matches.length === 0) {
+ return {filter === 'archive' ? 'Das Archiv ist leer.' : 'Noch keine Matches.'}
;
+ }
+ if (shown.length === 0) return Keine Matches für diesen Filter{query ? ` und „${query}“` : ''}.
;
+ return (
+
+ {shown.map((m) => (
+
+ ))}
+
+ );
+ })()}
);
}
@@ -313,6 +377,10 @@ function MatchAdminCard({ m, run, busy, token, reload, setNotice }) {
)}
)}
+ {hasError(m) && m.server.message && (
+ {m.server.message}
+ )}
+ {m.archivedAt && Archiviert {formatDateTime(m.archivedAt)}}
{paused && Pausiert}
@@ -330,6 +398,8 @@ function MatchAdminCard({ m, run, busy, token, reload, setNotice }) {
{m.server && !['stopped'].includes(m.server.status) && btn('Server stoppen', { path: '/server/stop', confirm: 'Server stoppen?' })}
{!closed && btn('Match abschließen', { path: '/finish', confirm: 'Match als abgeschlossen markieren?' })}
{!closed && btn('Match abbrechen', { path: '/cancel', confirm: 'Match abbrechen?' }, 'btn-ghost danger')}
+ {closed && !m.archivedAt && btn('Archivieren', { path: '/archive', success: 'Match archiviert' })}
+ {m.archivedAt && btn('Aus dem Archiv holen', { path: '/unarchive', success: 'Match ist wieder in der Liste' })}
{btn('Löschen', { method: 'DELETE', path: '', confirm: `Match ${m.teams.A.name} vs. ${m.teams.B.name} endgültig löschen?`, success: 'Match gelöscht' }, 'btn-ghost danger')}
@@ -699,3 +769,32 @@ function DockerHostsPanel({ token, setNotice }) {
function formatDateTime(ms) {
return `${new Date(ms).toLocaleString('de-DE', { day: '2-digit', month: '2-digit', year: 'numeric', hour: '2-digit', minute: '2-digit' })} Uhr`;
}
+/** Suche und Filter über der Matchliste, mit Anzahl pro Filter. */
+function MatchToolbar({ matches, archivedCount, filter, setFilter, query, setQuery }) {
+ const count = (f) => (f.key === 'archive' ? archivedCount : matches.filter(f.test).length);
+ return (
+
+
setQuery(e.target.value)}
+ />
+
+ {FILTERS.map((f) => (
+
+ ))}
+
+