Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
146afc1369 | ||
|
|
ba66755a29 |
@@ -35,6 +35,7 @@ import {
|
|||||||
} from "@cdnmanager/db";
|
} from "@cdnmanager/db";
|
||||||
import { AppError } from "../errors.js";
|
import { AppError } from "../errors.js";
|
||||||
import {
|
import {
|
||||||
|
buildDnsPreviewRecords,
|
||||||
buildHostname,
|
buildHostname,
|
||||||
isValidIpv4,
|
isValidIpv4,
|
||||||
isValidIpv6,
|
isValidIpv6,
|
||||||
@@ -322,15 +323,30 @@ export const fleetRoutes: FastifyPluginAsync = async (app) => {
|
|||||||
const loc = listLocations(app.db).find((l) => l.id === q.locationId);
|
const loc = listLocations(app.db).find((l) => l.id === q.locationId);
|
||||||
if (!loc) throw AppError.notFound("location not found");
|
if (!loc) throw AppError.notFound("location not found");
|
||||||
const indexNum = Number(q.indexNum ?? "1") || 1;
|
const indexNum = Number(q.indexNum ?? "1") || 1;
|
||||||
|
const hostname = buildHostname({
|
||||||
|
template: q.template || zone.namingTemplate,
|
||||||
|
locationCode: loc.code,
|
||||||
|
role: q.role,
|
||||||
|
indexNum,
|
||||||
|
zoneName: zone.name,
|
||||||
|
providerTag: q.providerTag,
|
||||||
|
});
|
||||||
|
const aliases = q.nodeId
|
||||||
|
? listAliases(app.db, { zoneId: zone.id }).filter(
|
||||||
|
(a) => a.targetNodeId === q.nodeId,
|
||||||
|
)
|
||||||
|
: [];
|
||||||
|
const records = buildDnsPreviewRecords({
|
||||||
|
hostname,
|
||||||
|
ttl: zone.defaultTtl,
|
||||||
|
ipv4: q.ipv4,
|
||||||
|
ipv6: q.ipv6,
|
||||||
|
aliases: aliases.map((a) => ({ name: a.name, purpose: a.purpose })),
|
||||||
|
});
|
||||||
return {
|
return {
|
||||||
hostname: buildHostname({
|
hostname,
|
||||||
template: q.template || zone.namingTemplate,
|
ttl: zone.defaultTtl,
|
||||||
locationCode: loc.code,
|
records,
|
||||||
role: q.role,
|
|
||||||
indexNum,
|
|
||||||
zoneName: zone.name,
|
|
||||||
providerTag: q.providerTag,
|
|
||||||
}),
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -24,6 +24,56 @@ export function buildHostname(opts: {
|
|||||||
return host.replace(/\.$/, "");
|
return host.replace(/\.$/, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type DnsPreviewRecord = {
|
||||||
|
type: "A" | "AAAA" | "CNAME";
|
||||||
|
name: string;
|
||||||
|
content: string;
|
||||||
|
ttl: number;
|
||||||
|
/** purpose / note (e.g. alias purpose) */
|
||||||
|
note?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Desired-state DNS for node form preview (A/AAAA + CNAME aliases → hostname). */
|
||||||
|
export function buildDnsPreviewRecords(opts: {
|
||||||
|
hostname: string;
|
||||||
|
ttl: number;
|
||||||
|
ipv4?: string | null;
|
||||||
|
ipv6?: string | null;
|
||||||
|
aliases?: Array<{ name: string; purpose?: string | null }>;
|
||||||
|
}): DnsPreviewRecord[] {
|
||||||
|
const records: DnsPreviewRecord[] = [];
|
||||||
|
const ipv4 = opts.ipv4?.trim();
|
||||||
|
const ipv6 = opts.ipv6?.trim();
|
||||||
|
if (ipv4) {
|
||||||
|
records.push({
|
||||||
|
type: "A",
|
||||||
|
name: opts.hostname,
|
||||||
|
content: ipv4,
|
||||||
|
ttl: opts.ttl,
|
||||||
|
note: "dns-only",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (ipv6) {
|
||||||
|
records.push({
|
||||||
|
type: "AAAA",
|
||||||
|
name: opts.hostname,
|
||||||
|
content: ipv6,
|
||||||
|
ttl: opts.ttl,
|
||||||
|
note: "dns-only",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
for (const alias of opts.aliases ?? []) {
|
||||||
|
records.push({
|
||||||
|
type: "CNAME",
|
||||||
|
name: alias.name,
|
||||||
|
content: opts.hostname,
|
||||||
|
ttl: opts.ttl,
|
||||||
|
note: alias.purpose ?? undefined,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return records;
|
||||||
|
}
|
||||||
|
|
||||||
export function normalizeFqdn(name: string): string {
|
export function normalizeFqdn(name: string): string {
|
||||||
return name.trim().toLowerCase().replace(/\.$/, "");
|
return name.trim().toLowerCase().replace(/\.$/, "");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,5 +112,44 @@ describe("fleet api", () => {
|
|||||||
});
|
});
|
||||||
expect(topo.statusCode).toBe(200);
|
expect(topo.statusCode).toBe(200);
|
||||||
expect(topo.json().nodes).toHaveLength(1);
|
expect(topo.json().nodes).toHaveLength(1);
|
||||||
|
|
||||||
|
const preview = await app.inject({
|
||||||
|
method: "GET",
|
||||||
|
url: `/api/v1/naming/preview?${new URLSearchParams({
|
||||||
|
zoneId: zone.id,
|
||||||
|
locationId: msk.id,
|
||||||
|
role: "gw",
|
||||||
|
indexNum: "2",
|
||||||
|
ipv4: "198.51.100.10",
|
||||||
|
ipv6: "2001:db8::10",
|
||||||
|
nodeId: node.id,
|
||||||
|
})}`,
|
||||||
|
headers: authHeader,
|
||||||
|
});
|
||||||
|
expect(preview.statusCode).toBe(200);
|
||||||
|
const body = preview.json() as {
|
||||||
|
hostname: string;
|
||||||
|
records: Array<{ type: string; name: string; content: string }>;
|
||||||
|
};
|
||||||
|
expect(body.hostname).toBe("msk-gw02.rtnt.top");
|
||||||
|
expect(body.records).toEqual(
|
||||||
|
expect.arrayContaining([
|
||||||
|
expect.objectContaining({
|
||||||
|
type: "A",
|
||||||
|
name: "msk-gw02.rtnt.top",
|
||||||
|
content: "198.51.100.10",
|
||||||
|
}),
|
||||||
|
expect.objectContaining({
|
||||||
|
type: "AAAA",
|
||||||
|
name: "msk-gw02.rtnt.top",
|
||||||
|
content: "2001:db8::10",
|
||||||
|
}),
|
||||||
|
expect.objectContaining({
|
||||||
|
type: "CNAME",
|
||||||
|
name: "msk.rtnt.top",
|
||||||
|
content: "msk-gw02.rtnt.top",
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,134 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import * as React from 'react'
|
||||||
|
import { CheckIcon } from 'lucide-react'
|
||||||
|
|
||||||
|
import { cn } from '@cdnmanager/ui/lib/utils'
|
||||||
|
import {
|
||||||
|
Autocomplete,
|
||||||
|
AutocompleteContent,
|
||||||
|
AutocompleteEmpty,
|
||||||
|
AutocompleteInput,
|
||||||
|
AutocompleteItem,
|
||||||
|
AutocompleteList,
|
||||||
|
} from '@/components/reui/autocomplete'
|
||||||
|
import { TruncatedText } from '@/components/truncated-text'
|
||||||
|
|
||||||
|
export interface AutoCompleteOption {
|
||||||
|
value: string
|
||||||
|
label: string
|
||||||
|
/** Левый префикс (например флаг страны). */
|
||||||
|
leading?: React.ReactNode
|
||||||
|
}
|
||||||
|
|
||||||
|
interface AutoCompleteInputProps {
|
||||||
|
id?: string
|
||||||
|
value: string
|
||||||
|
onChange: (value: string) => void
|
||||||
|
options: AutoCompleteOption[]
|
||||||
|
placeholder?: string
|
||||||
|
searchPlaceholder?: string
|
||||||
|
emptyText?: string
|
||||||
|
className?: string
|
||||||
|
/** Показывать ли выбранный leading в поле (например флаг). */
|
||||||
|
showLeadingInInput?: boolean
|
||||||
|
/** Разрешать ли произвольный ввод (не только из списка). По умолчанию true. */
|
||||||
|
allowFreeText?: boolean
|
||||||
|
disabled?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AutoCompleteInput({
|
||||||
|
id,
|
||||||
|
value,
|
||||||
|
onChange,
|
||||||
|
options,
|
||||||
|
placeholder = 'Выбрать…',
|
||||||
|
searchPlaceholder,
|
||||||
|
emptyText = 'Ничего не найдено',
|
||||||
|
className,
|
||||||
|
showLeadingInInput = true,
|
||||||
|
allowFreeText = true,
|
||||||
|
disabled = false,
|
||||||
|
}: AutoCompleteInputProps) {
|
||||||
|
const trimmedValue = value.trim()
|
||||||
|
|
||||||
|
const selected = React.useMemo(
|
||||||
|
() => options.find((o) => o.value.toLowerCase() === trimmedValue.toLowerCase()),
|
||||||
|
[options, trimmedValue],
|
||||||
|
)
|
||||||
|
const leading = showLeadingInInput ? selected?.leading : undefined
|
||||||
|
|
||||||
|
const inputPlaceholder = searchPlaceholder ?? placeholder
|
||||||
|
|
||||||
|
const handleValueChange = React.useCallback(
|
||||||
|
(inputVal: string) => {
|
||||||
|
const q = inputVal.trim()
|
||||||
|
const match = options.find(
|
||||||
|
(o) =>
|
||||||
|
o.label.toLowerCase() === q.toLowerCase() ||
|
||||||
|
o.value.toLowerCase() === q.toLowerCase(),
|
||||||
|
)
|
||||||
|
if (match) {
|
||||||
|
onChange(match.value)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (allowFreeText) {
|
||||||
|
onChange(inputVal)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[options, onChange, allowFreeText],
|
||||||
|
)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Autocomplete
|
||||||
|
items={options}
|
||||||
|
value={value}
|
||||||
|
onValueChange={handleValueChange}
|
||||||
|
itemToStringValue={(item) => item.label}
|
||||||
|
mode="list"
|
||||||
|
autoHighlight
|
||||||
|
openOnInputClick
|
||||||
|
disabled={disabled}
|
||||||
|
>
|
||||||
|
<div className="relative w-full">
|
||||||
|
{leading ? (
|
||||||
|
<span className="pointer-events-none absolute start-2.5 top-1/2 z-10 size-4 -translate-y-1/2 [&_svg]:size-full">
|
||||||
|
{leading}
|
||||||
|
</span>
|
||||||
|
) : null}
|
||||||
|
<AutocompleteInput
|
||||||
|
id={id}
|
||||||
|
placeholder={trimmedValue ? undefined : inputPlaceholder}
|
||||||
|
showTrigger
|
||||||
|
showClear={Boolean(trimmedValue)}
|
||||||
|
className={cn(leading && 'ps-8', className)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<AutocompleteContent>
|
||||||
|
<AutocompleteEmpty>{emptyText}</AutocompleteEmpty>
|
||||||
|
<AutocompleteList>
|
||||||
|
{(item) => {
|
||||||
|
const isSelected = item.value.toLowerCase() === trimmedValue.toLowerCase()
|
||||||
|
return (
|
||||||
|
<AutocompleteItem
|
||||||
|
key={item.value}
|
||||||
|
value={item}
|
||||||
|
className="gap-2.5 px-2 py-1.5"
|
||||||
|
>
|
||||||
|
{item.leading ? (
|
||||||
|
<span className="relative z-1 size-4 shrink-0">{item.leading}</span>
|
||||||
|
) : null}
|
||||||
|
<span className="relative z-1 min-w-0 flex-1">
|
||||||
|
<TruncatedText>{item.label}</TruncatedText>
|
||||||
|
</span>
|
||||||
|
{isSelected ? (
|
||||||
|
<CheckIcon className="relative z-1 size-4 shrink-0 opacity-60" />
|
||||||
|
) : null}
|
||||||
|
</AutocompleteItem>
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</AutocompleteList>
|
||||||
|
</AutocompleteContent>
|
||||||
|
</Autocomplete>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { cn } from '@cdnmanager/ui/lib/utils'
|
||||||
|
import { countryCodeFromName, getCountryFlagUrl } from '@/lib/country-labels'
|
||||||
|
|
||||||
|
interface CountryFlagProps {
|
||||||
|
code?: string
|
||||||
|
country?: string
|
||||||
|
className?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CountryFlag({ code, country, className }: CountryFlagProps) {
|
||||||
|
const resolvedCode = code ?? (country ? countryCodeFromName(country) : undefined)
|
||||||
|
const url = getCountryFlagUrl(resolvedCode)
|
||||||
|
if (!url) return null
|
||||||
|
|
||||||
|
return (
|
||||||
|
<img
|
||||||
|
src={url}
|
||||||
|
alt=""
|
||||||
|
className={cn('size-4 shrink-0 rounded-full object-cover', className)}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/** ISO country codes from fleet locations seed → RU labels for selects. */
|
/** ISO → русское название (seed fleet locations). */
|
||||||
const COUNTRY_LABELS: Record<string, string> = {
|
const COUNTRY_NAME_BY_CODE: Record<string, string> = {
|
||||||
RU: 'Россия',
|
RU: 'Россия',
|
||||||
DE: 'Германия',
|
DE: 'Германия',
|
||||||
NL: 'Нидерланды',
|
NL: 'Нидерланды',
|
||||||
@@ -7,7 +7,23 @@ const COUNTRY_LABELS: Record<string, string> = {
|
|||||||
FR: 'Франция',
|
FR: 'Франция',
|
||||||
}
|
}
|
||||||
|
|
||||||
export function countrySelectLabel(code: string): string {
|
const COUNTRY_CODE_BY_NAME: Record<string, string> = Object.fromEntries(
|
||||||
const name = COUNTRY_LABELS[code]
|
Object.entries(COUNTRY_NAME_BY_CODE).map(([code, name]) => [name.toLowerCase(), code]),
|
||||||
return name ? `${code} — ${name}` : code
|
)
|
||||||
|
|
||||||
|
export function countryNameFromCode(code: string | null | undefined): string {
|
||||||
|
if (!code) return ''
|
||||||
|
return COUNTRY_NAME_BY_CODE[code.toUpperCase()] ?? code
|
||||||
|
}
|
||||||
|
|
||||||
|
export function countryCodeFromName(name: string | null | undefined): string {
|
||||||
|
if (!name?.trim()) return ''
|
||||||
|
const trimmed = name.trim()
|
||||||
|
if (trimmed.length === 2) return trimmed.toUpperCase()
|
||||||
|
return COUNTRY_CODE_BY_NAME[trimmed.toLowerCase()] ?? ''
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getCountryFlagUrl(code?: string): string | undefined {
|
||||||
|
if (!code || code.length !== 2) return undefined
|
||||||
|
return `https://flagcdn.com/${code.toLowerCase()}.svg`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -180,6 +180,9 @@ export async function previewHostname(params: {
|
|||||||
role: string
|
role: string
|
||||||
indexNum?: number
|
indexNum?: number
|
||||||
providerTag?: string
|
providerTag?: string
|
||||||
|
ipv4?: string
|
||||||
|
ipv6?: string
|
||||||
|
nodeId?: string
|
||||||
}) {
|
}) {
|
||||||
const p = new URLSearchParams({
|
const p = new URLSearchParams({
|
||||||
zoneId: params.zoneId,
|
zoneId: params.zoneId,
|
||||||
@@ -188,5 +191,18 @@ export async function previewHostname(params: {
|
|||||||
indexNum: String(params.indexNum ?? 1),
|
indexNum: String(params.indexNum ?? 1),
|
||||||
})
|
})
|
||||||
if (params.providerTag) p.set('providerTag', params.providerTag)
|
if (params.providerTag) p.set('providerTag', params.providerTag)
|
||||||
return api.get<{ hostname: string }>(`/api/v1/naming/preview?${p}`)
|
if (params.ipv4) p.set('ipv4', params.ipv4)
|
||||||
|
if (params.ipv6) p.set('ipv6', params.ipv6)
|
||||||
|
if (params.nodeId) p.set('nodeId', params.nodeId)
|
||||||
|
return api.get<{
|
||||||
|
hostname: string
|
||||||
|
ttl: number
|
||||||
|
records: Array<{
|
||||||
|
type: 'A' | 'AAAA' | 'CNAME'
|
||||||
|
name: string
|
||||||
|
content: string
|
||||||
|
ttl: number
|
||||||
|
note?: string
|
||||||
|
}>
|
||||||
|
}>(`/api/v1/naming/preview?${p}`)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { createFileRoute, Link } from '@tanstack/react-router'
|
import { createFileRoute, Link } from '@tanstack/react-router'
|
||||||
import { useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
import { useForm } from 'react-hook-form'
|
import { useForm } from 'react-hook-form'
|
||||||
import { zodResolver } from '@hookform/resolvers/zod'
|
import { zodResolver } from '@hookform/resolvers/zod'
|
||||||
@@ -25,7 +25,13 @@ import { Button } from '@cdnmanager/ui/components/button'
|
|||||||
import { Input } from '@cdnmanager/ui/components/input'
|
import { Input } from '@cdnmanager/ui/components/input'
|
||||||
import { Label } from '@cdnmanager/ui/components/label'
|
import { Label } from '@cdnmanager/ui/components/label'
|
||||||
import { SelectField } from '@/components/select-field'
|
import { SelectField } from '@/components/select-field'
|
||||||
import { countrySelectLabel } from '@/lib/country-labels'
|
import { AutoCompleteInput } from '@/components/auto-complete-input'
|
||||||
|
import { CountryFlag } from '@/components/country-flag'
|
||||||
|
import { FormFieldSimple } from '@/components/form-field'
|
||||||
|
import {
|
||||||
|
countryCodeFromName,
|
||||||
|
countryNameFromCode,
|
||||||
|
} from '@/lib/country-labels'
|
||||||
import { queryClient } from '@/lib/query-client'
|
import { queryClient } from '@/lib/query-client'
|
||||||
import {
|
import {
|
||||||
createNode,
|
createNode,
|
||||||
@@ -80,8 +86,18 @@ function NodesPage() {
|
|||||||
const [sheetOpen, setSheetOpen] = useState(false)
|
const [sheetOpen, setSheetOpen] = useState(false)
|
||||||
const [editing, setEditing] = useState<Node | null>(null)
|
const [editing, setEditing] = useState<Node | null>(null)
|
||||||
const [deleteId, setDeleteId] = useState<string | null>(null)
|
const [deleteId, setDeleteId] = useState<string | null>(null)
|
||||||
const [preview, setPreview] = useState('')
|
const [previewHost, setPreviewHost] = useState('')
|
||||||
const [countryCode, setCountryCode] = useState('')
|
const [previewRecords, setPreviewRecords] = useState<
|
||||||
|
Array<{
|
||||||
|
type: 'A' | 'AAAA' | 'CNAME'
|
||||||
|
name: string
|
||||||
|
content: string
|
||||||
|
ttl: number
|
||||||
|
note?: string
|
||||||
|
}>
|
||||||
|
>([])
|
||||||
|
const [countryName, setCountryName] = useState('')
|
||||||
|
const [locationQuery, setLocationQuery] = useState('')
|
||||||
|
|
||||||
const form = useForm<FormValues>({
|
const form = useForm<FormValues>({
|
||||||
resolver: zodResolver(formSchema),
|
resolver: zodResolver(formSchema),
|
||||||
@@ -103,6 +119,10 @@ function NodesPage() {
|
|||||||
const watchRole = form.watch('role')
|
const watchRole = form.watch('role')
|
||||||
const watchIndex = form.watch('indexNum')
|
const watchIndex = form.watch('indexNum')
|
||||||
const watchProvider = form.watch('providerTag')
|
const watchProvider = form.watch('providerTag')
|
||||||
|
const watchIpv4 = form.watch('ipv4')
|
||||||
|
const watchIpv6 = form.watch('ipv6')
|
||||||
|
|
||||||
|
const countryCode = countryCodeFromName(countryName)
|
||||||
|
|
||||||
const countryOptions = useMemo(() => {
|
const countryOptions = useMemo(() => {
|
||||||
const codes = new Set<string>()
|
const codes = new Set<string>()
|
||||||
@@ -110,8 +130,15 @@ function NodesPage() {
|
|||||||
if (loc.country) codes.add(loc.country)
|
if (loc.country) codes.add(loc.country)
|
||||||
}
|
}
|
||||||
return [...codes]
|
return [...codes]
|
||||||
.sort((a, b) => a.localeCompare(b))
|
.map((code) => {
|
||||||
.map((code) => ({ value: code, label: countrySelectLabel(code) }))
|
const name = countryNameFromCode(code)
|
||||||
|
return {
|
||||||
|
value: name,
|
||||||
|
label: name,
|
||||||
|
leading: <CountryFlag code={code} country={name} />,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.sort((a, b) => a.label.localeCompare(b.label, 'ru'))
|
||||||
}, [locations])
|
}, [locations])
|
||||||
|
|
||||||
const locationOptions = useMemo(() => {
|
const locationOptions = useMemo(() => {
|
||||||
@@ -119,31 +146,85 @@ function NodesPage() {
|
|||||||
return locations
|
return locations
|
||||||
.filter((l) => l.country === countryCode)
|
.filter((l) => l.country === countryCode)
|
||||||
.map((l) => ({
|
.map((l) => ({
|
||||||
value: l.id,
|
value: `${l.code} — ${l.name}`,
|
||||||
label: `${l.code} — ${l.name}`,
|
label: `${l.code} — ${l.name}`,
|
||||||
}))
|
}))
|
||||||
}, [locations, countryCode])
|
}, [locations, countryCode])
|
||||||
|
|
||||||
function countryForLocationId(locationId: string): string {
|
function locationLabel(locationId: string): string {
|
||||||
return locations.find((l) => l.id === locationId)?.country ?? ''
|
const loc = locations.find((l) => l.id === locationId)
|
||||||
|
return loc ? `${loc.code} — ${loc.name}` : ''
|
||||||
}
|
}
|
||||||
|
|
||||||
async function refreshPreview() {
|
function countryNameForLocationId(locationId: string): string {
|
||||||
if (!watchZone || !watchLoc || !watchRole) return
|
const code = locations.find((l) => l.id === locationId)?.country
|
||||||
|
return countryNameFromCode(code)
|
||||||
|
}
|
||||||
|
|
||||||
|
function locationIdFromDisplay(display: string): string {
|
||||||
|
const q = display.trim().toLowerCase()
|
||||||
|
if (!q) return ''
|
||||||
|
const match = locations.find((l) => {
|
||||||
|
if (countryCode && l.country !== countryCode) return false
|
||||||
|
const label = `${l.code} — ${l.name}`.toLowerCase()
|
||||||
|
return label === q || l.code.toLowerCase() === q || l.name.toLowerCase() === q
|
||||||
|
})
|
||||||
|
return match?.id ?? ''
|
||||||
|
}
|
||||||
|
|
||||||
|
async function refreshPreview(
|
||||||
|
overrides?: Partial<{
|
||||||
|
zoneId: string
|
||||||
|
locationId: string
|
||||||
|
role: NodeRole
|
||||||
|
indexNum: number
|
||||||
|
providerTag: string
|
||||||
|
ipv4: string
|
||||||
|
ipv6: string
|
||||||
|
}>,
|
||||||
|
) {
|
||||||
|
const values = { ...form.getValues(), ...overrides }
|
||||||
|
if (!values.zoneId || !values.locationId || !values.role) {
|
||||||
|
setPreviewHost('')
|
||||||
|
setPreviewRecords([])
|
||||||
|
return
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
const res = await previewHostname({
|
const res = await previewHostname({
|
||||||
zoneId: watchZone,
|
zoneId: values.zoneId,
|
||||||
locationId: watchLoc,
|
locationId: values.locationId,
|
||||||
role: watchRole,
|
role: values.role,
|
||||||
indexNum: Number(watchIndex) || 1,
|
indexNum: Number(values.indexNum) || 1,
|
||||||
providerTag: watchProvider || undefined,
|
providerTag: values.providerTag || undefined,
|
||||||
|
ipv4: values.ipv4 || undefined,
|
||||||
|
ipv6: values.ipv6 || undefined,
|
||||||
|
nodeId: editing?.id,
|
||||||
})
|
})
|
||||||
setPreview(res.hostname)
|
setPreviewHost(res.hostname)
|
||||||
|
setPreviewRecords(res.records ?? [])
|
||||||
} catch {
|
} catch {
|
||||||
setPreview('')
|
setPreviewHost('')
|
||||||
|
setPreviewRecords([])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!sheetOpen) return
|
||||||
|
void refreshPreview()
|
||||||
|
// form + editing captured via refreshPreview closures; watches drive re-run
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentional field watches
|
||||||
|
}, [
|
||||||
|
sheetOpen,
|
||||||
|
watchZone,
|
||||||
|
watchLoc,
|
||||||
|
watchRole,
|
||||||
|
watchIndex,
|
||||||
|
watchProvider,
|
||||||
|
watchIpv4,
|
||||||
|
watchIpv6,
|
||||||
|
editing?.id,
|
||||||
|
])
|
||||||
|
|
||||||
const saveMutation = useMutation({
|
const saveMutation = useMutation({
|
||||||
mutationFn: async (values: FormValues) => {
|
mutationFn: async (values: FormValues) => {
|
||||||
if (editing) {
|
if (editing) {
|
||||||
@@ -174,7 +255,8 @@ function NodesPage() {
|
|||||||
toast.success(editing ? 'Нода обновлена' : 'Нода создана')
|
toast.success(editing ? 'Нода обновлена' : 'Нода создана')
|
||||||
setSheetOpen(false)
|
setSheetOpen(false)
|
||||||
setEditing(null)
|
setEditing(null)
|
||||||
setCountryCode('')
|
setCountryName('')
|
||||||
|
setLocationQuery('')
|
||||||
form.reset()
|
form.reset()
|
||||||
void qc.invalidateQueries({ queryKey: ['fleet'] })
|
void qc.invalidateQueries({ queryKey: ['fleet'] })
|
||||||
},
|
},
|
||||||
@@ -294,7 +376,8 @@ function NodesPage() {
|
|||||||
onClick={() => {
|
onClick={() => {
|
||||||
const n = row.original
|
const n = row.original
|
||||||
setEditing(n)
|
setEditing(n)
|
||||||
setCountryCode(countryForLocationId(n.locationId))
|
setCountryName(countryNameForLocationId(n.locationId))
|
||||||
|
setLocationQuery(locationLabel(n.locationId))
|
||||||
form.reset({
|
form.reset({
|
||||||
zoneId: n.zoneId,
|
zoneId: n.zoneId,
|
||||||
locationId: n.locationId,
|
locationId: n.locationId,
|
||||||
@@ -306,7 +389,8 @@ function NodesPage() {
|
|||||||
notes: n.notes ?? '',
|
notes: n.notes ?? '',
|
||||||
hostname: n.hostname,
|
hostname: n.hostname,
|
||||||
})
|
})
|
||||||
setPreview(n.hostname)
|
setPreviewHost(n.hostname)
|
||||||
|
setPreviewRecords([])
|
||||||
setSheetOpen(true)
|
setSheetOpen(true)
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -335,7 +419,8 @@ function NodesPage() {
|
|||||||
onClick={() => {
|
onClick={() => {
|
||||||
setEditing(null)
|
setEditing(null)
|
||||||
const firstLoc = locations[0]
|
const firstLoc = locations[0]
|
||||||
setCountryCode(firstLoc?.country ?? '')
|
setCountryName(countryNameFromCode(firstLoc?.country))
|
||||||
|
setLocationQuery(firstLoc ? `${firstLoc.code} — ${firstLoc.name}` : '')
|
||||||
form.reset({
|
form.reset({
|
||||||
zoneId: zones[0]?.id ?? '',
|
zoneId: zones[0]?.id ?? '',
|
||||||
locationId: firstLoc?.id ?? '',
|
locationId: firstLoc?.id ?? '',
|
||||||
@@ -347,9 +432,9 @@ function NodesPage() {
|
|||||||
notes: '',
|
notes: '',
|
||||||
hostname: '',
|
hostname: '',
|
||||||
})
|
})
|
||||||
setPreview('')
|
setPreviewHost('')
|
||||||
|
setPreviewRecords([])
|
||||||
setSheetOpen(true)
|
setSheetOpen(true)
|
||||||
void refreshPreview()
|
|
||||||
}}
|
}}
|
||||||
disabled={zones.length === 0}
|
disabled={zones.length === 0}
|
||||||
>
|
>
|
||||||
@@ -417,8 +502,7 @@ function NodesPage() {
|
|||||||
<SelectField
|
<SelectField
|
||||||
value={form.watch('zoneId')}
|
value={form.watch('zoneId')}
|
||||||
onValueChange={(v) => {
|
onValueChange={(v) => {
|
||||||
form.setValue('zoneId', v ?? '')
|
form.setValue('zoneId', v ?? '', { shouldDirty: true })
|
||||||
void refreshPreview()
|
|
||||||
}}
|
}}
|
||||||
placeholder="Зона"
|
placeholder="Зона"
|
||||||
options={zones.map((z) => ({ value: z.id, label: z.name }))}
|
options={zones.map((z) => ({ value: z.id, label: z.name }))}
|
||||||
@@ -426,42 +510,51 @@ function NodesPage() {
|
|||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<FormFieldSimple label="Страна" htmlFor="node-country">
|
||||||
<div className="flex flex-col gap-2">
|
<AutoCompleteInput
|
||||||
<Label>Страна</Label>
|
id="node-country"
|
||||||
<SelectField
|
placeholder="Любая"
|
||||||
value={countryCode || null}
|
value={countryName}
|
||||||
onValueChange={(v) => {
|
onChange={(v) => {
|
||||||
const next = v ?? ''
|
setCountryName(v)
|
||||||
setCountryCode(next)
|
const nextCode = countryCodeFromName(v)
|
||||||
const currentLoc = locations.find((l) => l.id === form.getValues('locationId'))
|
const currentLoc = locations.find((l) => l.id === form.getValues('locationId'))
|
||||||
if (!next || !currentLoc || currentLoc.country !== next) {
|
if (!nextCode || !currentLoc || currentLoc.country !== nextCode) {
|
||||||
form.setValue('locationId', '')
|
form.setValue('locationId', '')
|
||||||
setPreview('')
|
setLocationQuery('')
|
||||||
}
|
setPreviewHost('')
|
||||||
void refreshPreview()
|
setPreviewRecords([])
|
||||||
}}
|
}
|
||||||
placeholder="Страна"
|
}}
|
||||||
options={countryOptions}
|
options={countryOptions}
|
||||||
/>
|
searchPlaceholder="Поиск страны…"
|
||||||
</div>
|
emptyText="Нет вариантов"
|
||||||
<div className="flex flex-col gap-2">
|
/>
|
||||||
<Label>Локация</Label>
|
</FormFieldSimple>
|
||||||
<SelectField
|
<FormFieldSimple label="Локация" htmlFor="node-location">
|
||||||
value={form.watch('locationId') || null}
|
<AutoCompleteInput
|
||||||
disabled={!countryCode}
|
id="node-location"
|
||||||
onValueChange={(v) => {
|
placeholder="Любая"
|
||||||
const id = v ?? ''
|
value={locationQuery}
|
||||||
form.setValue('locationId', id)
|
onChange={(v) => {
|
||||||
const loc = locations.find((l) => l.id === id)
|
setLocationQuery(v)
|
||||||
if (loc?.country) setCountryCode(loc.country)
|
const id = locationIdFromDisplay(v)
|
||||||
void refreshPreview()
|
form.setValue('locationId', id)
|
||||||
}}
|
const loc = locations.find((l) => l.id === id)
|
||||||
placeholder={countryCode ? 'Локация' : 'Сначала страна'}
|
if (loc?.country) setCountryName(countryNameFromCode(loc.country))
|
||||||
options={locationOptions}
|
if (id) void refreshPreview({ locationId: id })
|
||||||
/>
|
else {
|
||||||
</div>
|
setPreviewHost('')
|
||||||
</div>
|
setPreviewRecords([])
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
options={locationOptions}
|
||||||
|
searchPlaceholder="Поиск локации…"
|
||||||
|
emptyText={countryCode ? 'Нет вариантов' : 'Сначала выберите страну'}
|
||||||
|
showLeadingInInput={false}
|
||||||
|
disabled={!countryCode}
|
||||||
|
/>
|
||||||
|
</FormFieldSimple>
|
||||||
|
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-2 gap-3">
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
@@ -469,8 +562,9 @@ function NodesPage() {
|
|||||||
<SelectField
|
<SelectField
|
||||||
value={form.watch('role')}
|
value={form.watch('role')}
|
||||||
onValueChange={(v) => {
|
onValueChange={(v) => {
|
||||||
form.setValue('role', (v as NodeRole) ?? 'gw')
|
const role = (v as NodeRole) ?? 'gw'
|
||||||
void refreshPreview()
|
form.setValue('role', role)
|
||||||
|
void refreshPreview({ role })
|
||||||
}}
|
}}
|
||||||
options={ROLES.map((r) => ({ value: r.value, label: r.label }))}
|
options={ROLES.map((r) => ({ value: r.value, label: r.label }))}
|
||||||
/>
|
/>
|
||||||
@@ -481,27 +575,17 @@ function NodesPage() {
|
|||||||
type="number"
|
type="number"
|
||||||
min={1}
|
min={1}
|
||||||
max={99}
|
max={99}
|
||||||
{...form.register('indexNum', { valueAsNumber: true })}
|
{...form.register('indexNum', {
|
||||||
onBlur={() => void refreshPreview()}
|
valueAsNumber: true,
|
||||||
|
onChange: (e) => {
|
||||||
|
const n = Number(e.target.value) || 1
|
||||||
|
void refreshPreview({ indexNum: n })
|
||||||
|
},
|
||||||
|
})}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="bg-muted/40 flex items-center gap-2 rounded-lg border px-3 py-2 text-sm">
|
|
||||||
<CloudIcon className="size-4 shrink-0" />
|
|
||||||
<span className="text-muted-foreground">Preview:</span>
|
|
||||||
<code className="font-medium">{preview || '—'}</code>
|
|
||||||
<Button
|
|
||||||
type="button"
|
|
||||||
variant="ghost"
|
|
||||||
size="sm"
|
|
||||||
className="ml-auto"
|
|
||||||
onClick={() => void refreshPreview()}
|
|
||||||
>
|
|
||||||
<RefreshCwIcon className="size-3.5" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
<Label>IPv4</Label>
|
<Label>IPv4</Label>
|
||||||
<Input {...form.register('ipv4')} placeholder="198.51.100.10" />
|
<Input {...form.register('ipv4')} placeholder="198.51.100.10" />
|
||||||
@@ -518,6 +602,48 @@ function NodesPage() {
|
|||||||
<Label>Заметки</Label>
|
<Label>Заметки</Label>
|
||||||
<Input {...form.register('notes')} />
|
<Input {...form.register('notes')} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="bg-muted/40 flex flex-col gap-2 rounded-lg border px-3 py-2 text-sm">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<CloudIcon className="size-4 shrink-0" />
|
||||||
|
<span className="text-muted-foreground">Preview FQDN:</span>
|
||||||
|
<code className="font-medium">{previewHost || '—'}</code>
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="ml-auto"
|
||||||
|
onClick={() => void refreshPreview()}
|
||||||
|
>
|
||||||
|
<RefreshCwIcon className="size-3.5" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
{previewRecords.length > 0 ? (
|
||||||
|
<ul className="flex flex-col gap-1 font-mono text-xs tabular-nums">
|
||||||
|
{previewRecords.map((r) => (
|
||||||
|
<li
|
||||||
|
key={`${r.type}:${r.name}:${r.content}`}
|
||||||
|
className="text-muted-foreground flex flex-wrap items-baseline gap-x-2"
|
||||||
|
>
|
||||||
|
<span className="text-foreground w-12 shrink-0 font-semibold">
|
||||||
|
{r.type}
|
||||||
|
</span>
|
||||||
|
<span className="min-w-0 break-all">
|
||||||
|
{r.name} → {r.content}
|
||||||
|
</span>
|
||||||
|
{r.note ? (
|
||||||
|
<span className="opacity-70">({r.note})</span>
|
||||||
|
) : null}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
) : previewHost ? (
|
||||||
|
<p className="text-muted-foreground text-xs">
|
||||||
|
Укажите IPv4/IPv6 — появятся A/AAAA. При редактировании — CNAME
|
||||||
|
алиасов на эту ноду.
|
||||||
|
</p>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</FormSheet>
|
</FormSheet>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user