Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

refactor(dns): merge DNS Zones + Dynamic DNS into the Domains drawer

Juan Denis5cd671ba05df
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index be59cc79..bd561c01 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -58,7 +58,6 @@ import ServerTemplates from './pages/ServerTemplates';
import RemoteAccess from './pages/RemoteAccess';
import Workspaces from './pages/Workspaces';
import WorkspaceDetail from './pages/WorkspaceDetail';
-import DNSZones from './pages/DNSZones';
import CloudflareZoneSettings from './pages/CloudflareZoneSettings';
import StatusPages from './pages/StatusPages';
import PublicStatusPage from './pages/PublicStatusPage';
@@ -70,7 +69,6 @@ import AppMap from './pages/AppMap';
import Documentation from './pages/Documentation';
import Deployments from './pages/Deployments';
import GpuMonitor from './pages/GpuMonitor';
-import DynamicDns from './pages/DynamicDns';
import QueueOperations from './pages/QueueOperations';
import QueueDetail from './pages/QueueDetail';
import Notifications from './pages/Notifications';
@@ -330,10 +328,13 @@ function AppRoutes() {
<Route path="workflow" element={<WorkflowBuilder />} />
<Route element={<TabGroupLayout tabs={DOMAIN_TABS} />}>
<Route path="domains" element={<Domains />} />
- <Route path="dns" element={<DNSZones />} />
<Route path="ssl" element={<SSLCertificates />} />
- <Route path="dynamic-dns" element={<DynamicDns />} />
</Route>
+ {/* DNS Zones + Dynamic DNS were merged into the Domains surface
+ (records + per-record Dynamic DNS live in the domain drawer) —
+ keep the old paths working by redirecting. */}
+ <Route path="dns" element={<Navigate to="/domains" replace />} />
+ <Route path="dynamic-dns" element={<Navigate to="/domains" replace />} />
{/* Cloudflare zone settings — a detail page reached from a
Cloudflare-managed DNS zone (full-bleed, own top bar). */}
<Route path="cloudflare/zones/:zoneId" element={<CloudflareZoneSettings />} />
diff --git a/frontend/src/components/domains/DdnsTokenCallout.jsx b/frontend/src/components/domains/DdnsTokenCallout.jsx
new file mode 100644
index 00000000..3a1be84f
--- /dev/null
+++ b/frontend/src/components/domains/DdnsTokenCallout.jsx
@@ -0,0 +1,38 @@
+// One-time Dynamic DNS token callout — the update token is only returned once on
+// create/regenerate, so we surface it prominently with the ready-to-use update URL.
+// Shared by the Domains drawer's per-record "Make dynamic" flow.
+import { AlertTriangle } from 'lucide-react';
+import CopyButton from '../CopyButton';
+
+export default function DdnsTokenCallout({ host, onDismiss }) {
+ // The public, token-authenticated endpoint a router/cron calls on IP change.
+ const updateUrl = `${window.location.origin}/api/v1/ddns/update?token=${host.token}`;
+
+ return (
+ <div className="ddns-token-callout">
+ <div className="ddns-token-callout__head">
+ <AlertTriangle size={16} />
+ <span>
+ Token for <strong>{host.hostname || host.record_name}</strong> — shown once. Save it now.
+ </span>
+ {onDismiss && (
+ <button className="ddns-token-callout__close" onClick={onDismiss} aria-label="Dismiss">
+ &times;
+ </button>
+ )}
+ </div>
+
+ <div className="ddns-token-callout__row">
+ <span className="ddns-token-callout__label">Token</span>
+ <code className="ddns-token-callout__value">{host.token}</code>
+ <CopyButton value={host.token} label="Copy token" size="sm" variant="outline" />
+ </div>
+
+ <div className="ddns-token-callout__row">
+ <span className="ddns-token-callout__label">Update URL</span>
+ <code className="ddns-token-callout__value">{updateUrl}</code>
+ <CopyButton value={updateUrl} label="Copy URL" size="sm" variant="outline" />
+ </div>
+ </div>
+ );
+}
diff --git a/frontend/src/components/domains/DomainDnsPanel.jsx b/frontend/src/components/domains/DomainDnsPanel.jsx
index 1a7ce71c..759e880b 100644
--- a/frontend/src/components/domains/DomainDnsPanel.jsx
+++ b/frontend/src/components/domains/DomainDnsPanel.jsx
@@ -1,16 +1,17 @@
-// The DNS records section shown inside the Domains drawer — the same inline
-// experience for an app-created domain and a Cloudflare zone, so the two no longer
-// feel like different products. For a Cloudflare domain it shows the *live* zone
-// records (tagged ServerKit-managed vs your own), so you can see the real DNS
-// without leaving the drawer; for a ServerKit/manual zone it shows the managed
-// records. Admins can add a record inline (the zone is adopted on demand), and
-// deeper management links out to the Cloudflare ops surface / full DNS page.
+// The DNS records section shown inside the Domains drawer — the single DNS surface.
+// For a Cloudflare domain it shows the *live* zone records (tagged ServerKit-managed
+// vs your own) so you see the real DNS without leaving the drawer; for a
+// ServerKit/manual zone it shows the managed records. Admins can add records inline
+// (the zone is adopted on demand), turn any A/AAAA record into a token-updatable
+// Dynamic DNS host, export the zone, and check propagation. Deeper management links
+// out to the Cloudflare ops surface.
import { useState, useEffect, useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
-import { Network, Plus, RefreshCw, ExternalLink, Cloud, ShieldCheck } from 'lucide-react';
+import { Plus, RefreshCw, Cloud, ShieldCheck, Radio, Download, Activity } from 'lucide-react';
import api from '../../services/api';
import { useToast } from '../../contexts/ToastContext';
import { ProviderBrandIcon } from '../icons/ProviderBrands';
+import DdnsTokenCallout from './DdnsTokenCallout';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { FormField, FormRow } from '../FormField';
@@ -20,8 +21,11 @@ import {
const RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'TXT', 'SRV', 'CAA', 'NS'];
const PROXYABLE = ['A', 'AAAA', 'CNAME'];
+const DYNAMIC_TYPES = ['A', 'AAAA']; // Dynamic DNS only makes sense for IP records.
const EMPTY_FORM = { record_type: 'A', name: '@', content: '', ttl: 3600, priority: '', proxied: false };
+const norm = (s) => (s || '').toLowerCase().replace(/\.$/, '');
+
const normalizeLive = (r) => ({
id: r.id, type: r.type, name: r.name, content: r.content,
ttl: r.ttl, proxied: r.proxied, priority: r.priority, source: r.managed_by,
@@ -36,6 +40,7 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
const toast = useToast();
const isCloudflare = domain?.provider === 'cloudflare';
const canLive = isCloudflare && !!domain?.provider_zone_id && !!domain?.config_id;
+ const base = norm(domain?.name);
const [records, setRecords] = useState([]);
const [state, setState] = useState('loading'); // loading | ready | none | error
@@ -45,11 +50,45 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
const [form, setForm] = useState(EMPTY_FORM);
const [saving, setSaving] = useState(false);
+ // Dynamic DNS hosts for this zone, the just-revealed token, and per-record busy.
+ const [hosts, setHosts] = useState([]);
+ const [revealedHost, setRevealedHost] = useState(null);
+ const [busyKey, setBusyKey] = useState(null);
+
+ // Power tools (moved from the retired DNS Zones page).
+ const [exporting, setExporting] = useState(false);
+ const [propOpen, setPropOpen] = useState(false);
+ const [propLoading, setPropLoading] = useState(false);
+ const [propResults, setPropResults] = useState(null);
+
+ // ── FQDN helpers — reconcile live (FQDN) vs managed (relative) record names ──
+ const recordFqdn = useCallback((r) => {
+ const n = norm(r.name);
+ if (!n || n === '@') return base;
+ if (n === base || n.endsWith(`.${base}`)) return n;
+ return `${n}.${base}`;
+ }, [base]);
+ const recordRelativeName = useCallback((r) => {
+ const fq = recordFqdn(r);
+ return fq === base ? '@' : fq.slice(0, -(base.length + 1));
+ }, [recordFqdn, base]);
+
+ const hostByFqdn = new Map(hosts.map((h) => [norm(h.hostname), h]));
+ const hostFor = (r) => hostByFqdn.get(recordFqdn(r));
+
+ const loadHosts = useCallback(async () => {
+ try {
+ const d = await api.getDdnsHosts();
+ setHosts(d.hosts || []);
+ } catch { /* best-effort: hosts just won't be tagged */ }
+ }, []);
+
const load = useCallback(async () => {
if (!domain) return;
setState('loading');
setError('');
setZoneId(domain.zone_id || null); // reset so a prior domain's id can't leak in
+ loadHosts();
try {
if (canLive) {
const res = await api.getProviderRecords(domain.config_id, domain.provider_zone_id);
@@ -74,9 +113,13 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
setError(e.message || 'Could not load records');
setState('error');
}
- }, [domain, canLive]);
+ }, [domain, canLive, loadHosts]);
- useEffect(() => { setShowAdd(false); setForm(EMPTY_FORM); load(); }, [load]);
+ useEffect(() => {
+ setShowAdd(false); setForm(EMPTY_FORM);
+ setRevealedHost(null); setPropOpen(false); setPropResults(null);
+ load();
+ }, [load]);
// Materialize the local zone row on demand (writes / Cloudflare ops need it).
async function ensureZone() {
@@ -109,6 +152,80 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
}
}
+ // ── Dynamic DNS — turn a record into a token-updatable host ───────────────
+ async function handleMakeDynamic(r) {
+ setBusyKey(recordFqdn(r));
+ try {
+ const zid = await ensureZone();
+ const host = await api.createDdnsHost({ zone_id: zid, record_name: recordRelativeName(r) });
+ setRevealedHost(host); // includes the one-time token
+ toast.success('Dynamic DNS enabled');
+ await loadHosts();
+ } catch (e) {
+ toast.error(e.message || 'Failed to enable Dynamic DNS');
+ } finally {
+ setBusyKey(null);
+ }
+ }
+
+ async function handleRegenerate(host) {
+ try {
+ const updated = await api.regenerateDdnsToken(host.id);
+ setRevealedHost(updated);
+ toast.success('Token regenerated');
+ await loadHosts();
+ } catch (e) {
+ toast.error(e.message || 'Failed to regenerate token');
+ }
+ }
+
+ async function handleStopDynamic(host) {
+ if (!confirm(`Disable Dynamic DNS for ${host.hostname}? Its update token will stop working.`)) return;
+ try {
+ await api.deleteDdnsHost(host.id);
+ if (revealedHost?.id === host.id) setRevealedHost(null);
+ toast.success('Dynamic DNS disabled');
+ await loadHosts();
+ } catch (e) {
+ toast.error(e.message || 'Failed to disable Dynamic DNS');
+ }
+ }
+
+ // ── Power tools ───────────────────────────────────────────────────────────
+ async function handleExport() {
+ setExporting(true);
+ try {
+ const zid = await ensureZone();
+ const data = await api.exportDNSZone(zid);
+ const blob = new Blob([data.zone_file || ''], { type: 'text/plain' });
+ const url = URL.createObjectURL(blob);
+ const a = document.createElement('a');
+ a.href = url;
+ a.download = `${domain.name}.txt`;
+ a.click();
+ URL.revokeObjectURL(url);
+ } catch (e) {
+ toast.error(e.message || 'Export failed');
+ } finally {
+ setExporting(false);
+ }
+ }
+
+ async function handleCheckPropagation() {
+ if (propOpen) { setPropOpen(false); return; }
+ setPropOpen(true);
+ setPropLoading(true);
+ try {
+ const d = await api.checkDNSPropagation(domain.name);
+ setPropResults(d.results || []);
+ } catch (e) {
+ toast.error(e.message || 'Propagation check failed');
+ setPropResults([]);
+ } finally {
+ setPropLoading(false);
+ }
+ }
+
async function openCloudflareOps() {
try {
const zid = await ensureZone();
@@ -121,6 +238,8 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
// A proxied A/AAAA/CNAME means Cloudflare terminates TLS at its edge — i.e. the
// site is served over HTTPS with no separate certificate to manage here.
const hasProxiedSSL = isCloudflare && records.some((r) => r.proxied && PROXYABLE.includes(r.type));
+ const showActions = isAdmin || records.some((r) => !!hostFor(r));
+ const canExport = state === 'ready' && records.length > 0 && (isAdmin || !!zoneId);
return (
<div className="ddp">
@@ -140,6 +259,10 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
</div>
</div>
+ {revealedHost && (
+ <DdnsTokenCallout host={revealedHost} onDismiss={() => setRevealedHost(null)} />
+ )}
+
{canLive && (
<p className="ddp__hint">
Live from Cloudflare — records ServerKit manages are tagged; the rest are your own and shown read-only.
@@ -211,42 +334,102 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
<th className="ddp__c-ttl">TTL</th>
{isCloudflare && <th className="ddp__c-proxy">Proxy</th>}
{canLive && <th className="ddp__c-src">Source</th>}
+ {showActions && <th className="ddp__c-act" />}
</tr>
</thead>
<tbody>
- {records.map((r) => (
- <tr key={r.id}>
- <td><span className={`dns-rtype dns-rtype--${(r.type || '').toLowerCase()}`}>{r.type}</span></td>
- <td className="sk-cell-mono ddp__c-name" title={r.name}>{r.name}</td>
- <td className="sk-cell-mono ddp__content" title={r.content}>{r.priority ? `${r.priority} ` : ''}{r.content}</td>
- <td className="sk-cell-mono">{r.ttl === 1 ? 'Auto' : r.ttl}</td>
- {isCloudflare && (
- <td>{r.proxied
- ? <span className="ddp__proxy ddp__proxy--on"><Cloud size={12} /> Proxied</span>
- : <span className="ddp__proxy">DNS only</span>}</td>
- )}
- {canLive && (
- <td>{r.source === 'serverkit'
- ? <span className="ddp__src ddp__src--sk">ServerKit</span>
- : <span className="ddp__src">External</span>}</td>
- )}
- </tr>
- ))}
+ {records.map((r) => {
+ const host = hostFor(r);
+ const dynamicable = DYNAMIC_TYPES.includes(r.type);
+ return (
+ <tr key={r.id}>
+ <td><span className={`dns-rtype dns-rtype--${(r.type || '').toLowerCase()}`}>{r.type}</span></td>
+ <td className="sk-cell-mono ddp__c-name" title={r.name}>{r.name}</td>
+ <td className="sk-cell-mono ddp__content" title={r.content}>{r.priority ? `${r.priority} ` : ''}{r.content}</td>
+ <td className="sk-cell-mono">{r.ttl === 1 ? 'Auto' : r.ttl}</td>
+ {isCloudflare && (
+ <td>{r.proxied
+ ? <span className="ddp__proxy ddp__proxy--on"><Cloud size={12} /> Proxied</span>
+ : <span className="ddp__proxy">DNS only</span>}</td>
+ )}
+ {canLive && (
+ <td>{r.source === 'serverkit'
+ ? <span className="ddp__src ddp__src--sk">ServerKit</span>
+ : <span className="ddp__src">External</span>}</td>
+ )}
+ {showActions && (
+ <td className="ddp__c-act">
+ {host ? (
+ <span className="ddp__dynwrap">
+ <span className="ddp__dyn" title={host.last_ip ? `Last IP ${host.last_ip}` : 'No update yet'}>
+ <Radio size={11} /> Dynamic
+ </span>
+ {isAdmin && (
+ <>
+ <Button variant="ghost" size="sm" className="ddp__iconbtn" title="Regenerate token" onClick={() => handleRegenerate(host)}>
+ <RefreshCw size={13} />
+ </Button>
+ <Button variant="ghost" size="sm" className="ddp__stopbtn" title="Disable Dynamic DNS" onClick={() => handleStopDynamic(host)}>
+ Stop
+ </Button>
+ </>
+ )}
+ </span>
+ ) : (
+ isAdmin && dynamicable && (
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => handleMakeDynamic(r)}
+ disabled={busyKey === recordFqdn(r)}
+ >
+ <Radio size={13} /> {busyKey === recordFqdn(r) ? 'Enabling…' : 'Make dynamic'}
+ </Button>
+ )
+ )}
+ </td>
+ )}
+ </tr>
+ );
+ })}
</tbody>
</table>
</div>
)
)}
+ {propOpen && (
+ <div className="ddp__prop">
+ {propLoading && <p className="ddp__msg">Checking propagation…</p>}
+ {!propLoading && (propResults?.length ? (
+ propResults.map((r, i) => (
+ <div key={i} className="ddp__prop-row">
+ <span className={`status-dot status-dot--${r.propagated ? 'success' : 'danger'}`} />
+ <strong>{r.nameserver}</strong>
+ <span className="ddp__prop-ip">({r.ip})</span>
+ <span className="ddp__prop-res">{r.result?.join(', ') || 'No result'}</span>
+ </div>
+ ))
+ ) : (
+ <p className="ddp__msg">No propagation data.</p>
+ ))}
+ </div>
+ )}
+
<div className="ddp__foot">
+ {canExport && (
+ <Button variant="outline" size="sm" onClick={handleExport} disabled={exporting}>
+ <Download size={14} /> {exporting ? 'Exporting…' : 'Export'}
+ </Button>
+ )}
+ <Button variant="outline" size="sm" onClick={handleCheckPropagation}>
+ <Activity size={14} /> {propOpen ? 'Hide propagation' : 'Check propagation'}
+ </Button>
{isCloudflare && (
<Button variant="outline" size="sm" onClick={openCloudflareOps}>
<ProviderBrandIcon provider="cloudflare" size={14} /> Open in Cloudflare
</Button>
)}
- <Button variant="ghost" size="sm" onClick={() => navigate('/dns')}>
- <Network size={14} /> Full DNS page <ExternalLink size={12} />
- </Button>
</div>
</div>
);
diff --git a/frontend/src/components/domains/domainTabs.jsx b/frontend/src/components/domains/domainTabs.jsx
index f211c2ba..53f6a314 100644
--- a/frontend/src/components/domains/domainTabs.jsx
+++ b/frontend/src/components/domains/domainTabs.jsx
@@ -1,12 +1,10 @@
-import { Globe, Network, Lock, Radio } from 'lucide-react';
+import { Globe, Lock } from 'lucide-react';
-// Shared sub-nav for the Domains / DNS / SSL page group. Rendered in each page's
-// <PageTopbar tabs={DOMAIN_TABS}> so the tab group persists across all three
-// (the demo's top-bar layout replaces the old sidebar sub-menu — see
-// docs/REDESIGN_MAP.md §6 decision 3).
+// Shared sub-nav for the Domains / SSL page group. DNS records (and per-record
+// Dynamic DNS) now live in the Domains drawer, so DNS Zones / Dynamic DNS are no
+// longer separate tabs (the demo's top-bar layout replaces the old sidebar
+// sub-menu — see docs/REDESIGN_MAP.md §6 decision 3).
export const DOMAIN_TABS = [
{ to: '/domains', label: 'Domains', end: true, icon: <Globe size={15} /> },
- { to: '/dns', label: 'DNS Zones', icon: <Network size={15} /> },
{ to: '/ssl', label: 'SSL', icon: <Lock size={15} /> },
- { to: '/dynamic-dns', label: 'Dynamic DNS', icon: <Radio size={15} /> },
];
diff --git a/frontend/src/pages/DNSZones.jsx b/frontend/src/pages/DNSZones.jsx
deleted file mode 100644
index 7a3851e7..00000000
--- a/frontend/src/pages/DNSZones.jsx
+++ /dev/null
@@ -1,604 +0,0 @@
-import React, { useState, useEffect, useCallback } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { Globe, Layers, Cloud } from 'lucide-react';
-import { useTopbarActions } from '@/hooks/useTopbarActions';
-import api from '../services/api';
-import { useToast } from '../contexts/ToastContext';
-import { useAuth } from '../contexts/AuthContext';
-import PageLoader from '../components/PageLoader';
-import EmptyState from '../components/EmptyState';
-import { formatRelativeTime } from '../utils/serviceTypes';
-import ConfirmDialog from '../components/ConfirmDialog';
-import { FormField, FormRow } from '../components/FormField';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Badge } from '@/components/ui/badge';
-import { DataTable, SegControl } from '@/components/ds';
-import {
- Select,
- SelectTrigger,
- SelectContent,
- SelectItem,
- SelectValue,
-} from '@/components/ui/select';
-
-const DNSZones = () => {
- const toast = useToast();
- const navigate = useNavigate();
- const { user } = useAuth();
- const [zones, setZones] = useState([]);
- const [loading, setLoading] = useState(true);
- const [selectedZone, setSelectedZone] = useState(null);
- const [records, setRecords] = useState([]);
- const [showCreateZone, setShowCreateZone] = useState(false);
- const [showCreateRecord, setShowCreateRecord] = useState(false);
- const [showPropagation, setShowPropagation] = useState(null);
- const [propagationResults, setPropagationResults] = useState([]);
- const [deleteConfirm, setDeleteConfirm] = useState(null);
-
- // "All managed records" — every provider record ServerKit owns, across all
- // zones. Shown in the right column when no specific zone is selected.
- const [showManaged, setShowManaged] = useState(false);
- const [managedRecords, setManagedRecords] = useState(null); // null = not loaded
- const [managedLoading, setManagedLoading] = useState(false);
- // Inline propagation results keyed by record name (#13, reuses checkDNSPropagation).
- const [managedPropagation, setManagedPropagation] = useState({});
- const [managedChecking, setManagedChecking] = useState(null);
-
- // Records panel view: 'managed' (ServerKit records) | 'provider' (live mirror)
- const [recordsView, setRecordsView] = useState('managed');
- const [mirror, setMirror] = useState(null); // { records, counts } | { error }
- const [mirrorLoading, setMirrorLoading] = useState(false);
-
- const [zoneForm, setZoneForm] = useState({ domain: '', dns_provider_config_id: '' });
- const [providers, setProviders] = useState([]);
- const [recordForm, setRecordForm] = useState({
- record_type: 'A', name: '@', content: '', ttl: 3600, priority: null
- });
-
- const RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'TXT', 'SRV', 'CAA', 'NS'];
-
- const loadZones = useCallback(async () => {
- try {
- const data = await api.getDNSZones();
- setZones(data.zones || []);
- } catch (err) {
- toast.error('Failed to load DNS zones');
- } finally {
- setLoading(false);
- }
- }, [toast]);
-
- useEffect(() => { loadZones(); }, [loadZones]);
-
- // Lazily load connected DNS providers (Settings -> Connections) for the
- // zone picker the first time the modal opens.
- useEffect(() => {
- if (showCreateZone && providers.length === 0) {
- api.getEmailDNSProviders()
- .then(d => setProviders(d.providers || []))
- .catch(() => {});
- }
- }, [showCreateZone, providers.length]);
-
- const loadRecords = async (zoneId) => {
- try {
- const data = await api.getDNSRecords(zoneId);
- setRecords(data.records || []);
- setSelectedZone(zones.find(z => z.id === zoneId));
- // Selecting a zone leaves the cross-zone managed view.
- setShowManaged(false);
- // Reset the provider mirror when switching zones.
- setRecordsView('managed');
- setMirror(null);
- } catch (err) {
- toast.error('Failed to load records');
- }
- };
-
- // Every provider record ServerKit owns, across all zones (#14). Lazily
- // loaded the first time the panel is opened; refreshable thereafter.
- const loadManagedRecords = useCallback(async () => {
- setManagedLoading(true);
- try {
- const data = await api.getManagedDnsRecords();
- setManagedRecords(data.records || []);
- } catch (err) {
- toast.error(err.message || 'Failed to load managed records');
- setManagedRecords([]);
- } finally {
- setManagedLoading(false);
- }
- }, [toast]);
-
- const handleShowManaged = () => {
- setShowManaged(true);
- setSelectedZone(null);
- setRecords([]);
- if (managedRecords === null) loadManagedRecords();
- };
-
- // Inline propagation check for a single managed record (#13). Reuses the
- // existing checkDNSPropagation endpoint; result expands under the row.
- const handleCheckManaged = async (name) => {
- if (managedPropagation[name]) {
- // Toggle the expansion closed if already shown.
- setManagedPropagation(prev => {
- const next = { ...prev };
- delete next[name];
- return next;
- });
- return;
- }
- setManagedChecking(name);
- try {
- const data = await api.checkDNSPropagation(name);
- setManagedPropagation(prev => ({ ...prev, [name]: data.results || [] }));
- } catch (err) {
- toast.error(err.message || 'Propagation check failed');
- } finally {
- setManagedChecking(null);
- }
- };
-
- // Live records as they exist in the provider (Cloudflare only). Lazily
- // loaded the first time the "In your provider" view is opened per zone.
- const loadMirror = async (zoneId) => {
- setMirrorLoading(true);
- try {
- const data = await api.getZoneMirror(zoneId);
- if (data.success) {
- setMirror({ records: data.records || [], counts: data.counts || { serverkit: 0, external: 0 } });
- } else {
- setMirror({ error: data.error || 'Mirror unavailable for this zone' });
- }
- } catch (err) {
- setMirror({ error: err.message || 'Failed to load provider records' });
- } finally {
- setMirrorLoading(false);
- }
- };
-
- const handleRecordsView = (view) => {
- setRecordsView(view);
- if (view === 'provider' && !mirror && selectedZone) {
- loadMirror(selectedZone.id);
- }
- };
-
- const handleCreateZone = async () => {
- try {
- const payload = { domain: zoneForm.domain };
- if (zoneForm.dns_provider_config_id) {
- payload.dns_provider_config_id = Number(zoneForm.dns_provider_config_id);
- } else {
- payload.provider = 'manual';
- }
- await api.createDNSZone(payload);
- toast.success('Zone created');
- setShowCreateZone(false);
- setZoneForm({ domain: '', dns_provider_config_id: '' });
- loadZones();
- } catch (err) {
- toast.error(err.message);
- }
- };
-
- const handleCreateRecord = async () => {
- if (!selectedZone) return;
- try {
- await api.createDNSRecord(selectedZone.id, recordForm);
- toast.success('Record created');
- setShowCreateRecord(false);
- setRecordForm({ record_type: 'A', name: '@', content: '', ttl: 3600, priority: null });
- loadRecords(selectedZone.id);
- } catch (err) {
- toast.error(err.message);
- }
- };
-
- const handleDeleteRecord = async (recordId) => {
- try {
- await api.deleteDNSRecord(recordId);
- toast.success('Record deleted');
- if (selectedZone) loadRecords(selectedZone.id);
- } catch (err) {
- toast.error(err.message);
- }
- };
-
- const handleDeleteZone = async (id) => {
- try {
- await api.deleteDNSZone(id);
- toast.success('Zone deleted');
- setDeleteConfirm(null);
- if (selectedZone?.id === id) {
- setSelectedZone(null);
- setRecords([]);
- }
- loadZones();
- } catch (err) {
- toast.error(err.message);
- }
- };
-
- const handleCheckPropagation = async (domain) => {
- try {
- const data = await api.checkDNSPropagation(domain);
- setPropagationResults(data.results || []);
- setShowPropagation(domain);
- } catch (err) {
- toast.error(err.message);
- }
- };
-
- const handleExport = async (zoneId) => {
- try {
- const data = await api.exportDNSZone(zoneId);
- const blob = new Blob([data.zone_file], { type: 'text/plain' });
- const url = URL.createObjectURL(blob);
- const a = document.createElement('a');
- a.href = url;
- a.download = `${selectedZone?.domain || 'zone'}.txt`;
- a.click();
- URL.revokeObjectURL(url);
- } catch (err) {
- toast.error(err.message);
- }
- };
-
- useTopbarActions(() =>
- user?.is_admin && (
- <Button size="sm" onClick={() => setShowCreateZone(true)}>Add Zone</Button>
- ),
- [user?.is_admin],
- );
-
- if (loading) return <PageLoader />;
-
- return (
- <div className="sk-tabgroup__inner dns-zones-page">
- <div className="dns-layout">
- <div className="dns-zones-list">
- <button
- type="button"
- className={`dns-managed-link ${showManaged ? 'active' : ''}`}
- onClick={handleShowManaged}
- >
- <Layers size={15} />
- <span>All managed records</span>
- </button>
- {zones.map(zone => (
- <div key={zone.id}
- className={`dns-zone-item ${selectedZone?.id === zone.id ? 'active' : ''}`}
- onClick={() => loadRecords(zone.id)}>
- <div className="dns-zone-item__info">
- <strong>{zone.domain}</strong>
- <span className="text-muted">{zone.provider} &bull; {zone.record_count} records</span>
- </div>
- <div className="dns-zone-item__actions" onClick={e => e.stopPropagation()}>
- {zone.provider === 'cloudflare' && (
- <Button variant="outline" size="sm" title="Cloudflare zone settings"
- onClick={() => navigate(`/cloudflare/zones/${zone.id}`)}>
- <Cloud size={14} /> Cloudflare
- </Button>
- )}
- <Button variant="outline" size="sm" onClick={() => handleCheckPropagation(zone.domain)}>Check</Button>
- {user?.is_admin && (
- <Button variant="destructive" size="sm" onClick={() => setDeleteConfirm(zone)}>Delete</Button>
- )}
- </div>
- </div>
- ))}
- {zones.length === 0 && <EmptyState icon={Globe} title="No DNS zones configured" />}
- </div>
-
- {showManaged && (
- <div className="dns-records-panel">
- <div className="dns-records-panel__header">
- <h2>All managed records</h2>
- <div className="dns-records-panel__actions">
- {managedRecords !== null && (
- <span className="dns-managed__count">{managedRecords.length} total</span>
- )}
- <Button variant="outline" size="sm" onClick={loadManagedRecords} disabled={managedLoading}>
- {managedLoading ? 'Refreshing…' : 'Refresh'}
- </Button>
- </div>
- </div>
- <p className="dns-managed__hint">
- Every DNS record ServerKit owns across all your provider zones.
- </p>
- <DataTable
- tableClassName="sk-dtable dns-records-table"
- sortable={false}
- loading={managedLoading}
- data={managedRecords || []}
- keyField="id"
- emptyTitle="No managed records"
- emptyMessage="ServerKit hasn't created any provider DNS records yet."
- renderRow={(rec, { key, className }) => {
- const results = managedPropagation[rec.name];
- return (
- <React.Fragment key={key}>
- <tr className={className}>
- <td>
- <span className={`dns-rtype dns-rtype--${(rec.record_type || '').toLowerCase()}`}>{rec.record_type}</span>
- <span className="dns-managed__name">{rec.name}</span>
- </td>
- <td><span className="sk-cell-mono">{rec.provider_zone_id || '-'}</span></td>
- <td>{rec.source ? <span className="dns-source-chip">{rec.source}</span> : '-'}</td>
- <td>{rec.app_name || '-'}</td>
- <td>{formatRelativeTime(rec.created_at) || '-'}</td>
- <td className="dns-managed__action-cell">
- <Button
- variant="outline"
- size="sm"
- onClick={() => handleCheckManaged(rec.name)}
- disabled={managedChecking === rec.name}
- >
- {managedChecking === rec.name ? 'Checking…' : results ? 'Hide' : 'Check'}
- </Button>
- </td>
- </tr>
- {results && (
- <tr className="dns-managed__prop-row">
- <td colSpan={6}>
- <div className="dns-managed__prop">
- {results.length === 0 && (
- <span className="text-muted">No propagation data.</span>
- )}
- {results.map((r, i) => (
- <div key={i} className="propagation-row">
- <span className={`status-dot status-dot--${r.propagated ? 'success' : 'danger'}`} />
- <strong>{r.nameserver}</strong>
- <span className="text-muted">({r.ip})</span>
- <span className="text-mono">{r.result?.join(', ') || 'No result'}</span>
- </div>
- ))}
- </div>
- </td>
- </tr>
- )}
- </React.Fragment>
- );
- }}
- columns={[
- { key: 'record', header: 'Record' },
- { key: 'zone', header: 'Zone' },
- { key: 'source', header: 'Source' },
- { key: 'app', header: 'App' },
- { key: 'created_at', header: 'Created' },
- { key: 'actions', header: '' },
- ]}
- />
- </div>
- )}
-
- {selectedZone && (
- <div className="dns-records-panel">
- <div className="dns-records-panel__header">
- <h2>{selectedZone.domain}</h2>
- <div className="dns-records-panel__actions">
- <Button variant="outline" size="sm" onClick={() => handleExport(selectedZone.id)}>Export</Button>
- {user?.is_admin && recordsView === 'managed' && (
- <Button size="sm" onClick={() => setShowCreateRecord(true)}>Add Record</Button>
- )}
- </div>
- </div>
-
- <SegControl
- className="dns-records-panel__seg"
- value={recordsView}
- onChange={handleRecordsView}
- options={[
- { value: 'managed', label: 'ServerKit records' },
- { value: 'provider', label: 'In your provider' },
- ]}
- />
-
- {recordsView === 'managed' ? (
- <DataTable
- tableClassName="sk-dtable dns-records-table"
- sortable={false}
- data={records}
- keyField="id"
- emptyTitle="No records"
- emptyMessage="This zone has no DNS records yet."
- columns={[
- {
- key: 'type',
- header: 'Type',
- render: (rec) => <span className={`dns-rtype dns-rtype--${(rec.record_type || '').toLowerCase()}`}>{rec.record_type}</span>,
- },
- { key: 'name', header: 'Name' },
- { key: 'content', header: 'Content', render: (rec) => <span className="sk-cell-mono">{rec.content}</span> },
- { key: 'ttl', header: 'TTL' },
- { key: 'priority', header: 'Priority', render: (rec) => rec.priority || '-' },
- {
- key: 'actions',
- header: '',
- render: (rec) => (
- user?.is_admin && (
- <Button variant="destructive" size="sm" onClick={() => handleDeleteRecord(rec.id)}>Delete</Button>
- )
- ),
- },
- ]}
- />
- ) : (
- <div className="dns-mirror">
- {mirrorLoading && <div className="dns-mirror__status">Loading provider records…</div>}
- {!mirrorLoading && mirror?.error && (
- <div className="dns-mirror__status dns-mirror__status--error">{mirror.error}</div>
- )}
- {!mirrorLoading && mirror && !mirror.error && (
- <>
- <p className="dns-mirror__summary">
- <span className="dns-mirror__count">{mirror.counts.serverkit} managed</span>
- {' · '}
- <span className="dns-mirror__count">{mirror.counts.external} external</span>
- <span className="dns-mirror__hint"> — ServerKit never modifies external records.</span>
- </p>
- <DataTable
- tableClassName="sk-dtable dns-records-table"
- sortable={false}
- data={mirror.records}
- keyField="id"
- emptyTitle="No records"
- emptyMessage="No records exist in the provider for this zone."
- rowClassName={(rec) => rec.managed_by === 'external' ? 'dns-mirror__row--external' : ''}
- columns={[
- {
- key: 'type',
- header: 'Type',
- render: (rec) => <span className={`dns-rtype dns-rtype--${(rec.type || '').toLowerCase()}`}>{rec.type}</span>,
- },
- { key: 'name', header: 'Name' },
- { key: 'content', header: 'Content', render: (rec) => <span className="sk-cell-mono">{rec.content}</span> },
- { key: 'ttl', header: 'TTL', render: (rec) => rec.ttl || '-' },
- {
- key: 'managed_by',
- header: 'Source',
- render: (rec) => rec.managed_by === 'serverkit'
- ? <Badge variant="success">ServerKit</Badge>
- : <Badge variant="secondary" title="Created outside ServerKit — never modified">External</Badge>,
- },
- ]}
- />
- </>
- )}
- </div>
- )}
- </div>
- )}
- </div>
-
- {showCreateZone && (
- <div className="modal-overlay" onClick={() => setShowCreateZone(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Add DNS Zone</h2>
- <button className="modal-close" onClick={() => setShowCreateZone(false)}>&times;</button>
- </div>
- <div className="modal-body">
- <FormField label="Domain" htmlFor="zone-domain">
- <Input id="zone-domain" value={zoneForm.domain} onChange={e => setZoneForm({...zoneForm, domain: e.target.value})} placeholder="example.com" />
- </FormField>
- <FormField label="DNS Provider">
- <Select
- value={zoneForm.dns_provider_config_id || 'manual'}
- onValueChange={v => setZoneForm({ ...zoneForm, dns_provider_config_id: v === 'manual' ? '' : v })}
- >
- <SelectTrigger id="zone-provider">
- <SelectValue />
- </SelectTrigger>
- <SelectContent>
- <SelectItem value="manual">Manual (no automatic sync)</SelectItem>
- {providers.map(p => (
- <SelectItem key={p.id} value={String(p.id)}>
- {p.name} — {p.provider}
- </SelectItem>
- ))}
- </SelectContent>
- </Select>
- </FormField>
- {zoneForm.dns_provider_config_id ? (
- <p className="text-muted text-sm">
- Records added here sync to this connection. We will match{' '}
- <strong>{zoneForm.domain || 'your domain'}</strong> to a zone in that
- account automatically — no zone ID or token to paste.
- </p>
- ) : (
- <p className="text-muted text-sm">
- Manual zones are not pushed to a provider. To sync automatically,{' '}
- <a href="/settings?tab=connections">connect a DNS provider</a> first.
- </p>
- )}
- </div>
- <div className="modal-footer">
- <Button variant="outline" onClick={() => setShowCreateZone(false)}>Cancel</Button>
- <Button onClick={handleCreateZone} disabled={!zoneForm.domain}>Create</Button>
- </div>
- </div>
- </div>
- )}
-
- {showCreateRecord && (
- <div className="modal-overlay" onClick={() => setShowCreateRecord(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Add DNS Record</h2>
- <button className="modal-close" onClick={() => setShowCreateRecord(false)}>&times;</button>
- </div>
- <div className="modal-body">
- <FormField label="Type">
- <Select value={recordForm.record_type} onValueChange={v => setRecordForm({...recordForm, record_type: v})}>
- <SelectTrigger id="record-type">
- <SelectValue />
- </SelectTrigger>
- <SelectContent>
- {RECORD_TYPES.map(t => <SelectItem key={t} value={t}>{t}</SelectItem>)}
- </SelectContent>
- </Select>
- </FormField>
- <FormField label="Name" htmlFor="record-name">
- <Input id="record-name" value={recordForm.name} onChange={e => setRecordForm({...recordForm, name: e.target.value})} placeholder="@ or subdomain" />
- </FormField>
- <FormField label="Content" htmlFor="record-content">
- <Input id="record-content" value={recordForm.content} onChange={e => setRecordForm({...recordForm, content: e.target.value})} placeholder="IP address or hostname" />
- </FormField>
- <FormRow>
- <FormField label="TTL" htmlFor="record-ttl">
- <Input id="record-ttl" type="number" value={recordForm.ttl} onChange={e => setRecordForm({...recordForm, ttl: parseInt(e.target.value) || 3600})} />
- </FormField>
- {(recordForm.record_type === 'MX' || recordForm.record_type === 'SRV') && (
- <FormField label="Priority" htmlFor="record-priority">
- <Input id="record-priority" type="number" value={recordForm.priority || ''} onChange={e => setRecordForm({...recordForm, priority: parseInt(e.target.value) || null})} />
- </FormField>
- )}
- </FormRow>
- </div>
- <div className="modal-footer">
- <Button variant="outline" onClick={() => setShowCreateRecord(false)}>Cancel</Button>
- <Button onClick={handleCreateRecord} disabled={!recordForm.content}>Create</Button>
- </div>
- </div>
- </div>
- )}
-
- {showPropagation && (
- <div className="modal-overlay" onClick={() => setShowPropagation(null)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>DNS Propagation: {showPropagation}</h2>
- <button className="modal-close" onClick={() => setShowPropagation(null)}>&times;</button>
- </div>
- <div className="modal-body">
- {propagationResults.map((r, i) => (
- <div key={i} className="propagation-row">
- <span className={`status-dot status-dot--${r.propagated ? 'success' : 'danger'}`} />
- <strong>{r.nameserver}</strong>
- <span className="text-muted">({r.ip})</span>
- <span className="text-mono">{r.result?.join(', ') || 'No result'}</span>
- </div>
- ))}
- </div>
- </div>
- </div>
- )}
-
- {deleteConfirm && (
- <ConfirmDialog
- title="Delete Zone"
- message={`Delete zone "${deleteConfirm.domain}"? All records will be removed.`}
- onConfirm={() => handleDeleteZone(deleteConfirm.id)}
- onCancel={() => setDeleteConfirm(null)}
- variant="danger"
- />
- )}
- </div>
- );
-};
-
-export default DNSZones;
diff --git a/frontend/src/pages/Domains.jsx b/frontend/src/pages/Domains.jsx
index 98cdf0f0..c921e61b 100644
--- a/frontend/src/pages/Domains.jsx
+++ b/frontend/src/pages/Domains.jsx
@@ -1,4 +1,5 @@
import { useState, useEffect } from 'react';
+import { useSearchParams } from 'react-router-dom';
import {
Globe, Plus, ShieldCheck, RefreshCw, Trash2, ExternalLink,
AlertTriangle, Clock, Lock, Search, ChevronRight,
@@ -33,6 +34,7 @@ const Domains = () => {
const [filter, setFilter] = useState('all');
const [drawerDomain, setDrawerDomain] = useState(null);
const [regInfo, setRegInfo] = useState(null); // lazy registration lookup for the open drawer
+ const [searchParams, setSearchParams] = useSearchParams();
// Modal states
const [showAddModal, setShowAddModal] = useState(false);
@@ -265,6 +267,20 @@ const Domains = () => {
: filter === 'issues' ? (d.source !== 'provider' && !d.ssl_enabled) : true
));
+ // Deep-link: /domains?open=<domain> opens that domain's drawer once data has
+ // loaded — keeps links sensible now that this is the single DNS surface.
+ useEffect(() => {
+ const want = searchParams.get('open');
+ if (!want || loading || drawerDomain) return;
+ const row = mergedRows.find((d) => norm(d.name) === norm(want));
+ if (row) {
+ setDrawerDomain(row);
+ const next = new URLSearchParams(searchParams);
+ next.delete('open');
+ setSearchParams(next, { replace: true });
+ }
+ }, [loading, searchParams]); // eslint-disable-line react-hooks/exhaustive-deps
+
useTopbarActions(() =>
<>
<Button variant="outline" size="sm" onClick={loadData}>
diff --git a/frontend/src/pages/DynamicDns.jsx b/frontend/src/pages/DynamicDns.jsx
deleted file mode 100644
index bca18d2a..00000000
--- a/frontend/src/pages/DynamicDns.jsx
+++ /dev/null
@@ -1,258 +0,0 @@
-import { useState, useEffect, useCallback } from 'react';
-import { Network, AlertTriangle } from 'lucide-react';
-import api from '../services/api';
-import { useToast } from '../contexts/ToastContext';
-import PageLoader from '../components/PageLoader';
-import EmptyState from '../components/EmptyState';
-import ConfirmDialog from '../components/ConfirmDialog';
-import { FormField } from '../components/FormField';
-import CopyButton from '../components/CopyButton';
-import { DataTable } from '@/components/ds';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import {
- Select,
- SelectTrigger,
- SelectContent,
- SelectItem,
- SelectValue,
-} from '@/components/ui/select';
-
-// One-time token callout — the token is only returned once on create/regenerate.
-const TokenCallout = ({ host, onDismiss }) => {
- const updateUrl = `${window.location.origin}/api/v1/ddns/update?token=${host.token}`;
-
- return (
- <div className="ddns-token-callout">
- <div className="ddns-token-callout__head">
- <AlertTriangle size={16} />
- <span>
- Token for <strong>{host.hostname || host.record_name}</strong> — shown once. Save it now.
- </span>
- <button className="ddns-token-callout__close" onClick={onDismiss} aria-label="Dismiss">
- &times;
- </button>
- </div>
-
- <div className="ddns-token-callout__row">
- <span className="ddns-token-callout__label">Token</span>
- <code className="ddns-token-callout__value">{host.token}</code>
- <CopyButton value={host.token} label="Copy token" size="sm" variant="outline" />
- </div>
-
- <div className="ddns-token-callout__row">
- <span className="ddns-token-callout__label">Update URL</span>
- <code className="ddns-token-callout__value">{updateUrl}</code>
- <CopyButton value={updateUrl} label="Copy URL" size="sm" variant="outline" />
- </div>
- </div>
- );
-};
-
-const DynamicDns = () => {
- const toast = useToast();
- const [hosts, setHosts] = useState([]);
- const [zones, setZones] = useState([]);
- const [loading, setLoading] = useState(true);
- const [creating, setCreating] = useState(false);
- const [revealedToken, setRevealedToken] = useState(null);
- const [deleteConfirm, setDeleteConfirm] = useState(null);
-
- const [form, setForm] = useState({ zone_id: '', record_name: '', label: '', enabled: true });
-
- const loadHosts = useCallback(async () => {
- try {
- const data = await api.getDdnsHosts();
- setHosts(data.hosts || []);
- } catch {
- toast.error('Failed to load dynamic DNS hosts');
- } finally {
- setLoading(false);
- }
- }, [toast]);
-
- const loadZones = useCallback(async () => {
- try {
- const data = await api.getDNSZones();
- setZones(data.zones || []);
- } catch {
- /* zones populate the create form; a failure just leaves it empty */
- }
- }, []);
-
- useEffect(() => {
- loadHosts();
- loadZones();
- }, [loadHosts, loadZones]);
-
- async function handleCreate() {
- if (!form.zone_id || !form.record_name.trim()) {
- toast.error('Pick a zone and enter a record name');
- return;
- }
- setCreating(true);
- try {
- const host = await api.createDdnsHost({
- zone_id: form.zone_id,
- record_name: form.record_name.trim(),
- label: form.label.trim() || undefined,
- enabled: form.enabled,
- });
- toast.success('Dynamic DNS host created');
- setRevealedToken(host);
- setForm({ zone_id: '', record_name: '', label: '', enabled: true });
- loadHosts();
- } catch (err) {
- toast.error(err.message || 'Failed to create host');
- } finally {
- setCreating(false);
- }
- }
-
- async function handleRegenerate(host) {
- try {
- const updated = await api.regenerateDdnsToken(host.id);
- toast.success('Token regenerated');
- setRevealedToken(updated);
- loadHosts();
- } catch (err) {
- toast.error(err.message || 'Failed to regenerate token');
- }
- }
-
- async function handleDelete(id) {
- try {
- await api.deleteDdnsHost(id);
- toast.success('Host deleted');
- setDeleteConfirm(null);
- if (revealedToken?.id === id) setRevealedToken(null);
- loadHosts();
- } catch (err) {
- toast.error(err.message || 'Failed to delete host');
- }
- }
-
- if (loading) return <PageLoader />;
-
- return (
- <div className="sk-tabgroup__inner ddns-page">
- {revealedToken && (
- <TokenCallout host={revealedToken} onDismiss={() => setRevealedToken(null)} />
- )}
-
- <div className="ddns-layout">
- {/* Create form */}
- <div className="ddns-create">
- <h2 className="ddns-create__title">Add a host</h2>
- <p className="ddns-create__hint">
- Create an A-record that a remote machine can keep up to date by calling the
- update URL. The token is shown once after creation.
- </p>
-
- <FormField label="Zone">
- <Select value={form.zone_id} onValueChange={(v) => setForm({ ...form, zone_id: v })}>
- <SelectTrigger id="ddns-zone">
- <SelectValue placeholder={zones.length ? 'Select a zone' : 'No zones available'} />
- </SelectTrigger>
- <SelectContent>
- {zones.map((z) => (
- <SelectItem key={z.id} value={String(z.id)}>{z.domain}</SelectItem>
- ))}
- </SelectContent>
- </Select>
- </FormField>
-
- <FormField label="Record name" htmlFor="ddns-record">
- <Input
- id="ddns-record"
- value={form.record_name}
- onChange={(e) => setForm({ ...form, record_name: e.target.value })}
- placeholder="home (or @ for the apex)"
- />
- </FormField>
-
- <FormField label="Label (optional)" htmlFor="ddns-label" hint="e.g. Home office router">
- <Input
- id="ddns-label"
- value={form.label}
- onChange={(e) => setForm({ ...form, label: e.target.value })}
- placeholder="e.g. Home office router"
- />
- </FormField>
-
- <Button onClick={handleCreate} disabled={creating || zones.length === 0}>
- {creating ? 'Creating…' : 'Create host'}
- </Button>
- {zones.length === 0 && (
- <p className="ddns-create__warn">Add a DNS zone first to create a dynamic host.</p>
- )}
- </div>
-
- {/* Hosts table */}
- <div className="ddns-hosts">
- <DataTable
- tableClassName="sk-dtable ddns-hosts__table"
- sortable={false}
- data={hosts}
- keyField="id"
- emptyState={<EmptyState icon={Network} title="No dynamic DNS hosts yet" />}
- columns={[
- {
- key: 'hostname',
- header: 'Hostname',
- render: (host) => (
- <div className="ddns-hosts__name">
- <strong>{host.hostname || host.record_name}</strong>
- {host.label && <span className="text-muted">{host.label}</span>}
- </div>
- ),
- },
- { key: 'lastIp', header: 'Last IP', render: (host) => <span className="sk-cell-mono">{host.last_ip || '—'}</span> },
- {
- key: 'lastUpdate',
- header: 'Last update',
- render: (host) => (host.last_update_at ? new Date(host.last_update_at).toLocaleString() : 'Never'),
- },
- {
- key: 'status',
- header: 'Status',
- render: (host) => (
- <>
- <span className={`status-dot status-dot--${host.enabled ? 'success' : 'danger'}`} />
- {host.enabled ? 'Enabled' : 'Disabled'}
- </>
- ),
- },
- {
- key: 'actions',
- header: '',
- render: (host) => (
- <div className="ddns-hosts__actions">
- <Button variant="outline" size="sm" onClick={() => handleRegenerate(host)}>
- Regenerate token
- </Button>
- <Button variant="destructive" size="sm" onClick={() => setDeleteConfirm(host)}>
- Delete
- </Button>
- </div>
- ),
- },
- ]}
- />
- </div>
- </div>
-
- {deleteConfirm && (
- <ConfirmDialog
- title="Delete dynamic DNS host"
- message={`Delete "${deleteConfirm.hostname || deleteConfirm.record_name}"? Its update token will stop working.`}
- onConfirm={() => handleDelete(deleteConfirm.id)}
- onCancel={() => setDeleteConfirm(null)}
- variant="danger"
- />
- )}
- </div>
- );
-};
-
-export default DynamicDns;
diff --git a/frontend/src/styles/main.scss b/frontend/src/styles/main.scss
index 731a4e33..d76c3df4 100644
--- a/frontend/src/styles/main.scss
+++ b/frontend/src/styles/main.scss
@@ -110,7 +110,6 @@
@import 'pages/_server-services';
@import 'pages/_remote-access';
@import 'pages/_workspaces';
-@import 'pages/_dns-zones';
@import 'pages/_cloudflare-zone';
@import 'pages/_status-pages';
@import 'pages/_cloud-provision';
@@ -119,7 +118,6 @@
@import 'pages/_app-map';
@import 'pages/_secrets';
@import 'pages/_gpu';
-@import 'pages/_dynamic-dns';
@import 'pages/_queue-operations';
@import 'pages/_telemetry';
@import 'pages/_jobs';
diff --git a/frontend/src/styles/pages/_dns-zones.scss b/frontend/src/styles/pages/_dns-zones.scss
deleted file mode 100644
index f408f82b..00000000
--- a/frontend/src/styles/pages/_dns-zones.scss
+++ /dev/null
@@ -1,215 +0,0 @@
-// DNS Zones page styles
-
-.dns-zones-page {
- .dns-layout {
- display: grid;
- grid-template-columns: 320px 1fr;
- gap: $spacing-lg;
- margin-top: $spacing-lg;
-
- @media (max-width: 900px) {
- grid-template-columns: 1fr;
- }
- }
-
- .dns-zones-list {
- display: flex;
- flex-direction: column;
- gap: $spacing-xs;
- }
-
- .dns-zone-item {
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: $spacing-md;
- background: $card-bg;
- border: 1px solid $border-color;
- border-radius: $radius-md;
- cursor: pointer;
- transition: border-color 0.15s;
-
- &:hover, &.active {
- border-color: $primary-color;
- }
-
- &__info {
- display: flex;
- flex-direction: column;
- gap: 2px;
- }
-
- &__actions {
- display: flex;
- gap: $spacing-xs;
- }
- }
-
- .dns-records-panel {
- background: $card-bg;
- border: 1px solid $border-color;
- border-radius: $radius-lg;
- padding: $spacing-lg;
-
- &__header {
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-bottom: $spacing-lg;
-
- h2 { margin: 0; }
- }
-
- &__actions {
- display: flex;
- gap: $spacing-sm;
- }
-
- &__seg {
- margin-bottom: $spacing-md;
- }
- }
-
- // "In your provider" mirror — live records as they exist in Cloudflare,
- // tagged ServerKit-managed vs external (read-only).
- .dns-mirror {
- &__status {
- padding: $spacing-md 0;
- color: var(--text-dim);
- font-size: 0.85rem;
-
- &--error { color: var(--red); }
- }
-
- &__summary {
- display: flex;
- flex-wrap: wrap;
- align-items: baseline;
- gap: 4px;
- margin: 0 0 $spacing-md;
- font-size: 0.85rem;
- color: var(--text-dim);
- }
-
- &__count {
- font-weight: 600;
- color: var(--text);
- }
-
- &__hint {
- color: var(--text-dim);
- }
-
- // External (provider-owned) rows read muted/read-only.
- &__row--external {
- opacity: 0.7;
-
- .sk-cell-mono { color: var(--text-dim); }
- }
- }
-
- .text-mono {
- font-family: $font-mono;
- font-size: 0.85rem;
- }
-
- .propagation-row {
- display: flex;
- align-items: center;
- gap: $spacing-sm;
- padding: $spacing-sm 0;
- border-bottom: 1px solid $border-color;
-
- &:last-child { border-bottom: none; }
- }
-
- .form-row {
- display: grid;
- grid-template-columns: 1fr 1fr;
- gap: $spacing-md;
- }
-
- // "All managed records" — cross-zone view of every record ServerKit owns.
- .dns-managed-link {
- display: flex;
- align-items: center;
- gap: $spacing-sm;
- width: 100%;
- padding: $spacing-md;
- margin-bottom: $spacing-xs;
- background: $card-bg;
- border: 1px solid $border-color;
- border-radius: $radius-md;
- color: var(--text);
- font-size: 0.9rem;
- font-weight: 600;
- text-align: left;
- cursor: pointer;
- transition: border-color 0.15s;
-
- &:hover, &.active { border-color: $primary-color; }
-
- svg { color: var(--text-dim); flex-shrink: 0; }
- }
-
- .dns-managed {
- &__hint {
- margin: -#{$spacing-sm} 0 $spacing-md;
- font-size: 0.85rem;
- color: var(--text-dim);
- }
-
- &__count {
- font-size: 0.85rem;
- color: var(--text-dim);
- align-self: center;
- }
-
- // record_type chip already sits inline; space the name after it.
- &__name { margin-left: $spacing-sm; }
-
- &__action-cell { text-align: right; white-space: nowrap; }
-
- &__prop-row td { padding: 0 16px $spacing-sm; }
-
- &__prop {
- padding: $spacing-sm $spacing-md;
- background: var(--surface-2);
- border-radius: $radius-md;
- }
- }
-
- // Provenance chip for a managed record (source: zone/ddns/wordpress/...).
- .dns-source-chip {
- display: inline-flex;
- align-items: center;
- padding: 2px 8px;
- border-radius: 5px;
- font-family: var(--mono);
- font-size: 10.5px;
- font-weight: 600;
- letter-spacing: 0.03em;
- background: var(--surface-3);
- color: var(--text-dim);
- }
-}
-
-// Colored DNS record-type chip (redesign)
-.dns-rtype {
- display: inline-flex;
- align-items: center;
- padding: 2px 7px;
- border-radius: 5px;
- font-family: var(--mono);
- font-size: 10.5px;
- font-weight: 600;
- letter-spacing: 0.04em;
- background: var(--surface-3);
- color: var(--text-dim);
-
- &--a, &--aaaa, &--ns { background: var(--accent-bg); color: var(--accent-bright); }
- &--cname { background: var(--cyan-bg); color: var(--cyan); }
- &--mx { background: var(--amber-bg); color: var(--amber); }
- &--txt, &--spf { background: var(--green-bg); color: var(--green); }
- &--soa, &--srv, &--caa { background: var(--violet-bg); color: var(--violet); }
-}
diff --git a/frontend/src/styles/pages/_domains.scss b/frontend/src/styles/pages/_domains.scss
index 5af54e14..ee1b861d 100644
--- a/frontend/src/styles/pages/_domains.scss
+++ b/frontend/src/styles/pages/_domains.scss
@@ -270,6 +270,63 @@
padding-top: $space-2;
border-top: 1px solid $border-subtle;
}
+
+ // Per-record actions column — "Make dynamic" / Dynamic-host controls.
+ &__c-act { width: 168px; text-align: right; }
+
+ &__dynwrap {
+ display: inline-flex;
+ align-items: center;
+ justify-content: flex-end;
+ gap: 6px;
+ }
+
+ // "Dynamic" badge on a record that is a token-updatable DDNS host.
+ &__dyn {
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+ padding: 1px 7px;
+ border-radius: $radius-full;
+ font-size: 11px;
+ font-weight: $font-weight-medium;
+ color: var(--accent-bright);
+ background: var(--accent-bg);
+
+ svg { flex-shrink: 0; }
+ }
+
+ &__iconbtn { padding-inline: $space-2; }
+ &__stopbtn { color: $danger; }
+
+ // Inline propagation results (moved from the retired DNS Zones page).
+ &__prop {
+ display: flex;
+ flex-direction: column;
+ padding: $space-2 $space-3;
+ background: var(--surface-2);
+ border-radius: $radius-md;
+ }
+
+ &__prop-row {
+ display: flex;
+ align-items: center;
+ gap: $space-2;
+ padding: $space-2 0;
+ font-size: $font-size-sm;
+ border-bottom: 1px solid $border-subtle;
+
+ &:last-child { border-bottom: none; }
+ }
+
+ &__prop-ip { color: $text-tertiary; }
+
+ &__prop-res {
+ margin-left: auto;
+ font-family: var(--mono);
+ font-size: $font-size-xs;
+ color: $text-secondary;
+ }
}
// ── Detail drawer body ──────────────────────────────────────
@@ -394,3 +451,86 @@
accent-color: $accent-primary;
}
}
+
+// ── Relocated from the retired DNS Zones / Dynamic DNS pages ─────────────────
+// Colored DNS record-type chip — used by the drawer's record table and the
+// Connections → DNS activity feed (DnsActivity.jsx), so it stays global.
+.dns-rtype {
+ display: inline-flex;
+ align-items: center;
+ padding: 2px 7px;
+ border-radius: 5px;
+ font-family: var(--mono);
+ font-size: 10.5px;
+ font-weight: 600;
+ letter-spacing: 0.04em;
+ background: var(--surface-3);
+ color: var(--text-dim);
+
+ &--a, &--aaaa, &--ns { background: var(--accent-bg); color: var(--accent-bright); }
+ &--cname { background: var(--cyan-bg); color: var(--cyan); }
+ &--mx { background: var(--amber-bg); color: var(--amber); }
+ &--txt, &--spf { background: var(--green-bg); color: var(--green); }
+ &--soa, &--srv, &--caa { background: var(--violet-bg); color: var(--violet); }
+}
+
+// One-time Dynamic DNS token callout (DdnsTokenCallout.jsx, shown in the drawer).
+.ddns-token-callout {
+ margin-top: $spacing-lg;
+ background: var(--amber-bg);
+ border: 1px solid var(--amber);
+ border-radius: var(--radius);
+ padding: $spacing-md $spacing-lg;
+
+ &__head {
+ display: flex;
+ align-items: center;
+ gap: $spacing-sm;
+ font-size: 13.5px;
+ color: var(--text);
+
+ svg { color: var(--amber); flex-shrink: 0; }
+ }
+
+ &__close {
+ margin-left: auto;
+ background: none;
+ border: none;
+ color: var(--text-dim);
+ font-size: 20px;
+ line-height: 1;
+ cursor: pointer;
+
+ &:hover { color: var(--text); }
+ }
+
+ &__row {
+ display: flex;
+ align-items: center;
+ gap: $spacing-sm;
+ margin-top: $spacing-md;
+ }
+
+ &__label {
+ flex-shrink: 0;
+ width: 84px;
+ font-family: var(--mono);
+ font-size: 11px;
+ text-transform: uppercase;
+ letter-spacing: 0.06em;
+ color: var(--text-faint);
+ }
+
+ &__value {
+ flex: 1;
+ min-width: 0;
+ background: var(--surface);
+ border: 1px solid var(--border-soft);
+ border-radius: $radius-sm;
+ padding: $spacing-xs $spacing-sm;
+ font-family: var(--mono);
+ font-size: 12px;
+ color: var(--text);
+ word-break: break-all;
+ }
+}
diff --git a/frontend/src/styles/pages/_dynamic-dns.scss b/frontend/src/styles/pages/_dynamic-dns.scss
deleted file mode 100644
index ca8c66ea..00000000
--- a/frontend/src/styles/pages/_dynamic-dns.scss
+++ /dev/null
@@ -1,133 +0,0 @@
-// Dynamic DNS page styles
-
-.ddns-page {
- .ddns-layout {
- display: grid;
- grid-template-columns: 340px 1fr;
- gap: $spacing-lg;
- margin-top: $spacing-lg;
-
- @media (max-width: 900px) {
- grid-template-columns: 1fr;
- }
- }
-
- .ddns-create {
- background: var(--surface);
- border: 1px solid var(--border-soft);
- border-radius: var(--radius);
- padding: $spacing-lg;
- align-self: start;
-
- &__title {
- margin: 0 0 $spacing-xs;
- font-size: 1rem;
- }
-
- &__hint {
- margin: 0 0 $spacing-md;
- font-size: 13px;
- line-height: 1.5;
- color: var(--text-dim);
- }
-
- &__warn {
- margin: $spacing-sm 0 0;
- font-size: 12.5px;
- color: var(--amber);
- }
-
- .form-group {
- margin-bottom: $spacing-md;
- }
- }
-
- .ddns-hosts {
- background: var(--surface);
- border: 1px solid var(--border-soft);
- border-radius: var(--radius);
- padding: $spacing-md;
- overflow-x: auto;
-
- &__table {
- width: 100%;
- }
-
- &__name {
- display: flex;
- flex-direction: column;
- gap: 2px;
-
- .text-muted {
- font-size: 12px;
- }
- }
-
- &__actions {
- display: flex;
- gap: $spacing-xs;
- justify-content: flex-end;
- }
- }
-}
-
-// One-time token callout (shared look with secret-reveal surfaces)
-.ddns-token-callout {
- margin-top: $spacing-lg;
- background: var(--amber-bg);
- border: 1px solid var(--amber);
- border-radius: var(--radius);
- padding: $spacing-md $spacing-lg;
-
- &__head {
- display: flex;
- align-items: center;
- gap: $spacing-sm;
- font-size: 13.5px;
- color: var(--text);
-
- svg { color: var(--amber); flex-shrink: 0; }
- }
-
- &__close {
- margin-left: auto;
- background: none;
- border: none;
- color: var(--text-dim);
- font-size: 20px;
- line-height: 1;
- cursor: pointer;
-
- &:hover { color: var(--text); }
- }
-
- &__row {
- display: flex;
- align-items: center;
- gap: $spacing-sm;
- margin-top: $spacing-md;
- }
-
- &__label {
- flex-shrink: 0;
- width: 84px;
- font-family: var(--mono);
- font-size: 11px;
- text-transform: uppercase;
- letter-spacing: 0.06em;
- color: var(--text-faint);
- }
-
- &__value {
- flex: 1;
- min-width: 0;
- background: var(--surface);
- border: 1px solid var(--border-soft);
- border-radius: $radius-sm;
- padding: $spacing-xs $spacing-sm;
- font-family: var(--mono);
- font-size: 12px;
- color: var(--text);
- word-break: break-all;
- }
-}