feat: scan NFS server for available exports in storage-add dialog
Add a "scan exports" button next to the server field for NFS storages
that calls Proxmox's /nodes/{node}/scan/nfs and turns the export path
input into a select populated with the real exports found on the
target server, instead of requiring the path to be typed by hand.
This commit is contained in:
@@ -53,6 +53,35 @@ def get_storages(
|
|||||||
raise HTTPException(status_code=500, detail=str(e))
|
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}")
|
@router.post("/api/backups/storages/{server_id}")
|
||||||
async def create_storage(
|
async def create_storage(
|
||||||
server_id: int,
|
server_id: int,
|
||||||
|
|||||||
@@ -239,6 +239,16 @@ class StorageMixin:
|
|||||||
logger.error(f"Ошибка получения статусов хранилищ с {self.host}: {e}")
|
logger.error(f"Ошибка получения статусов хранилищ с {self.host}: {e}")
|
||||||
return status
|
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]:
|
def get_node_storages(self, node: str, content: str = None) -> List[Dict]:
|
||||||
"""Get storages available on a specific node, optionally filtered by content type"""
|
"""Get storages available on a specific node, optionally filtered by content type"""
|
||||||
if not self.proxmox:
|
if not self.proxmox:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { useState, useEffect } from 'react';
|
import { useState, useEffect } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
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 { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
@@ -15,6 +15,7 @@ import {
|
|||||||
useBackupStorages, useProxmoxBackupJobs,
|
useBackupStorages, useProxmoxBackupJobs,
|
||||||
useCreateStorage, useUpdateStorage, useDeleteStorage,
|
useCreateStorage, useUpdateStorage, useDeleteStorage,
|
||||||
useCreateProxmoxJob, useUpdateProxmoxJob, useDeleteProxmoxJob,
|
useCreateProxmoxJob, useUpdateProxmoxJob, useDeleteProxmoxJob,
|
||||||
|
useScanNfsExports,
|
||||||
type ProxmoxJobInput,
|
type ProxmoxJobInput,
|
||||||
} from '@/hooks/use-backups';
|
} from '@/hooks/use-backups';
|
||||||
import { formatBytes } from '@/lib/format';
|
import { formatBytes } from '@/lib/format';
|
||||||
@@ -88,6 +89,8 @@ function StorageDialog({ serverId, open, onOpenChange, editing }: {
|
|||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const createStorage = useCreateStorage(serverId);
|
const createStorage = useCreateStorage(serverId);
|
||||||
const updateStorage = useUpdateStorage(serverId);
|
const updateStorage = useUpdateStorage(serverId);
|
||||||
|
const scanNfs = useScanNfsExports(serverId);
|
||||||
|
const [nfsExports, setNfsExports] = useState<string[]>([]);
|
||||||
const [form, setForm] = useState<StorageForm>(() => editing ? {
|
const [form, setForm] = useState<StorageForm>(() => editing ? {
|
||||||
...emptyForm,
|
...emptyForm,
|
||||||
storage: editing.storage,
|
storage: editing.storage,
|
||||||
@@ -102,6 +105,20 @@ function StorageDialog({ serverId, open, onOpenChange, editing }: {
|
|||||||
} : emptyForm);
|
} : emptyForm);
|
||||||
const set = <K extends keyof StorageForm>(k: K, v: StorageForm[K]) => setForm(p => ({ ...p, [k]: v }));
|
const set = <K extends keyof StorageForm>(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 = () => {
|
const submit = () => {
|
||||||
if (!editing && !form.storage.trim()) { toast.error(t('storages.id_required')); return; }
|
if (!editing && !form.storage.trim()) { toast.error(t('storages.id_required')); return; }
|
||||||
const done = (msg: string) => { toast.success(msg); onOpenChange(false); };
|
const done = (msg: string) => { toast.success(msg); onOpenChange(false); };
|
||||||
@@ -185,8 +202,27 @@ function StorageDialog({ serverId, open, onOpenChange, editing }: {
|
|||||||
)}
|
)}
|
||||||
{!editing && form.type === 'nfs' && (
|
{!editing && form.type === 'nfs' && (
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-2 gap-3">
|
||||||
<div><Label>{t('storages.server')}</Label><Input value={form.server} onChange={e => set('server', e.target.value)} className="mt-1" placeholder="10.0.0.5" /></div>
|
<div>
|
||||||
<div><Label>{t('storages.export')}</Label><Input value={form.export} onChange={e => set('export', e.target.value)} className="mt-1" placeholder="/exports/backup" /></div>
|
<Label>{t('storages.server')}</Label>
|
||||||
|
<div className="mt-1 flex gap-1.5">
|
||||||
|
<Input value={form.server} onChange={e => { set('server', e.target.value); setNfsExports([]); }} placeholder="10.0.0.5" />
|
||||||
|
<Button type="button" variant="outline" size="icon" className="shrink-0" title={t('storages.scan_exports')}
|
||||||
|
disabled={scanNfs.isPending} onClick={handleScanNfs}>
|
||||||
|
<Search className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label>{t('storages.export')}</Label>
|
||||||
|
{nfsExports.length > 0 ? (
|
||||||
|
<Select value={form.export} onValueChange={v => v && set('export', v)}>
|
||||||
|
<SelectTrigger className="mt-1"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>{nfsExports.map(p => <SelectItem key={p} value={p}>{p}</SelectItem>)}</SelectContent>
|
||||||
|
</Select>
|
||||||
|
) : (
|
||||||
|
<Input value={form.export} onChange={e => set('export', e.target.value)} className="mt-1" placeholder="/exports/backup" />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{!editing && form.type === 'cifs' && (
|
{!editing && form.type === 'cifs' && (
|
||||||
|
|||||||
@@ -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) {
|
export function useCreateStorage(serverId: number) {
|
||||||
const qc = useQueryClient();
|
const qc = useQueryClient();
|
||||||
return useMutation({
|
return useMutation({
|
||||||
|
|||||||
@@ -1246,6 +1246,9 @@
|
|||||||
"path": "Path",
|
"path": "Path",
|
||||||
"server": "Server",
|
"server": "Server",
|
||||||
"export": "Export",
|
"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",
|
"share": "Share",
|
||||||
"datastore": "Datastore",
|
"datastore": "Datastore",
|
||||||
"username": "Username",
|
"username": "Username",
|
||||||
|
|||||||
@@ -1228,6 +1228,9 @@
|
|||||||
"path": "Путь",
|
"path": "Путь",
|
||||||
"server": "Сервер",
|
"server": "Сервер",
|
||||||
"export": "Экспорт",
|
"export": "Экспорт",
|
||||||
|
"scan_exports": "Найти экспорты на сервере",
|
||||||
|
"server_required": "Сначала укажите адрес сервера",
|
||||||
|
"no_exports_found": "Экспорты не найдены — проверьте /etc/exports на сервере",
|
||||||
"share": "Шара",
|
"share": "Шара",
|
||||||
"datastore": "Datastore",
|
"datastore": "Datastore",
|
||||||
"username": "Пользователь",
|
"username": "Пользователь",
|
||||||
|
|||||||
Reference in New Issue
Block a user