diff --git a/backend/app/api/proxmox/backup.py b/backend/app/api/proxmox/backup.py index 1b88177..38ac456 100644 --- a/backend/app/api/proxmox/backup.py +++ b/backend/app/api/proxmox/backup.py @@ -53,6 +53,35 @@ def get_storages( raise HTTPException(status_code=500, detail=str(e)) +@router.get("/api/backups/scan-nfs/{server_id}") +def scan_nfs( + server_id: int, + server: str, + node: Optional[str] = None, + db: Session = Depends(get_db), + current_user: User = Depends(PermissionChecker("backup:manage")), +): + """Scan an NFS server for available exports, to populate the storage-add dialog.""" + pve_server = db.query(ProxmoxServer).filter(ProxmoxServer.id == server_id).first() + if not pve_server: + raise HTTPException(status_code=404, detail="Server not found") + try: + client = _get_proxmox_client(pve_server) + target_node = node + if not target_node: + nodes = client.get_nodes() + if not nodes: + raise HTTPException(status_code=400, detail="No nodes available to scan from") + target_node = nodes[0]["node"] + exports = client.scan_nfs_exports(target_node, server) + return JSONResponse(content={"exports": exports}) + except HTTPException: + raise + except Exception as e: + logger.error(f"Error scanning NFS exports on {server} for server {server_id}: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + @router.post("/api/backups/storages/{server_id}") async def create_storage( server_id: int, diff --git a/backend/app/proxmox/mixins/storage.py b/backend/app/proxmox/mixins/storage.py index fedcf38..3e64cbc 100644 --- a/backend/app/proxmox/mixins/storage.py +++ b/backend/app/proxmox/mixins/storage.py @@ -239,6 +239,16 @@ class StorageMixin: logger.error(f"Ошибка получения статусов хранилищ с {self.host}: {e}") return status + def scan_nfs_exports(self, node: str, server: str) -> List[Dict]: + """ + Получить список NFS-экспортов удалённого сервера через + GET /nodes/{node}/scan/nfs — для выбора export в диалоге добавления + хранилища вместо ручного ввода пути. + """ + if not self.proxmox: + return [] + return self.proxmox.nodes(node).scan.nfs.get(server=server) + def get_node_storages(self, node: str, content: str = None) -> List[Dict]: """Get storages available on a specific node, optionally filtered by content type""" if not self.proxmox: diff --git a/frontend/src/features/backups/StoragesTab.tsx b/frontend/src/features/backups/StoragesTab.tsx index 6807331..6ad88a6 100644 --- a/frontend/src/features/backups/StoragesTab.tsx +++ b/frontend/src/features/backups/StoragesTab.tsx @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import { Plus, Pencil, Trash2, Database, CalendarClock, Power, PowerOff, AlertTriangle } from 'lucide-react'; +import { Plus, Pencil, Trash2, Database, CalendarClock, Power, PowerOff, AlertTriangle, Search } from 'lucide-react'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; import { Button } from '@/components/ui/button'; import { Checkbox } from '@/components/ui/checkbox'; @@ -15,6 +15,7 @@ import { useBackupStorages, useProxmoxBackupJobs, useCreateStorage, useUpdateStorage, useDeleteStorage, useCreateProxmoxJob, useUpdateProxmoxJob, useDeleteProxmoxJob, + useScanNfsExports, type ProxmoxJobInput, } from '@/hooks/use-backups'; import { formatBytes } from '@/lib/format'; @@ -88,6 +89,8 @@ function StorageDialog({ serverId, open, onOpenChange, editing }: { const { t } = useTranslation(); const createStorage = useCreateStorage(serverId); const updateStorage = useUpdateStorage(serverId); + const scanNfs = useScanNfsExports(serverId); + const [nfsExports, setNfsExports] = useState([]); const [form, setForm] = useState(() => editing ? { ...emptyForm, storage: editing.storage, @@ -102,6 +105,20 @@ function StorageDialog({ serverId, open, onOpenChange, editing }: { } : emptyForm); const set = (k: K, v: StorageForm[K]) => setForm(p => ({ ...p, [k]: v })); + const handleScanNfs = () => { + if (!form.server.trim()) { toast.error(t('storages.server_required')); return; } + setNfsExports([]); + scanNfs.mutate(form.server.trim(), { + onSuccess: (data) => { + const paths = (data.exports ?? []).map(e => e.path).filter(Boolean); + setNfsExports(paths); + if (paths.length === 0) toast.error(t('storages.no_exports_found')); + else if (!paths.includes(form.export)) set('export', paths[0]); + }, + onError: (e: Error) => toast.error(e.message), + }); + }; + const submit = () => { if (!editing && !form.storage.trim()) { toast.error(t('storages.id_required')); return; } const done = (msg: string) => { toast.success(msg); onOpenChange(false); }; @@ -185,8 +202,27 @@ function StorageDialog({ serverId, open, onOpenChange, editing }: { )} {!editing && form.type === 'nfs' && (
-
set('server', e.target.value)} className="mt-1" placeholder="10.0.0.5" />
-
set('export', e.target.value)} className="mt-1" placeholder="/exports/backup" />
+
+ +
+ { set('server', e.target.value); setNfsExports([]); }} placeholder="10.0.0.5" /> + +
+
+
+ + {nfsExports.length > 0 ? ( + + ) : ( + set('export', e.target.value)} className="mt-1" placeholder="/exports/backup" /> + )} +
)} {!editing && form.type === 'cifs' && ( diff --git a/frontend/src/hooks/use-backups.ts b/frontend/src/hooks/use-backups.ts index 4f18428..4929c3a 100644 --- a/frontend/src/hooks/use-backups.ts +++ b/frontend/src/hooks/use-backups.ts @@ -70,6 +70,15 @@ export function useDeleteProxmoxJob(serverId: number) { }); } +export function useScanNfsExports(serverId: number) { + return useMutation({ + mutationFn: (server: string) => + apiClient.get<{ exports: { path: string }[] }>( + `/proxmox/api/backups/scan-nfs/${serverId}?server=${encodeURIComponent(server)}` + ), + }); +} + export function useCreateStorage(serverId: number) { const qc = useQueryClient(); return useMutation({ diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 3b57e45..22e5b1f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -1246,6 +1246,9 @@ "path": "Path", "server": "Server", "export": "Export", + "scan_exports": "Scan server for exports", + "server_required": "Enter the server address first", + "no_exports_found": "No exports found — check /etc/exports on the server", "share": "Share", "datastore": "Datastore", "username": "Username", diff --git a/frontend/src/locales/ru.json b/frontend/src/locales/ru.json index b7833e2..76c8bf2 100644 --- a/frontend/src/locales/ru.json +++ b/frontend/src/locales/ru.json @@ -1228,6 +1228,9 @@ "path": "Путь", "server": "Сервер", "export": "Экспорт", + "scan_exports": "Найти экспорты на сервере", + "server_required": "Сначала укажите адрес сервера", + "no_exports_found": "Экспорты не найдены — проверьте /etc/exports на сервере", "share": "Шара", "datastore": "Datastore", "username": "Пользователь",