feat(nodes): показывать версию PVE, рабочие области и аптайм на карточках узлов
All checks were successful
Backend Tests / pytest (Python 3.12) (push) Successful in 57s
Deploy to Production / Trigger production update (push) Successful in 8s

Карточки на странице «Узлы» дополнены важной информацией:
- версия Proxmox VE (чип «PVE x.y.z»);
- число нод в кластере (для кластерных серверов);
- аптайм узла;
- чипы рабочих областей, в которых состоит сервер.

Бэкенд: эндпоинт /api/{id}/nodes отдаёт version; ответ серверов
дополнен полями cluster_name и workspaces (ServerWorkspaceBrief).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
markmorado
2026-07-06 18:37:28 +05:00
parent 476b73b411
commit fc42e8fc19
8 changed files with 145 additions and 9 deletions

View File

@@ -1,20 +1,86 @@
import { useState, useEffect } from 'react';
import { Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import { Server, Monitor, Container, Plus, Pencil, Trash2, Wifi, Loader2 } from 'lucide-react';
import { Server, Monitor, Container, Plus, Pencil, Trash2, Wifi, Loader2, Clock, Layers, LayoutGrid } from 'lucide-react';
import { Card, CardContent } from '@/components/ui/card';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogClose } from '@/components/ui/dialog';
import { useServers, useCreateServer, useUpdateServer, useDeleteServer, useTestServerCredentials } from '@/hooks/use-nodes';
import { useServers, useCreateServer, useUpdateServer, useDeleteServer, useTestServerCredentials, useNodes } from '@/hooks/use-nodes';
import { useVirtualMachines } from '@/hooks/use-instances';
import type { ProxmoxServerCreate } from '@/types';
import type { ProxmoxServer, ProxmoxServerCreate } from '@/types';
import { formatUptime } from '@/lib/format';
import { toast } from 'sonner';
import { useConfirm } from '@/components/shared/ConfirmDialog';
import ServerUpdatesBadge from './ServerUpdatesBadge';
/**
* Сводка по узлу сервера: версия Proxmox, число нод в кластере и аптайм.
* Тянет `/nodes` (кэш переиспользуется с ServerUpdatesBadge), поэтому
* дополнительного запроса не создаёт.
*/
function ServerMeta({ serverId, online }: { serverId: number; online?: boolean }) {
const { t } = useTranslation();
const { data } = useNodes(online ? serverId : 0);
if (!online) return null;
const nodes = data?.nodes ?? [];
if (nodes.length === 0) return null;
const uptime = nodes.reduce((max, n) => Math.max(max, n.uptime ?? 0), 0);
const version = data?.version;
if (!version && nodes.length <= 1 && uptime <= 0) return null;
return (
<div className="flex flex-wrap items-center gap-1.5">
{version && (
<Badge variant="outline" className="gap-1 font-mono text-[11px]">
<Layers className="h-3 w-3" />PVE {version}
</Badge>
)}
{nodes.length > 1 && (
<Badge variant="secondary" className="gap-1 text-[11px]">
<Server className="h-3 w-3" />{t('nodes.cluster_nodes_count', { count: nodes.length })}
</Badge>
)}
{uptime > 0 && (
<span className="ml-auto flex items-center gap-1 text-xs text-muted-foreground">
<Clock className="h-3 w-3" />{formatUptime(uptime)}
</span>
)}
</div>
);
}
/** Чипы рабочих областей, в которых состоит сервер. */
function WorkspaceChips({ server }: { server: ProxmoxServer }) {
const { t } = useTranslation();
const workspaces = server.workspaces ?? [];
if (workspaces.length === 0) {
return (
<span className="flex items-center gap-1.5 text-xs text-muted-foreground">
<LayoutGrid className="h-3 w-3" />{t('nodes.no_workspace')}
</span>
);
}
return (
<div className="flex flex-wrap items-center gap-1.5">
{workspaces.map(ws => (
<span
key={ws.id}
className="inline-flex items-center gap-1.5 rounded-full border border-border bg-muted/50 px-2 py-0.5 text-[11px] font-medium"
>
<span className="h-2 w-2 shrink-0 rounded-full" style={{ backgroundColor: ws.color || 'var(--muted-foreground)' }} />
{ws.name}
</span>
))}
</div>
);
}
interface ServerFormData {
name: string;
hostname: string;
@@ -316,6 +382,12 @@ export default function NodesPage() {
</Badge>
</div>
<ServerMeta serverId={srv.id} online={srv.is_online} />
<div className="border-t border-border/60 pt-3">
<WorkspaceChips server={srv} />
</div>
{srv.description && (
<p className="text-xs text-muted-foreground truncate">{srv.description}</p>
)}

View File

@@ -34,7 +34,7 @@ export function useServer(serverId: number) {
export function useNodes(serverId: number) {
return useQuery({
queryKey: nodeKeys.nodes(serverId),
queryFn: () => apiClient.get<{ nodes: ProxmoxNode[]; cluster_id: string }>(`/proxmox/api/${serverId}/nodes`),
queryFn: () => apiClient.get<{ nodes: ProxmoxNode[]; cluster_id: string; version?: string | null }>(`/proxmox/api/${serverId}/nodes`),
enabled: serverId > 0,
refetchInterval: 30000,
});

View File

@@ -465,7 +465,9 @@
"auto_create_token_hint": "An API token will be created on the Proxmox server automatically. For a cluster, all nodes will be added.",
"auto_fields_required": "Name, host and password are required",
"cluster_mode": "Cluster",
"standalone": "Standalone"
"standalone": "Standalone",
"cluster_nodes_count": "{{count}} nodes",
"no_workspace": "No workspace"
},
"netif": {
"title": "Network Interfaces",

View File

@@ -465,7 +465,9 @@
"auto_create_token_hint": "API-токен будет создан на сервере Proxmox автоматически. Для кластера добавятся все ноды.",
"auto_fields_required": "Нужны имя, хост и пароль",
"cluster_mode": "Кластер",
"standalone": "Одиночный"
"standalone": "Одиночный",
"cluster_nodes_count": "{{count}} узла(ов)",
"no_workspace": "Без рабочей области"
},
"netif": {
"title": "Сетевые интерфейсы",

View File

@@ -35,6 +35,12 @@ export interface AuthResponse {
export interface ProxmoxServer {
id: number;
name: string;
export interface ServerWorkspaceBrief {
id: number;
name: string;
color?: string;
}
hostname: string;
ip_address: string;
port: number;
@@ -43,12 +49,14 @@ export interface ProxmoxServer {
description?: string;
created_at: string;
updated_at: string;
cluster_name?: string;
last_check?: string;
is_online?: boolean;
last_error?: string;
}
export interface ProxmoxServerCreate {
workspaces?: ServerWorkspaceBrief[];
name: string;
hostname: string;
ip_address: string;