Share the excluded-ranges filter with IP Addresses; add Admin Links page

IP Addresses (IPAM) now reads the same excluded-ranges setting the
Consistency page manages, so "not interesting" addresses - a Docker
bridge network repeating on every host, say - can be hidden there too.
Adds a "Hide excluded addresses" toggle (on by default, with a live
count), an inline ranges editor matching Consistency's, an "excluded"
badge on rows shown anyway, and a per-row "Exclude..." shortcut that
suggests a /24 (or /64 for IPv6) around that address. Editing ranges
from either page updates both, since it's one shared setting.

Also adds Operations > Admin Links: a single page summarizing every
admin bookmark added across all servers (Dockge, Webmin, Cockpit, etc,
previously only visible per-server on each server's own detail page),
sortable and searchable, with the same add/edit/delete capability -
adding one here just asks which server it belongs to.

Verified both with real HTTP-level tests: a genuine Express app, a
scratch SQLite DB, and forged sessions, covering the exclusion
matching, the shared-setting round trip, the links aggregation and
join, and role enforcement - the real dev DB was confirmed untouched
throughout. Both packages build clean.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
bobbanandClaude Sonnet 5 committed 2026-09-30 00:07:27 +02:00
1 parent 236b1da0dc
commit 1ff1c6550c
9 files changed
+435 -9

No files matched your search

+259
View File
@@ -0,0 +1,259 @@
import { useEffect, useMemo, useState, type FormEvent } from "react";
import { Link } from "react-router-dom";
import { api, type AdminLink, type CurrentUser, type ServerRecord } from "../api/client";
import { useSortable } from "../hooks/useSortable";
import SortableTh from "../components/SortableTh";
import { downloadCsv } from "../utils/csv";
interface LinkForm {
serverId: number | "";
label: string;
url: string;
}
const emptyForm: LinkForm = { serverId: "", label: "", url: "" };
export default function AdminLinks({ user }: { user: CurrentUser }) {
const canEdit = user.role === "admin" || user.role === "operator";
const [links, setLinks] = useState<AdminLink[] | null>(null);
const [servers, setServers] = useState<ServerRecord[] | null>(null);
const [error, setError] = useState<string | null>(null);
const [search, setSearch] = useState("");
const [editing, setEditing] = useState<AdminLink | null>(null);
const [adding, setAdding] = useState(false);
const [form, setForm] = useState<LinkForm>(emptyForm);
const [saving, setSaving] = useState(false);
function load() {
api.servers.allLinks()
.then((res) => setLinks(res.links))
.catch((err) => setError(err instanceof Error ? err.message : String(err)));
}
useEffect(() => {
load();
api.servers
.list()
.then((res) => setServers(res.servers))
.catch(() => {});
}, []);
const filtered = useMemo(() => {
if (!links) return [];
const q = search.trim().toLowerCase();
if (!q) return links;
return links.filter((l) => [l.serverName, l.serverHostname, l.label, l.url].some((v) => (v ?? "").toLowerCase().includes(q)));
}, [links, search]);
const { sorted, sortKey, sortDir, requestSort } = useSortable(filtered, "serverName");
function exportCsv() {
downloadCsv(
"admin-links.csv",
["Server", "Label", "URL"],
(sorted ?? []).map((l) => [l.serverName, l.label, l.url]),
);
}
function startAdd() {
setAdding(true);
setEditing(null);
setForm(emptyForm);
}
function startEdit(link: AdminLink) {
setEditing(link);
setAdding(false);
setForm({ serverId: link.serverId, label: link.label, url: link.url });
}
function cancelForm() {
setAdding(false);
setEditing(null);
setForm(emptyForm);
}
async function submit(e: FormEvent) {
e.preventDefault();
if (form.serverId === "") return;
setError(null);
setSaving(true);
try {
if (editing) {
await api.servers.updateLink(editing.serverId, editing.id, { label: form.label, url: form.url });
} else {
await api.servers.addLink(form.serverId, { label: form.label, url: form.url });
}
cancelForm();
load();
} catch (err) {
setError(err instanceof Error ? err.message : String(err));
} finally {
setSaving(false);
}
}
async function remove(link: AdminLink) {
if (!confirm(`Remove the "${link.label}" link from ${link.serverName}?`)) return;
setError(null);
try {
await api.servers.removeLink(link.serverId, link.id);
load();
} catch (err) {
setError(err instanceof Error ? err.message : String(err));
}
}
const showForm = adding || editing;
return (
<>
<h2 className="page-title mb-3">Admin Links</h2>
<p className="text-secondary">
Every admin bookmark added to a server's own page (Infrastructure → Servers → a server → Admin Links) — Dockge,
Webmin, Cockpit, and the like — in one place, instead of visiting each server to find them.
</p>
{error && <div className="alert alert-danger">{error}</div>}
{canEdit && showForm && (
<div className="card mb-3">
<div className="card-header">
<h3 className="card-title">{editing ? `Edit "${editing.label}"` : "Add an admin link"}</h3>
</div>
<form onSubmit={submit}>
<div className="card-body row g-3">
<div className="col-md-3">
<label className="form-label">Server</label>
<select
className="form-select"
required
disabled={!!editing}
value={form.serverId}
onChange={(e) => setForm({ ...form, serverId: e.target.value ? Number(e.target.value) : "" })}
>
<option value="" disabled>
— choose a server —
</option>
{(servers ?? []).map((s) => (
<option key={s.id} value={s.id}>
{s.name}
</option>
))}
</select>
{editing && <div className="form-hint">Remove and re-add to move it to a different server.</div>}
</div>
<div className="col-md-3">
<label className="form-label">Label</label>
<input
className="form-control"
required
maxLength={60}
placeholder="e.g. Dockge, Webmin, Cockpit"
value={form.label}
onChange={(e) => setForm({ ...form, label: e.target.value })}
/>
</div>
<div className="col-md-6">
<label className="form-label">URL</label>
<input
type="url"
className="form-control"
required
placeholder="http://10.0.0.5:5001"
value={form.url}
onChange={(e) => setForm({ ...form, url: e.target.value })}
/>
</div>
</div>
<div className="card-footer d-flex gap-2">
<button type="submit" className="btn btn-primary" disabled={saving}>
{editing ? "Save changes" : "Add link"}
</button>
<button type="button" className="btn" onClick={cancelForm}>
Cancel
</button>
</div>
</form>
</div>
)}
<div className="card">
<div className="card-header">
<input
className="form-control"
style={{ maxWidth: 280 }}
placeholder="Search server, label, URL…"
value={search}
onChange={(e) => setSearch(e.target.value)}
/>
<div className="card-actions">
{canEdit && !showForm && (
<button className="btn btn-primary btn-sm" onClick={startAdd}>
Add link
</button>
)}
<button className="btn btn-sm btn-outline-secondary" onClick={exportCsv} disabled={!sorted?.length}>
Export CSV
</button>
</div>
</div>
<div className="table-responsive">
<table className="table table-vcenter card-table">
<thead>
<tr>
<SortableTh<AdminLink> label="Server" sortKeyName="serverName" activeKey={sortKey} direction={sortDir} onSort={requestSort} />
<SortableTh<AdminLink> label="Label" sortKeyName="label" activeKey={sortKey} direction={sortDir} onSort={requestSort} />
<th>URL</th>
{canEdit && <th className="w-1">Actions</th>}
</tr>
</thead>
<tbody>
{(sorted ?? []).map((l) => (
<tr key={l.id}>
<td>
<Link to={`/servers/${l.serverId}`}>{l.serverName}</Link>
{l.serverHostname && <div className="text-secondary small">{l.serverHostname}</div>}
</td>
<td>{l.label}</td>
<td>
<a href={l.url} target="_blank" rel="noopener noreferrer">
{l.url}
</a>
</td>
{canEdit && (
<td>
<div className="btn-list flex-nowrap">
<button className="btn btn-sm" onClick={() => startEdit(l)}>
Edit
</button>
<button className="btn btn-sm btn-outline-danger" onClick={() => remove(l)}>
Delete
</button>
</div>
</td>
)}
</tr>
))}
{links !== null && links.length === 0 && (
<tr>
<td colSpan={canEdit ? 4 : 3} className="text-secondary text-center">
No admin links added yet.
</td>
</tr>
)}
{links !== null && links.length > 0 && (sorted ?? []).length === 0 && (
<tr>
<td colSpan={canEdit ? 4 : 3} className="text-secondary text-center">
Nothing matches "{search}".
</td>
</tr>
)}
</tbody>
</table>
</div>
</div>
</>
);
}
+114 -4
View File
@@ -17,6 +17,11 @@ function isIpv6(ip: string) {
export default function Ipam({ user }: { user: CurrentUser }) {
const canEdit = user.role === "admin" || user.role === "operator";
const [entries, setEntries] = useState<IpamEntry[] | null>(null);
const [excludedRanges, setExcludedRanges] = useState<string[]>([]);
const [hideExcluded, setHideExcluded] = useState(true);
const [showRanges, setShowRanges] = useState(false);
const [newRange, setNewRange] = useState("");
const [savingRanges, setSavingRanges] = useState(false);
const [error, setError] = useState<string | null>(null);
const [searchParams] = useSearchParams();
const [search, setSearch] = useState(() => searchParams.get("q") ?? "");
@@ -34,6 +39,7 @@ export default function Ipam({ user }: { user: CurrentUser }) {
.list()
.then((res) => {
setEntries(res.entries);
setExcludedRanges(res.excludedRanges);
// Deep-link from global search (?editId=) — jump straight to that entry's edit form.
const editId = Number(searchParams.get("editId"));
const target = res.entries.find((e) => e.id === editId);
@@ -44,14 +50,49 @@ export default function Ipam({ user }: { user: CurrentUser }) {
useEffect(load, []);
/** Saves the whole list (the server validates and normalises it) and reloads — shared with the Consistency page. */
async function saveRanges(ranges: string[]): Promise<boolean> {
setSavingRanges(true);
setError(null);
try {
await api.consistency.setExcludedRanges(ranges);
load();
return true;
} catch (err) {
setError(err instanceof Error ? err.message : String(err));
return false;
} finally {
setSavingRanges(false);
}
}
async function addRange(e: React.FormEvent) {
e.preventDefault();
if (!newRange.trim()) return;
if (await saveRanges([...excludedRanges, newRange.trim()])) setNewRange("");
}
async function excludeAround(entry: IpamEntry) {
const suggestion = isIpv6(entry.ipAddress) ? `${entry.ipAddress}/64` : `${entry.ipAddress.split(".").slice(0, 3).join(".")}.0/24`;
const range = window.prompt(
`Hide this range from IP Addresses and the Consistency report — every address in it, not just this one:`,
suggestion,
);
if (range === null || !range.trim()) return;
await saveRanges([...excludedRanges, range.trim()]);
}
const excludedCount = useMemo(() => entries?.filter((e) => e.excluded).length ?? 0, [entries]);
const filtered = useMemo(() => {
if (!entries) return [];
const base = hideExcluded ? entries.filter((e) => !e.excluded) : entries;
const q = search.trim().toLowerCase();
if (!q) return entries;
return entries.filter((e) =>
if (!q) return base;
return base.filter((e) =>
[e.ipAddress, e.label, e.vendor, e.location].some((v) => (v ?? "").toLowerCase().includes(q)),
);
}, [entries, search]);
}, [entries, hideExcluded, search]);
function startAdd() {
setAdding(true);
@@ -176,6 +217,67 @@ export default function Ipam({ user }: { user: CurrentUser }) {
{error && <div className="alert alert-danger">{error}</div>}
{syncResult && <div className="alert alert-success">Synced from {syncResult}</div>}
<div className="card mb-3">
<div className="card-body">
<div className="d-flex flex-wrap align-items-center gap-2">
<label className="form-check mb-0">
<input
type="checkbox"
className="form-check-input"
checked={hideExcluded}
onChange={(e) => setHideExcluded(e.target.checked)}
/>
<span className="form-check-label">
Hide excluded addresses{excludedCount > 0 && ` (${excludedCount})`}
</span>
</label>
<button type="button" className="btn btn-link btn-sm p-0 ms-2" onClick={() => setShowRanges((s) => !s)}>
{showRanges ? "Hide" : "Manage"} excluded ranges
</button>
</div>
{showRanges && (
<div className="mt-2">
<div className="text-secondary small mb-2">
Addresses in these ranges are left out here and on the Consistency report — the same setting either
page manages. Meant for networks that aren't part of your LAN, like Docker's, which repeat the same
subnet on many hosts.
</div>
<div className="d-flex flex-wrap gap-1 mb-2">
{excludedRanges.length === 0 && <span className="text-secondary small">Nothing excluded.</span>}
{excludedRanges.map((r) => (
<span key={r} className="badge bg-secondary-lt text-secondary d-inline-flex align-items-center">
<code className="bg-transparent p-0">{r}</code>
{canEdit && (
<button
type="button"
className="btn-close ms-1"
style={{ fontSize: "0.5rem" }}
aria-label={`Stop excluding ${r}`}
disabled={savingRanges}
onClick={() => void saveRanges(excludedRanges.filter((x) => x !== r))}
/>
)}
</span>
))}
</div>
{canEdit && (
<form onSubmit={addRange} className="d-flex gap-2" style={{ maxWidth: 460 }}>
<input
className="form-control form-control-sm"
placeholder="e.g. 172.17.0.0/16 or 10.1.2.3"
value={newRange}
onChange={(e) => setNewRange(e.target.value)}
/>
<button type="submit" className="btn btn-sm btn-primary" disabled={savingRanges || !newRange.trim()}>
Exclude
</button>
</form>
)}
</div>
)}
</div>
</div>
{canEdit && showForm && (
<div className="card mb-3">
<div className="card-header">
@@ -327,6 +429,7 @@ export default function Ipam({ user }: { user: CurrentUser }) {
{isIpv6(entry.ipAddress) ? "IPv6" : "IPv4"}
</span>
{entry.ipAddress}
{entry.excluded && <span className="badge bg-secondary-lt text-secondary ms-2">excluded</span>}
</td>
<td>{entry.label ?? "—"}</td>
<td>
@@ -343,6 +446,11 @@ export default function Ipam({ user }: { user: CurrentUser }) {
<button className="btn btn-sm" onClick={() => startEdit(entry)}>
Edit
</button>
{!entry.excluded && (
<button className="btn btn-sm" onClick={() => excludeAround(entry)} title="Hide this and every address in the same range">
Exclude…
</button>
)}
<button className="btn btn-sm btn-outline-danger" onClick={() => remove(entry)}>
Delete
</button>
@@ -354,7 +462,9 @@ export default function Ipam({ user }: { user: CurrentUser }) {
{(sorted ?? []).length === 0 && (
<tr>
<td colSpan={canEdit ? 7 : 5} className="text-secondary text-center">
No IP addresses tracked yet.
{entries && entries.length > 0
? "Every tracked address is currently excluded or filtered out — turn off “Hide excluded addresses”, or adjust your search, to see them."
: "No IP addresses tracked yet."}
</td>
</tr>
)}