feat(ipam): привязка сетей к серверу/ноде и автовыбор сети в визардах
All checks were successful
Deploy to Production / Trigger production update (push) Successful in 8s

- network-scope: scopedNetworks/autoPickNetworkId — фильтрация IPAM-сетей по
  выбранным серверу/ноде и детерминированный автовыбор сети для выдачи IP
- ServerNodeSelect: пара селектов «Сервер + Нода» для привязки сети
- Мастер установки App Store и CreateInstanceWizard: список сетей ограничен
  релевантными, при смене сервера/ноды сеть подбирается автоматически
- IPAM: страницы сетей учитывают привязку к ноде
- Исправлены типы обработчиков Select (onValueChange отдаёт string|null)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
markmorado
2026-07-08 20:09:17 +05:00
parent 23d3f95f54
commit a6eeae3dd7
6 changed files with 206 additions and 11 deletions

View File

@@ -15,6 +15,7 @@ import {
useUpdateNetwork, useDeleteNetwork, useCreatePool, useUpdatePool, useDeletePool, useIPAMIPMap,
} from '@/hooks/use-ipam';
import type { IPAMNetwork, IPAMPool } from '@/types';
import { ServerNodeSelect } from './ServerNodeSelect';
import { toast } from 'sonner';
import { useConfirm } from '@/components/shared/ConfirmDialog';
@@ -73,6 +74,7 @@ export default function IPAMNetworkDetailPage() {
<InfoRow label={t('common.vlan')} value={network.vlan_id ? String(network.vlan_id) : '—'} />
<InfoRow label={t('common.dns')} value={network.dns_primary || '—'} />
<InfoRow label={t('ipam.server')} value={network.server_name || '—'} />
<InfoRow label={t('appstore.node')} value={network.proxmox_node || '—'} />
<InfoRow label={t('ipam.bridge')} value={network.proxmox_bridge || '—'} />
{network.description && <InfoRow label={t('ipam.description')} value={network.description} />}
</CardContent>
@@ -138,6 +140,8 @@ function NetworkActions({ network }: { network: IPAMNetwork }) {
dns_secondary: network.dns_secondary ?? '',
dns_domain: network.dns_domain ?? '',
proxmox_bridge: network.proxmox_bridge ?? '',
proxmox_server_id: network.proxmox_server_id as number | undefined,
proxmox_node: network.proxmox_node as string | undefined,
is_active: network.is_active,
description: network.description ?? '',
});
@@ -153,6 +157,9 @@ function NetworkActions({ network }: { network: IPAMNetwork }) {
dns_secondary: form.dns_secondary || undefined,
dns_domain: form.dns_domain || undefined,
proxmox_bridge: form.proxmox_bridge || undefined,
// null явно очищает привязку на бэкенде (undefined был бы исключён из update)
proxmox_server_id: (form.proxmox_server_id ?? null) as number | undefined,
proxmox_node: (form.proxmox_node ?? null) as string | undefined,
is_active: form.is_active,
description: form.description || undefined,
},
@@ -190,6 +197,11 @@ function NetworkActions({ network }: { network: IPAMNetwork }) {
<Field label={`${t('common.dns')} 2`}><Input value={form.dns_secondary} onChange={e => setForm(p => ({ ...p, dns_secondary: e.target.value }))} /></Field>
<Field label={t('ipam.dns_domain')}><Input value={form.dns_domain} onChange={e => setForm(p => ({ ...p, dns_domain: e.target.value }))} /></Field>
<Field label={t('ipam.bridge')}><Input value={form.proxmox_bridge} onChange={e => setForm(p => ({ ...p, proxmox_bridge: e.target.value }))} placeholder="vmbr0" /></Field>
<ServerNodeSelect
serverId={form.proxmox_server_id}
node={form.proxmox_node}
onChange={({ serverId, node }) => setForm(p => ({ ...p, proxmox_server_id: serverId, proxmox_node: node }))}
/>
<Field label={t('ipam.description')} full><Input value={form.description} onChange={e => setForm(p => ({ ...p, description: e.target.value }))} /></Field>
<label className="flex items-center gap-2 text-sm sm:col-span-2">
<input type="checkbox" checked={form.is_active} onChange={e => setForm(p => ({ ...p, is_active: e.target.checked }))} />