fix: frontend-backend integration — 14 issues resolved

- nginx: add proxy routes for /settings/, /templates/, /ipam/, /logs/, /admin/, /health
- dashboard: fix data format mismatch (servers[] not nodes[]/vms[])
- dashboard: add WebSocket subscription to dashboard_metrics for real-time updates
- dashboard: connect activity feed to /logs/api/logs endpoint
- dashboard: reduce polling to 15s with WS as primary update source
- graphs: fix rrddata response unwrap (backend returns {data:[],timeframe:''})
- graphs: add i18n translations for chart titles
- console: add xterm.js CSS import for proper terminal rendering
- console: add i18n translations (connecting, reconnect)
- workspace: add switcher dropdown in TopBar
- workspace: add edit dialog in WorkspacesPage
- workspace: create Zustand store with localStorage persistence
- workspace: add X-Active-Workspace header to API client
- sidebar: replace generic icon with actual favicon.svg logo
- instances: translate RowActionMenu and InstanceDetailPage strings
- locales: add graphs, console, workspace, instance tab keys to en/ru
This commit is contained in:
markmorado
2026-04-07 00:45:43 +02:00
parent 4546a798d0
commit 1d08c815a7
138 changed files with 17826 additions and 32024 deletions

View File

@@ -0,0 +1,110 @@
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Search } from 'lucide-react';
import { Card, CardContent, CardHeader } from '@/components/ui/card';
import { Input } from '@/components/ui/input';
import { Badge } from '@/components/ui/badge';
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
import { Button } from '@/components/ui/button';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { useIPAMAllocations, useIPAMNetworks, useDeleteAllocation } from '@/hooks/use-ipam';
import { Trash2 } from 'lucide-react';
export default function IPAMAllocationsPage() {
const { t } = useTranslation();
const [networkId, setNetworkId] = useState<string>('all');
const [statusFilter, setStatusFilter] = useState<string>('all');
const [search, setSearch] = useState('');
const { data: networks = [] } = useIPAMNetworks();
const { data: allocations = [] } = useIPAMAllocations({
network_id: networkId !== 'all' ? Number(networkId) : undefined,
limit: 200,
});
const deleteAllocation = useDeleteAllocation();
const filtered = allocations.filter(a => {
if (statusFilter !== 'all' && a.status !== statusFilter) return false;
if (search) {
const s = search.toLowerCase();
return (
a.ip_address?.toLowerCase().includes(s) ||
a.resource_name?.toLowerCase().includes(s) ||
a.mac_address?.toLowerCase().includes(s) ||
a.description?.toLowerCase().includes(s)
);
}
return true;
});
return (
<div className="space-y-6">
<h1 className="text-2xl font-bold">{t('ipam.allocations')}</h1>
<Card>
<CardHeader>
<div className="flex flex-wrap gap-3 items-center">
<div className="relative flex-1 min-w-[200px]">
<Search className="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
<Input placeholder={t('common.search')} value={search} onChange={e => setSearch(e.target.value)} className="pl-8" />
</div>
<Select value={networkId} onValueChange={v => { if (v !== null) setNetworkId(v); }}>
<SelectTrigger className="w-[200px]"><SelectValue placeholder={t('ipam.network')} /></SelectTrigger>
<SelectContent>
<SelectItem value="all">{t('common.all')}</SelectItem>
{networks.map(n => (
<SelectItem key={n.id} value={String(n.id)}>{n.name} ({n.network})</SelectItem>
))}
</SelectContent>
</Select>
<Select value={statusFilter} onValueChange={v => { if (v !== null) setStatusFilter(v); }}>
<SelectTrigger className="w-[160px]"><SelectValue /></SelectTrigger>
<SelectContent>
<SelectItem value="all">{t('common.all')}</SelectItem>
<SelectItem value="allocated">Allocated</SelectItem>
<SelectItem value="reserved">Reserved</SelectItem>
<SelectItem value="available">Available</SelectItem>
</SelectContent>
</Select>
</div>
</CardHeader>
<CardContent className="p-0">
<Table>
<TableHeader>
<TableRow>
<TableHead>IP</TableHead>
<TableHead>{t('common.status')}</TableHead>
<TableHead>{t('ipam.network')}</TableHead>
<TableHead>{t('ipam.resource')}</TableHead>
<TableHead>MAC</TableHead>
<TableHead>{t('ipam.description')}</TableHead>
<TableHead />
</TableRow>
</TableHeader>
<TableBody>
{filtered.map(a => (
<TableRow key={a.id}>
<TableCell className="font-mono">{a.ip_address}</TableCell>
<TableCell>
<Badge variant={a.status === 'allocated' ? 'default' : a.status === 'reserved' ? 'secondary' : 'outline'}>{a.status}</Badge>
</TableCell>
<TableCell className="text-xs">{a.network_name || '—'}</TableCell>
<TableCell className="text-xs">{a.resource_name || '—'}</TableCell>
<TableCell className="font-mono text-xs">{a.mac_address || '—'}</TableCell>
<TableCell className="text-xs text-muted-foreground max-w-[200px] truncate">{a.description || '—'}</TableCell>
<TableCell>
<Button variant="ghost" size="icon" className="h-7 w-7 text-destructive" onClick={() => deleteAllocation.mutate(a.id)}>
<Trash2 className="h-3.5 w-3.5" />
</Button>
</TableCell>
</TableRow>
))}
{filtered.length === 0 && (
<TableRow><TableCell colSpan={7} className="text-center text-muted-foreground py-8">{t('common.no_data')}</TableCell></TableRow>
)}
</TableBody>
</Table>
</CardContent>
</Card>
</div>
);
}

View File

@@ -0,0 +1,76 @@
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router';
import { Network, Globe, AlertTriangle, Activity } from 'lucide-react';
import { Card, CardContent } from '@/components/ui/card';
import { useIPAMSummary, useIPAMNetworks } from '@/hooks/use-ipam';
export default function IPAMDashboardPage() {
const { t } = useTranslation();
const { data: summary } = useIPAMSummary();
const { data: networks = [] } = useIPAMNetworks();
const s = summary as Record<string, number> | undefined;
return (
<div className="space-y-6">
<h1 className="text-2xl font-bold">{t('nav.ipam')}</h1>
{/* Summary cards */}
<div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
<SummaryCard icon={Globe} label={t('ipam.networks_count')} value={s?.networks_count ?? 0} to="/ipam/networks" />
<SummaryCard icon={Network} label={t('ipam.total_allocated')} value={s?.total_allocated ?? 0} to="/ipam/allocations" />
<SummaryCard icon={Activity} label={t('ipam.total_reserved')} value={s?.total_reserved ?? 0} />
<SummaryCard icon={AlertTriangle} label={t('ipam.vm_count')} value={(s?.vm_count ?? 0) + (s?.lxc_count ?? 0)} />
</div>
{/* Quick network overview */}
<div className="space-y-3">
<h2 className="text-lg font-semibold">{t('ipam.networks')}</h2>
<div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
{networks.slice(0, 6).map(net => (
<Link key={net.id} to={`/ipam/network/${net.id}`}>
<Card className="hover:border-blue-500/50 transition-colors h-full">
<CardContent className="p-4 space-y-2">
<div className="flex items-center justify-between">
<span className="font-medium text-sm">{net.name}</span>
<span className="text-xs font-mono text-muted-foreground">{net.network}</span>
</div>
<div className="h-2 rounded-full bg-muted overflow-hidden">
<div
className="h-full bg-blue-500 rounded-full transition-all"
style={{ width: `${Math.min(net.utilization_percent || 0, 100)}%` }}
/>
</div>
<div className="flex justify-between text-xs text-muted-foreground">
<span>{net.used_ips ?? 0} / {net.total_ips ?? 0}</span>
<span>{(net.utilization_percent ?? 0).toFixed(1)}%</span>
</div>
</CardContent>
</Card>
</Link>
))}
</div>
{networks.length > 6 && (
<Link to="/ipam/networks" className="text-sm text-blue-400 hover:underline">{t('ipam.view_all_networks')}</Link>
)}
</div>
</div>
);
}
function SummaryCard({ icon: Icon, label, value, to }: { icon: React.ElementType; label: string; value: number; to?: string }) {
const content = (
<Card className={to ? 'hover:border-blue-500/50 transition-colors' : ''}>
<CardContent className="p-4 flex items-center gap-3">
<div className="flex h-10 w-10 items-center justify-center rounded-lg bg-muted">
<Icon className="h-5 w-5" />
</div>
<div>
<p className="text-2xl font-bold">{value}</p>
<p className="text-xs text-muted-foreground">{label}</p>
</div>
</CardContent>
</Card>
);
return to ? <Link to={to}>{content}</Link> : content;
}

View File

@@ -0,0 +1,92 @@
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Search, History } from 'lucide-react';
import { Card, CardContent, CardHeader } from '@/components/ui/card';
import { Input } from '@/components/ui/input';
import { Badge } from '@/components/ui/badge';
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { useIPAMHistory, useIPAMNetworks } from '@/hooks/use-ipam';
export default function IPAMHistoryPage() {
const { t } = useTranslation();
const [networkId, setNetworkId] = useState<string>('all');
const [search, setSearch] = useState('');
const { data: networks = [] } = useIPAMNetworks();
const { data: history = [] } = useIPAMHistory(networkId !== 'all' ? { network_id: Number(networkId) } : undefined);
const filtered = history.filter(h => {
if (!search) return true;
const s = search.toLowerCase();
return (
h.action?.toLowerCase().includes(s) ||
h.ip_address?.toLowerCase().includes(s) ||
h.username?.toLowerCase().includes(s) ||
h.details?.toLowerCase().includes(s)
);
});
const actionColor = (action: string) => {
if (action.includes('create') || action.includes('allocate')) return 'default';
if (action.includes('delete') || action.includes('release')) return 'destructive';
return 'secondary';
};
return (
<div className="space-y-6">
<div className="flex items-center gap-2">
<History className="h-6 w-6" />
<h1 className="text-2xl font-bold">{t('ipam.history')}</h1>
</div>
<Card>
<CardHeader>
<div className="flex flex-wrap gap-3 items-center">
<div className="relative flex-1 min-w-[200px]">
<Search className="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
<Input placeholder={t('common.search')} value={search} onChange={e => setSearch(e.target.value)} className="pl-8" />
</div>
<Select value={networkId} onValueChange={v => { if (v !== null) setNetworkId(v); }}>
<SelectTrigger className="w-[200px]"><SelectValue placeholder={t('ipam.network')} /></SelectTrigger>
<SelectContent>
<SelectItem value="all">{t('common.all')}</SelectItem>
{networks.map(n => (
<SelectItem key={n.id} value={String(n.id)}>{n.name}</SelectItem>
))}
</SelectContent>
</Select>
</div>
</CardHeader>
<CardContent className="p-0">
<Table>
<TableHeader>
<TableRow>
<TableHead>{t('common.date')}</TableHead>
<TableHead>{t('ipam.action')}</TableHead>
<TableHead>IP</TableHead>
<TableHead>{t('ipam.network')}</TableHead>
<TableHead>{t('common.user')}</TableHead>
<TableHead>{t('ipam.details')}</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{filtered.map((h, i) => (
<TableRow key={h.id ?? i}>
<TableCell className="text-xs whitespace-nowrap">{h.created_at ? new Date(h.created_at).toLocaleString() : '—'}</TableCell>
<TableCell><Badge variant={actionColor(h.action || '') as any}>{h.action}</Badge></TableCell>
<TableCell className="font-mono text-xs">{h.ip_address || '—'}</TableCell>
<TableCell className="text-xs">{h.network_name || '—'}</TableCell>
<TableCell className="text-xs">{h.username || '—'}</TableCell>
<TableCell className="text-xs text-muted-foreground max-w-[300px] truncate">{h.details || '—'}</TableCell>
</TableRow>
))}
{filtered.length === 0 && (
<TableRow><TableCell colSpan={6} className="text-center text-muted-foreground py-8">{t('common.no_data')}</TableCell></TableRow>
)}
</TableBody>
</Table>
</CardContent>
</Card>
</div>
);
}

View File

@@ -0,0 +1,153 @@
import { useParams, Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import { ArrowLeft } from 'lucide-react';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge';
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
import { useIPAMNetwork, useIPAMNetworkStats, useIPAMAllocations, useIPAMPools } from '@/hooks/use-ipam';
export default function IPAMNetworkDetailPage() {
const { t } = useTranslation();
const { id } = useParams<{ id: string }>();
const nid = Number(id);
const { data: network } = useIPAMNetwork(nid);
const { data: stats } = useIPAMNetworkStats(nid);
const { data: pools = [] } = useIPAMPools(nid);
const { data: allocations = [] } = useIPAMAllocations({ network_id: nid, limit: 100 });
if (!network) return <div className="py-12 text-center text-muted-foreground">{t('common.loading')}</div>;
return (
<div className="space-y-6">
<div className="flex items-center gap-3">
<Button render={<Link to="/ipam/networks" />} variant="ghost" size="sm"><ArrowLeft className="h-4 w-4" /></Button>
<div>
<h1 className="text-2xl font-bold">{network.name}</h1>
<p className="text-sm text-muted-foreground font-mono">{network.network}</p>
</div>
<Badge variant={network.is_active ? 'default' : 'secondary'} className="ml-auto">{network.is_active ? 'Active' : 'Inactive'}</Badge>
</div>
{/* Stats */}
<div className="grid gap-4 sm:grid-cols-4">
<StatCard label={t('ipam.total_ips')} value={stats?.total_ips ?? network.total_ips ?? 0} />
<StatCard label={t('ipam.allocated')} value={stats?.allocated_ips ?? network.used_ips ?? 0} />
<StatCard label={t('ipam.reserved')} value={stats?.reserved_ips ?? 0} />
<StatCard label={t('ipam.available')} value={stats?.available_ips ?? network.available_ips ?? 0} />
</div>
{/* Utilization bar */}
<Card>
<CardContent className="p-4">
<div className="flex items-center justify-between mb-2">
<span className="text-sm font-medium">{t('ipam.utilization')}</span>
<span className="text-sm">{(stats?.utilization_percent ?? network.utilization_percent ?? 0).toFixed(1)}%</span>
</div>
<div className="h-3 rounded-full bg-muted overflow-hidden">
<div
className="h-full bg-blue-500 rounded-full transition-all"
style={{ width: `${Math.min(stats?.utilization_percent ?? network.utilization_percent ?? 0, 100)}%` }}
/>
</div>
</CardContent>
</Card>
{/* Network info */}
<Card>
<CardHeader><CardTitle className="text-sm">{t('ipam.network_info')}</CardTitle></CardHeader>
<CardContent className="grid gap-2 text-sm sm:grid-cols-2">
<InfoRow label="Gateway" value={network.gateway || '—'} />
<InfoRow label="VLAN" value={network.vlan_id ? String(network.vlan_id) : '—'} />
<InfoRow label="DNS" value={network.dns_primary || '—'} />
<InfoRow label={t('ipam.server')} value={network.server_name || '—'} />
<InfoRow label={t('ipam.bridge')} value={network.proxmox_bridge || '—'} />
{network.description && <InfoRow label={t('ipam.description')} value={network.description} />}
</CardContent>
</Card>
{/* Pools */}
{pools.length > 0 && (
<Card>
<CardHeader><CardTitle className="text-sm">{t('ipam.pools')} ({pools.length})</CardTitle></CardHeader>
<CardContent className="p-0">
<Table>
<TableHeader>
<TableRow>
<TableHead>{t('common.name')}</TableHead>
<TableHead>{t('common.type')}</TableHead>
<TableHead>{t('ipam.range')}</TableHead>
<TableHead>{t('ipam.usage')}</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{pools.map(pool => (
<TableRow key={pool.id}>
<TableCell className="font-medium">{pool.name}</TableCell>
<TableCell><Badge variant="outline">{pool.pool_type}</Badge></TableCell>
<TableCell className="font-mono text-xs">{pool.range_start} — {pool.range_end}</TableCell>
<TableCell className="text-xs">{pool.used_ips ?? 0} / {pool.total_ips ?? 0}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</CardContent>
</Card>
)}
{/* Allocations */}
<Card>
<CardHeader><CardTitle className="text-sm">{t('ipam.allocations')} ({allocations.length})</CardTitle></CardHeader>
<CardContent className="p-0">
<Table>
<TableHeader>
<TableRow>
<TableHead>IP</TableHead>
<TableHead>{t('common.status')}</TableHead>
<TableHead>{t('ipam.resource')}</TableHead>
<TableHead>MAC</TableHead>
<TableHead>{t('ipam.description')}</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{allocations.map(a => (
<TableRow key={a.id}>
<TableCell className="font-mono">{a.ip_address}</TableCell>
<TableCell>
<Badge variant={a.status === 'allocated' ? 'default' : a.status === 'reserved' ? 'secondary' : 'outline'}>{a.status}</Badge>
</TableCell>
<TableCell className="text-xs">{a.resource_name || '—'}</TableCell>
<TableCell className="font-mono text-xs">{a.mac_address || '—'}</TableCell>
<TableCell className="text-xs text-muted-foreground">{a.description || '—'}</TableCell>
</TableRow>
))}
{allocations.length === 0 && (
<TableRow><TableCell colSpan={5} className="text-center text-muted-foreground py-8">{t('common.no_data')}</TableCell></TableRow>
)}
</TableBody>
</Table>
</CardContent>
</Card>
</div>
);
}
function StatCard({ label, value }: { label: string; value: number }) {
return (
<Card>
<CardContent className="p-4 text-center">
<p className="text-2xl font-bold">{value}</p>
<p className="text-xs text-muted-foreground">{label}</p>
</CardContent>
</Card>
);
}
function InfoRow({ label, value }: { label: string; value: string }) {
return (
<div className="flex items-center justify-between py-1">
<span className="text-muted-foreground">{label}</span>
<span className="font-medium font-mono">{value}</span>
</div>
);
}

View File

@@ -0,0 +1,95 @@
import { useState } from 'react';
import { Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import { Plus, Globe, Search } from 'lucide-react';
import { Card, CardContent } from '@/components/ui/card';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Badge } from '@/components/ui/badge';
import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
import { Label } from '@/components/ui/label';
import { useIPAMNetworks, useCreateNetwork } from '@/hooks/use-ipam';
import { toast } from 'sonner';
export default function IPAMNetworksPage() {
const { t } = useTranslation();
const [search, setSearch] = useState('');
const [dialogOpen, setDialogOpen] = useState(false);
const [form, setForm] = useState({ name: '', network: '', gateway: '', description: '' });
const { data: networks = [], isLoading } = useIPAMNetworks();
const createNet = useCreateNetwork();
const filtered = networks.filter(n =>
n.name.toLowerCase().includes(search.toLowerCase()) ||
n.network.includes(search)
);
const handleCreate = () => {
createNet.mutate(form, {
onSuccess: () => { toast.success(t('ipam.network_created')); setDialogOpen(false); setForm({ name: '', network: '', gateway: '', description: '' }); },
onError: (err: Error) => toast.error(err.message),
});
};
return (
<div className="space-y-6">
<div className="flex items-center justify-between">
<h1 className="text-2xl font-bold">{t('ipam.networks')}</h1>
<Button onClick={() => setDialogOpen(true)}><Plus className="mr-2 h-4 w-4" />{t('ipam.add_network')}</Button>
</div>
<div className="relative max-w-sm">
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
<Input className="pl-9" placeholder={t('common.search')} value={search} onChange={e => setSearch(e.target.value)} />
</div>
{isLoading ? (
<p className="text-center py-12 text-muted-foreground">{t('common.loading')}</p>
) : filtered.length === 0 ? (
<div className="text-center py-16 text-muted-foreground">
<Globe className="mx-auto h-12 w-12 mb-3 opacity-50" />
<p>{t('ipam.no_networks')}</p>
</div>
) : (
<div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
{filtered.map(net => (
<Link key={net.id} to={`/ipam/network/${net.id}`}>
<Card className="hover:border-blue-500/50 transition-colors h-full">
<CardContent className="p-4 space-y-3">
<div className="flex items-center justify-between">
<span className="font-semibold">{net.name}</span>
<Badge variant={net.is_active ? 'default' : 'secondary'}>{net.is_active ? 'Active' : 'Inactive'}</Badge>
</div>
<p className="text-sm font-mono text-muted-foreground">{net.network}</p>
{net.gateway && <p className="text-xs text-muted-foreground">GW: {net.gateway}</p>}
<div className="h-2 rounded-full bg-muted overflow-hidden">
<div className="h-full bg-blue-500 rounded-full" style={{ width: `${Math.min(net.utilization_percent || 0, 100)}%` }} />
</div>
<div className="flex justify-between text-xs text-muted-foreground">
<span>{net.used_ips ?? 0} / {net.total_ips ?? 0} {t('ipam.ips_used')}</span>
<span>{(net.utilization_percent ?? 0).toFixed(1)}%</span>
</div>
{net.server_name && <p className="text-xs text-muted-foreground">{net.server_name}</p>}
</CardContent>
</Card>
</Link>
))}
</div>
)}
<Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
<DialogContent>
<DialogHeader><DialogTitle>{t('ipam.add_network')}</DialogTitle></DialogHeader>
<div className="space-y-3">
<div><Label>{t('common.name')}</Label><Input value={form.name} onChange={e => setForm(p => ({ ...p, name: e.target.value }))} /></div>
<div><Label>CIDR</Label><Input value={form.network} onChange={e => setForm(p => ({ ...p, network: e.target.value }))} placeholder="10.0.0.0/24" /></div>
<div><Label>Gateway</Label><Input value={form.gateway} onChange={e => setForm(p => ({ ...p, gateway: e.target.value }))} placeholder="10.0.0.1" /></div>
<div><Label>{t('ipam.description')}</Label><Input value={form.description} onChange={e => setForm(p => ({ ...p, description: e.target.value }))} /></div>
<Button onClick={handleCreate} disabled={!form.name || !form.network || createNet.isPending} className="w-full">{t('common.create')}</Button>
</div>
</DialogContent>
</Dialog>
</div>
);
}