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(security): shared EmptyState + useConfirm everywhere

Juan Denis037e8842f733
diff --git a/frontend/src/components/security/AuditTab.jsx b/frontend/src/components/security/AuditTab.jsx
index 25290fc8..e754bc5f 100644
--- a/frontend/src/components/security/AuditTab.jsx
+++ b/frontend/src/components/security/AuditTab.jsx
@@ -1,5 +1,7 @@
import { useState } from 'react';
+import { ClipboardCheck } from 'lucide-react';
import api from '../../services/api';
+import EmptyState from '@/components/EmptyState';
import { Button } from '@/components/ui/button';
import { ScoreGauge } from '@/components/ds';
@@ -48,12 +50,10 @@ const AuditTab = () => {
{error && <div className="alert alert-danger">{error}</div>}
{!audit && !loading && (
- <div className="empty-state">
- <svg viewBox="0 0 24 24" width="48" height="48" stroke="currentColor" fill="none" strokeWidth="1">
- <path d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-6 9l2 2 4-4"/>
- </svg>
- <p>Run a security audit to check your server&apos;s configuration.</p>
- </div>
+ <EmptyState
+ icon={ClipboardCheck}
+ title="Run a security audit to check your server's configuration."
+ />
)}
{loading && (
diff --git a/frontend/src/components/security/AutoUpdatesTab.jsx b/frontend/src/components/security/AutoUpdatesTab.jsx
index 3da2ea8b..be7d3b5f 100644
--- a/frontend/src/components/security/AutoUpdatesTab.jsx
+++ b/frontend/src/components/security/AutoUpdatesTab.jsx
@@ -1,6 +1,8 @@
import { useState, useEffect } from 'react';
+import { AlertTriangle } from 'lucide-react';
import api from '../../services/api';
import { useToast } from '../../contexts/ToastContext';
+import EmptyState from '@/components/EmptyState';
import { Button } from '@/components/ui/button';
import { Pill } from '@/components/ds';
@@ -72,13 +74,11 @@ const AutoUpdatesTab = () => {
if (!status?.supported) {
return (
<div className="auto-updates-tab">
- <div className="empty-state">
- <svg viewBox="0 0 24 24" width="48" height="48" stroke="currentColor" fill="none" strokeWidth="1">
- <path d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/>
- </svg>
- <h3>Not Supported</h3>
- <p>Automatic security updates are not supported on this system.</p>
- </div>
+ <EmptyState
+ icon={AlertTriangle}
+ title="Not Supported"
+ description="Automatic security updates are not supported on this system."
+ />
</div>
);
}
diff --git a/frontend/src/components/security/Fail2banTab.jsx b/frontend/src/components/security/Fail2banTab.jsx
index 56f8b85f..d8bf6780 100644
--- a/frontend/src/components/security/Fail2banTab.jsx
+++ b/frontend/src/components/security/Fail2banTab.jsx
@@ -1,8 +1,9 @@
import { useState, useEffect } from 'react';
-import { Ban } from 'lucide-react';
+import { Ban, Shield } from 'lucide-react';
import api from '../../services/api';
-import ConfirmDialog from '../ConfirmDialog';
import { useToast } from '../../contexts/ToastContext';
+import { useConfirm } from '@/hooks/useConfirm';
+import EmptyState from '@/components/EmptyState';
import Modal from '../Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -21,8 +22,8 @@ const Fail2banTab = () => {
const [showBanModal, setShowBanModal] = useState(false);
const [banIP, setBanIP] = useState('');
const [banJail, setBanJail] = useState('sshd');
- const [confirmDialog, setConfirmDialog] = useState(null);
const toast = useToast();
+ const { confirm } = useConfirm();
const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-fail2ban-bans-sort' });
const {
hiddenKeys, toggleColumn, showAllColumns,
@@ -93,23 +94,20 @@ const Fail2banTab = () => {
};
const handleUnban = async (ip, jail) => {
- setConfirmDialog({
+ const confirmed = await confirm({
title: 'Unban IP',
message: `Are you sure you want to unban ${ip} from ${jail}?`,
confirmText: 'Unban',
variant: 'warning',
- onConfirm: async () => {
- try {
- await api.fail2banUnban(ip, jail);
- toast.success(`IP ${ip} unbanned`);
- await loadData();
- } catch (error) {
- toast.error(`Failed to unban: ${error.message}`);
- }
- setConfirmDialog(null);
- },
- onCancel: () => setConfirmDialog(null)
});
+ if (!confirmed) return;
+ try {
+ await api.fail2banUnban(ip, jail);
+ toast.success(`IP ${ip} unbanned`);
+ await loadData();
+ } catch (error) {
+ toast.error(`Failed to unban: ${error.message}`);
+ }
};
if (loading) {
@@ -150,16 +148,16 @@ const Fail2banTab = () => {
return (
<div className="fail2ban-tab">
{!status?.installed ? (
- <div className="empty-state">
- <svg viewBox="0 0 24 24" width="48" height="48" stroke="currentColor" fill="none" strokeWidth="1">
- <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/>
- </svg>
- <h3>Fail2ban Not Installed</h3>
- <p>Install Fail2ban to protect against brute force attacks.</p>
- <Button variant="default" onClick={handleInstall} disabled={actionLoading}>
- {actionLoading ? 'Installing...' : 'Install Fail2ban'}
- </Button>
- </div>
+ <EmptyState
+ icon={Shield}
+ title="Fail2ban Not Installed"
+ description="Install Fail2ban to protect against brute force attacks."
+ action={(
+ <Button variant="default" onClick={handleInstall} disabled={actionLoading}>
+ {actionLoading ? 'Installing...' : 'Install Fail2ban'}
+ </Button>
+ )}
+ />
) : (
<>
<div className="card">
@@ -301,17 +299,6 @@ const Fail2banTab = () => {
</Button>
</div>
</Modal>
-
- {confirmDialog && (
- <ConfirmDialog
- title={confirmDialog.title}
- message={confirmDialog.message}
- confirmText={confirmDialog.confirmText}
- variant={confirmDialog.variant}
- onConfirm={confirmDialog.onConfirm}
- onCancel={confirmDialog.onCancel}
- />
- )}
</div>
);
};
diff --git a/frontend/src/components/security/FirewallTab.jsx b/frontend/src/components/security/FirewallTab.jsx
index 9bae1692..d02b0288 100644
--- a/frontend/src/components/security/FirewallTab.jsx
+++ b/frontend/src/components/security/FirewallTab.jsx
@@ -1,7 +1,8 @@
import { useState, useEffect } from 'react';
import api from '../../services/api';
-import ConfirmDialog from '../ConfirmDialog';
import { useToast } from '../../contexts/ToastContext';
+import { useConfirm } from '@/hooks/useConfirm';
+import EmptyState from '@/components/EmptyState';
import Modal from '../Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -10,7 +11,7 @@ import { Switch } from '@/components/ui/switch';
import { ColumnsMenu, DataTable, DataTableFooter, Pill, SegControl, SortMenu } from '@/components/ds';
import { useTableSort } from '@/hooks/useTableSort';
import { useColumnVisibility } from '@/hooks/useColumnVisibility';
-import { Shield } from 'lucide-react';
+import { Ban, Shield } from 'lucide-react';
import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from '@/components/ui/select';
const RULE_TYPE_TONES = {
@@ -32,10 +33,10 @@ const FirewallTab = () => {
const [newPort, setNewPort] = useState({ port: '', protocol: 'tcp' });
const [selectedFirewall, setSelectedFirewall] = useState('ufw');
const [actionLoading, setActionLoading] = useState(false);
- const [confirmDialog, setConfirmDialog] = useState(null);
const [guard, setGuard] = useState(null);
const [guardLoading, setGuardLoading] = useState(false);
const toast = useToast();
+ const { confirm } = useConfirm();
const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-firewall-rules-sort' });
const {
hiddenKeys, toggleColumn, showAllColumns,
@@ -132,26 +133,23 @@ const FirewallTab = () => {
};
const handleDisable = async () => {
- setConfirmDialog({
+ const confirmed = await confirm({
title: 'Disable Firewall',
message: 'Are you sure you want to disable the firewall? This will leave your server unprotected.',
confirmText: 'Disable',
variant: 'danger',
- onConfirm: async () => {
- setActionLoading(true);
- try {
- await api.disableFirewall();
- toast.success('Firewall disabled');
- await loadStatus();
- } catch (error) {
- toast.error(`Failed to disable firewall: ${error.message}`);
- } finally {
- setActionLoading(false);
- setConfirmDialog(null);
- }
- },
- onCancel: () => setConfirmDialog(null)
});
+ if (!confirmed) return;
+ setActionLoading(true);
+ try {
+ await api.disableFirewall();
+ toast.success('Firewall disabled');
+ await loadStatus();
+ } catch (error) {
+ toast.error(`Failed to disable firewall: ${error.message}`);
+ } finally {
+ setActionLoading(false);
+ }
};
const handleBlockIP = async () => {
@@ -172,24 +170,21 @@ const FirewallTab = () => {
};
const handleUnblockIP = async (ip) => {
- setConfirmDialog({
+ const confirmed = await confirm({
title: 'Unblock IP',
message: `Are you sure you want to unblock ${ip}?`,
confirmText: 'Unblock',
variant: 'warning',
- onConfirm: async () => {
- try {
- await api.unblockIP(ip);
- toast.success(`IP ${ip} unblocked`);
- await loadBlockedIPs();
- await loadRules();
- } catch (error) {
- toast.error(`Failed to unblock IP: ${error.message}`);
- }
- setConfirmDialog(null);
- },
- onCancel: () => setConfirmDialog(null)
});
+ if (!confirmed) return;
+ try {
+ await api.unblockIP(ip);
+ toast.success(`IP ${ip} unblocked`);
+ await loadBlockedIPs();
+ await loadRules();
+ } catch (error) {
+ toast.error(`Failed to unblock IP: ${error.message}`);
+ }
};
const handleAllowPort = async () => {
@@ -222,23 +217,20 @@ const FirewallTab = () => {
};
const handleRemovePort = async (port, protocol) => {
- setConfirmDialog({
+ const confirmed = await confirm({
title: 'Remove Port Rule',
message: `Are you sure you want to remove the rule for port ${port}/${protocol}?`,
confirmText: 'Remove',
variant: 'danger',
- onConfirm: async () => {
- try {
- await api.denyPort(parseInt(port), protocol);
- toast.success(`Port ${port}/${protocol} rule removed`);
- await loadRules();
- } catch (error) {
- toast.error(`Failed to remove port: ${error.message}`);
- }
- setConfirmDialog(null);
- },
- onCancel: () => setConfirmDialog(null)
});
+ if (!confirmed) return;
+ try {
+ await api.denyPort(parseInt(port), protocol);
+ toast.success(`Port ${port}/${protocol} rule removed`);
+ await loadRules();
+ } catch (error) {
+ toast.error(`Failed to remove port: ${error.message}`);
+ }
};
const handleInstall = async () => {
@@ -316,16 +308,16 @@ const FirewallTab = () => {
return (
<div className="firewall-tab">
{!status?.any_installed ? (
- <div className="empty-state">
- <svg viewBox="0 0 24 24" width="48" height="48" stroke="currentColor" fill="none" strokeWidth="1">
- <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/>
- </svg>
- <h3>No Firewall Installed</h3>
- <p>Install a firewall to protect your server from unauthorized access.</p>
- <Button variant="default" onClick={() => setShowInstallModal(true)}>
- Install Firewall
- </Button>
- </div>
+ <EmptyState
+ icon={Shield}
+ title="No Firewall Installed"
+ description="Install a firewall to protect your server from unauthorized access."
+ action={(
+ <Button variant="default" onClick={() => setShowInstallModal(true)}>
+ Install Firewall
+ </Button>
+ )}
+ />
) : (
<>
<div className="firewall-header">
@@ -460,9 +452,7 @@ const FirewallTab = () => {
</div>
{blockedIPs.length === 0 ? (
<div className="card-body">
- <div className="empty-state-sm">
- <p>No blocked IPs</p>
- </div>
+ <EmptyState icon={Ban} title="No blocked IPs" />
</div>
) : (
<div className="blocked-list">
@@ -639,17 +629,6 @@ const FirewallTab = () => {
</Button>
</div>
</Modal>
-
- {confirmDialog && (
- <ConfirmDialog
- title={confirmDialog.title}
- message={confirmDialog.message}
- confirmText={confirmDialog.confirmText}
- variant={confirmDialog.variant}
- onConfirm={confirmDialog.onConfirm}
- onCancel={confirmDialog.onCancel}
- />
- )}
</div>
);
};
diff --git a/frontend/src/components/security/IPListsTab.jsx b/frontend/src/components/security/IPListsTab.jsx
index da488fd0..ef927137 100644
--- a/frontend/src/components/security/IPListsTab.jsx
+++ b/frontend/src/components/security/IPListsTab.jsx
@@ -1,7 +1,7 @@
import { useState, useEffect } from 'react';
import api from '../../services/api';
-import ConfirmDialog from '../ConfirmDialog';
import { useToast } from '../../contexts/ToastContext';
+import { useConfirm } from '@/hooks/useConfirm';
import Modal from '../Modal';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -17,8 +17,8 @@ const IPListsTab = () => {
const [newIP, setNewIP] = useState('');
const [newComment, setNewComment] = useState('');
const [actionLoading, setActionLoading] = useState(false);
- const [confirmDialog, setConfirmDialog] = useState(null);
const toast = useToast();
+ const { confirm } = useConfirm();
// Each list is its own table with its own persisted sort/columns state.
const allowSorts = useTableSort({ storageKey: 'serverkit-table-ip-allowlist-sort' });
const allowCols = useColumnVisibility({ storageKey: 'serverkit-table-ip-allowlist-cols' });
@@ -62,23 +62,20 @@ const IPListsTab = () => {
};
const handleRemove = async (ip, listType) => {
- setConfirmDialog({
+ const confirmed = await confirm({
title: `Remove from ${listType}`,
message: `Are you sure you want to remove ${ip} from the ${listType}?`,
confirmText: 'Remove',
variant: 'warning',
- onConfirm: async () => {
- try {
- await api.removeFromIPList(ip, listType);
- toast.success(`IP removed from ${listType}`);
- await loadLists();
- } catch (error) {
- toast.error(`Failed to remove IP: ${error.message}`);
- }
- setConfirmDialog(null);
- },
- onCancel: () => setConfirmDialog(null)
});
+ if (!confirmed) return;
+ try {
+ await api.removeFromIPList(ip, listType);
+ toast.success(`IP removed from ${listType}`);
+ await loadLists();
+ } catch (error) {
+ toast.error(`Failed to remove IP: ${error.message}`);
+ }
};
// Cell markup/classNames identical to the hand-rolled table they replace.
@@ -205,17 +202,6 @@ const IPListsTab = () => {
</Button>
</div>
</Modal>
-
- {confirmDialog && (
- <ConfirmDialog
- title={confirmDialog.title}
- message={confirmDialog.message}
- confirmText={confirmDialog.confirmText}
- variant={confirmDialog.variant}
- onConfirm={confirmDialog.onConfirm}
- onCancel={confirmDialog.onCancel}
- />
- )}
</div>
);
};
diff --git a/frontend/src/components/security/QuarantineTab.jsx b/frontend/src/components/security/QuarantineTab.jsx
index cb03763b..dd778f91 100644
--- a/frontend/src/components/security/QuarantineTab.jsx
+++ b/frontend/src/components/security/QuarantineTab.jsx
@@ -1,5 +1,7 @@
import { useState, useEffect } from 'react';
+import { ShieldCheck } from 'lucide-react';
import api from '../../services/api';
+import EmptyState from '@/components/EmptyState';
import { Button } from '@/components/ui/button';
import { ColumnsMenu, DataTable, DataTableFooter, SortMenu } from '@/components/ds';
import { useTableSort } from '@/hooks/useTableSort';
@@ -153,14 +155,11 @@ const QuarantineTab = () => {
</div>
) : files.length === 0 ? (
<div className="card-body">
- <div className="empty-state">
- <svg viewBox="0 0 24 24" width="48" height="48" stroke="currentColor" fill="none" strokeWidth="1">
- <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/>
- <polyline points="9 12 12 15 16 10"/>
- </svg>
- <p>No files in quarantine</p>
- <span className="text-muted">Infected files will appear here when detected</span>
- </div>
+ <EmptyState
+ icon={ShieldCheck}
+ title="No files in quarantine"
+ description="Infected files will appear here when detected"
+ />
</div>
) : (
<DataTable
diff --git a/frontend/src/components/security/SSHKeysTab.jsx b/frontend/src/components/security/SSHKeysTab.jsx
index 67ff0cef..4889a3e0 100644
--- a/frontend/src/components/security/SSHKeysTab.jsx
+++ b/frontend/src/components/security/SSHKeysTab.jsx
@@ -1,7 +1,9 @@
import { useState, useEffect } from 'react';
+import { KeyRound } from 'lucide-react';
import api from '../../services/api';
-import ConfirmDialog from '../ConfirmDialog';
import { useToast } from '../../contexts/ToastContext';
+import { useConfirm } from '@/hooks/useConfirm';
+import EmptyState from '@/components/EmptyState';
import Modal from '../Modal';
import { Button } from '@/components/ui/button';
import { Textarea } from '@/components/ui/textarea';
@@ -16,8 +18,8 @@ const SSHKeysTab = () => {
const [showAddModal, setShowAddModal] = useState(false);
const [newKey, setNewKey] = useState('');
const [actionLoading, setActionLoading] = useState(false);
- const [confirmDialog, setConfirmDialog] = useState(null);
const toast = useToast();
+ const { confirm } = useConfirm();
const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-ssh-keys-sort' });
const {
hiddenKeys, toggleColumn, showAllColumns,
@@ -56,23 +58,20 @@ const SSHKeysTab = () => {
};
const handleRemoveKey = async (keyId, comment) => {
- setConfirmDialog({
+ const confirmed = await confirm({
title: 'Remove SSH Key',
message: `Are you sure you want to remove the SSH key${comment ? ` "${comment}"` : ''}? This may lock you out if it's your only key.`,
confirmText: 'Remove',
variant: 'danger',
- onConfirm: async () => {
- try {
- await api.removeSSHKey(keyId);
- toast.success('SSH key removed');
- await loadKeys();
- } catch (error) {
- toast.error(`Failed to remove key: ${error.message}`);
- }
- setConfirmDialog(null);
- },
- onCancel: () => setConfirmDialog(null)
});
+ if (!confirmed) return;
+ try {
+ await api.removeSSHKey(keyId);
+ toast.success('SSH key removed');
+ await loadKeys();
+ } catch (error) {
+ toast.error(`Failed to remove key: ${error.message}`);
+ }
};
// Cell markup/classNames identical to the hand-rolled table they replace.
@@ -140,12 +139,15 @@ const SSHKeysTab = () => {
</div>
) : keys.length === 0 ? (
<div className="card-body">
- <div className="empty-state-sm">
- <p>No SSH keys configured for root user.</p>
- <Button variant="default" onClick={() => setShowAddModal(true)}>
- Add SSH Key
- </Button>
- </div>
+ <EmptyState
+ icon={KeyRound}
+ title="No SSH keys configured for root user."
+ action={(
+ <Button variant="default" onClick={() => setShowAddModal(true)}>
+ Add SSH Key
+ </Button>
+ )}
+ />
</div>
) : (
<DataTable
@@ -184,17 +186,6 @@ const SSHKeysTab = () => {
</Button>
</div>
</Modal>
-
- {confirmDialog && (
- <ConfirmDialog
- title={confirmDialog.title}
- message={confirmDialog.message}
- confirmText={confirmDialog.confirmText}
- variant={confirmDialog.variant}
- onConfirm={confirmDialog.onConfirm}
- onCancel={confirmDialog.onCancel}
- />
- )}
</div>
);
};
diff --git a/frontend/src/components/security/ScannerTab.jsx b/frontend/src/components/security/ScannerTab.jsx
index 25494e9e..c63fe003 100644
--- a/frontend/src/components/security/ScannerTab.jsx
+++ b/frontend/src/components/security/ScannerTab.jsx
@@ -5,7 +5,8 @@ import { Input } from '@/components/ui/input';
import { ColumnsMenu, DataTable, DataTableFooter, Pill, SortMenu } from '@/components/ds';
import { useTableSort } from '@/hooks/useTableSort';
import { useColumnVisibility } from '@/hooks/useColumnVisibility';
-import { Zap, Radar, FolderSearch, Download, Box, ShieldAlert, FileCode2, Trash2 } from 'lucide-react';
+import { Zap, Radar, FolderSearch, Download, Box, ShieldAlert, FileCode2, Trash2, Search } from 'lucide-react';
+import EmptyState from '@/components/EmptyState';
const SEVERITY_TONE = {
critical: 'red',
@@ -587,13 +588,11 @@ const ScannerTab = () => {
</div>
{history.length === 0 ? (
<div className="card-body">
- <div className="empty-state-sm">
- <svg viewBox="0 0 24 24" width="40" height="40" stroke="currentColor" fill="none" strokeWidth="1.5">
- <circle cx="11" cy="11" r="8"/>
- <line x1="21" y1="21" x2="16.65" y2="16.65"/>
- </svg>
- <p>No scans have been run yet. Start a scan above to check for threats.</p>
- </div>
+ <EmptyState
+ icon={Search}
+ title="No scans have been run yet."
+ description="Start a scan above to check for threats."
+ />
</div>
) : (
<DataTable
diff --git a/frontend/src/components/security/VulnerabilityTab.jsx b/frontend/src/components/security/VulnerabilityTab.jsx
index 1db9c97e..0c061ca0 100644
--- a/frontend/src/components/security/VulnerabilityTab.jsx
+++ b/frontend/src/components/security/VulnerabilityTab.jsx
@@ -1,6 +1,8 @@
import { useState, useEffect } from 'react';
+import { Target } from 'lucide-react';
import api from '../../services/api';
import { useToast } from '../../contexts/ToastContext';
+import EmptyState from '@/components/EmptyState';
import { Button } from '@/components/ui/button';
import { Pill, ScoreGauge } from '@/components/ds';
@@ -87,18 +89,16 @@ const VulnerabilityTab = () => {
return (
<div className="vulnerability-tab">
{!lynisStatus?.installed ? (
- <div className="empty-state">
- <svg viewBox="0 0 24 24" width="48" height="48" stroke="currentColor" fill="none" strokeWidth="1">
- <circle cx="12" cy="12" r="10"/>
- <circle cx="12" cy="12" r="6"/>
- <circle cx="12" cy="12" r="2"/>
- </svg>
- <h3>Lynis Not Installed</h3>
- <p>Install Lynis to perform security audits and vulnerability scanning.</p>
- <Button variant="default" onClick={handleInstall} disabled={actionLoading}>
- {actionLoading ? 'Installing...' : 'Install Lynis'}
- </Button>
- </div>
+ <EmptyState
+ icon={Target}
+ title="Lynis Not Installed"
+ description="Install Lynis to perform security audits and vulnerability scanning."
+ action={(
+ <Button variant="default" onClick={handleInstall} disabled={actionLoading}>
+ {actionLoading ? 'Installing...' : 'Install Lynis'}
+ </Button>
+ )}
+ />
) : (
<>
<div className="card">
diff --git a/frontend/src/components/service-detail/SettingsTab.jsx b/frontend/src/components/service-detail/SettingsTab.jsx
index 851c3863..ca10556e 100644
--- a/frontend/src/components/service-detail/SettingsTab.jsx
+++ b/frontend/src/components/service-detail/SettingsTab.jsx
@@ -20,6 +20,7 @@ import {
} from 'lucide-react';
import api from '../../services/api';
import { useToast } from '../../contexts/ToastContext';
+import { useConfirm } from '@/hooks/useConfirm';
import { DangerZone } from '../DangerZone';
import RepoConnectForm from '../git/RepoConnectForm';
import ProtectionPanel from '../backups/ProtectionPanel';
@@ -94,6 +95,7 @@ const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) =>
const settingsItems = settingsGroups.flatMap((g) => g.items);
const navigate = useNavigate();
const toast = useToast();
+ const { confirm } = useConfirm();
// Section lives in the URL (/services/:id/settings/:section) so it's
// shareable and survives a refresh — same as the WordPress detail page.
const { section: sectionParam } = useParams();
@@ -128,7 +130,12 @@ const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) =>
}
async function handleUnlink() {
- if (!confirm(`Unlink ${app.name} from its linked application?`)) return;
+ if (!await confirm({
+ title: 'Unlink Application',
+ message: `Unlink ${app.name} from its linked application?`,
+ confirmText: 'Unlink',
+ variant: 'danger',
+ })) return;
setUnlinking(true);
try {
@@ -142,8 +149,18 @@ const SettingsTab = ({ app, deployConfig, domains, primaryDomain, onUpdate }) =>
}
async function handleDelete() {
- if (!confirm(`Delete ${app.name}? This action cannot be undone.`)) return;
- if (!confirm('Are you sure? This will permanently remove the service.')) return;
+ if (!await confirm({
+ title: 'Delete Service',
+ message: `Delete ${app.name}? This action cannot be undone.`,
+ confirmText: 'Delete',
+ variant: 'danger',
+ })) return;
+ if (!await confirm({
+ title: 'Delete Service',
+ message: 'Are you sure? This will permanently remove the service.',
+ confirmText: 'Delete',
+ variant: 'danger',
+ })) return;
setDeleting(true);
try {
@@ -857,7 +874,12 @@ const ManifestSection = ({ app }) => {
async function handleApply() {
if (!projectId) return;
- if (!window.confirm('Apply the manifest to this project? This will create or update services to match serverkit.yaml.')) return;
+ if (!await confirm({
+ title: 'Apply Manifest',
+ message: 'Apply the manifest to this project? This will create or update services to match serverkit.yaml.',
+ confirmText: 'Apply',
+ variant: 'warning',
+ })) return;
setApplying(true);
try {
const res = await api.applyManifest(projectId, {});
diff --git a/frontend/src/components/settings/connections/ConnectionsHub.jsx b/frontend/src/components/settings/connections/ConnectionsHub.jsx
index 15d65c95..2b5a4ba7 100644
--- a/frontend/src/components/settings/connections/ConnectionsHub.jsx
+++ b/frontend/src/components/settings/connections/ConnectionsHub.jsx
@@ -13,6 +13,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { ShieldAlert } from 'lucide-react';
import api from '../../../services/api';
import useSettingFocus from '../../../hooks/useSettingFocus';
+import { useConfirm } from '../../../hooks/useConfirm';
import { useAuth } from '../../../contexts/AuthContext';
import { useToast } from '../../../contexts/ToastContext';
import {
@@ -40,6 +41,7 @@ export default function ConnectionsHub() {
const register = useSettingFocus();
const { isAdmin } = useAuth();
const toast = useToast();
+ const { confirm } = useConfirm();
const [sourceStatus, setSourceStatus] = useState({ github: null, gitlab: null, bitbucket: null });
const [sourceConfig, setSourceConfig] = useState({ github: null, gitlab: null, bitbucket: null });
@@ -174,7 +176,13 @@ export default function ConnectionsHub() {
}, [toast, loadData]);
const onRemoveDns = useCallback(async (record) => {
- if (!window.confirm(`Remove the connection "${record.name}"?`)) return false;
+ const confirmed = await confirm({
+ title: 'Remove Connection',
+ message: `Remove the connection "${record.name}"?`,
+ confirmText: 'Remove',
+ variant: 'danger',
+ });
+ if (!confirmed) return false;
try {
await api.deleteEmailDNSProvider(record.id);
toast.success(`${record.name} removed`);
@@ -184,7 +192,7 @@ export default function ConnectionsHub() {
toast.error(err.message || 'Failed to remove connection');
return false;
}
- }, [toast, loadData]);
+ }, [confirm, toast, loadData]);
const onTestDns = useCallback(async (id) => {
try {
@@ -212,7 +220,13 @@ export default function ConnectionsHub() {
}, [toast, loadData]);
const onRemoveCloud = useCallback(async (id) => {
- if (!window.confirm('Disconnect this cloud account? Existing servers are not affected.')) return false;
+ const confirmed = await confirm({
+ title: 'Disconnect Cloud Account',
+ message: 'Disconnect this cloud account? Existing servers are not affected.',
+ confirmText: 'Disconnect',
+ variant: 'danger',
+ });
+ if (!confirmed) return false;
try {
await api.deleteCloudProvider(id);
toast.success('Disconnected');
@@ -222,7 +236,7 @@ export default function ConnectionsHub() {
toast.error(err.message || 'Failed to disconnect');
return false;
}
- }, [toast, loadData]);
+ }, [confirm, toast, loadData]);
// ── Storage ──
const onSaveStorage = useCallback(async (config) => {
@@ -301,7 +315,13 @@ export default function ConnectionsHub() {
}, [toast, loadData]);
const onRemoveRegistrar = useCallback(async (id) => {
- if (!window.confirm('Disconnect this registrar?')) return false;
+ const confirmed = await confirm({
+ title: 'Disconnect Registrar',
+ message: 'Disconnect this registrar?',
+ confirmText: 'Disconnect',
+ variant: 'danger',
+ });
+ if (!confirmed) return false;
try {
await api.deleteRegistrarConnection(id);
toast.success('Registrar disconnected');
@@ -311,7 +331,7 @@ export default function ConnectionsHub() {
toast.error(err.message || 'Failed to disconnect');
return false;
}
- }, [toast, loadData]);
+ }, [confirm, toast, loadData]);
const onTestRegistrar = useCallback(async (id) => {
try {
@@ -339,7 +359,13 @@ export default function ConnectionsHub() {
}, [toast, loadData]);
const onRemoveRegistry = useCallback(async (id) => {
- if (!window.confirm('Remove this container registry? Apps that pull from it will lose access.')) return false;
+ const confirmed = await confirm({
+ title: 'Remove Container Registry',
+ message: 'Remove this container registry? Apps that pull from it will lose access.',
+ confirmText: 'Remove',
+ variant: 'danger',
+ });
+ if (!confirmed) return false;
try {
await api.deleteContainerRegistry(id);
toast.success('Registry removed');
@@ -349,7 +375,7 @@ export default function ConnectionsHub() {
toast.error(err.message || 'Failed to remove registry');
return false;
}
- }, [toast, loadData]);
+ }, [confirm, toast, loadData]);
const onTestRegistry = useCallback(async (id) => {
try {
diff --git a/frontend/src/pages/Telemetry.jsx b/frontend/src/pages/Telemetry.jsx
index fe502859..80cdd4ce 100644
--- a/frontend/src/pages/Telemetry.jsx
+++ b/frontend/src/pages/Telemetry.jsx
@@ -24,6 +24,7 @@ import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { useTopbarActions } from '@/hooks/useTopbarActions';
+import { useConfirm } from '@/hooks/useConfirm';
import { useTableSort } from '@/hooks/useTableSort';
import { useColumnVisibility } from '@/hooks/useColumnVisibility';
import { useTableViews } from '@/hooks/useTableViews';
@@ -70,6 +71,7 @@ const BUILTIN_VIEWS = [
export default function Telemetry() {
const { isAdmin } = useAuth();
const { showToast } = useToast();
+ const { confirm } = useConfirm();
const [events, setEvents] = useState([]);
const [loading, setLoading] = useState(true);
@@ -173,7 +175,13 @@ export default function Telemetry() {
};
const cleanupOldEvents = async () => {
- if (!window.confirm('Delete telemetry events older than 90 days? This cannot be undone.')) {
+ const confirmed = await confirm({
+ title: 'Clean Up Old Events',
+ message: 'Delete telemetry events older than 90 days? This cannot be undone.',
+ confirmText: 'Delete',
+ variant: 'danger',
+ });
+ if (!confirmed) {
return;
}
try {
diff --git a/frontend/src/styles/pages/_security.scss b/frontend/src/styles/pages/_security.scss
index 2881cfb7..0160a2c4 100644
--- a/frontend/src/styles/pages/_security.scss
+++ b/frontend/src/styles/pages/_security.scss
@@ -1091,51 +1091,6 @@
}
}
-// Shared empty state
-.empty-state {
- display: flex;
- flex-direction: column;
- align-items: center;
- padding: $space-8;
- text-align: center;
-
- > svg,
- &__icon svg {
- color: $text-tertiary;
- margin-bottom: $space-4;
- }
-
- h3 {
- margin-bottom: $space-2;
- }
-
- p {
- color: $text-secondary;
- margin-bottom: $space-6;
- }
-}
-
-.empty-state-sm {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- text-align: center;
- gap: $space-3;
- padding: $space-6;
- color: $text-secondary;
-
- svg {
- color: $text-tertiary;
- opacity: 0.7;
- flex-shrink: 0;
- }
-
- p {
- margin: 0;
- }
-}
-
// Fail2ban per-jail KPI cards
.fail2ban-tab {
.f2b-jails {