fix(ui): проверять ревизии и сохранять ошибки истории

This commit is contained in:
Denozordec committed 2026-09-29 19:04:00 +07:00
1 parent 46d62c98b8
commit 4a8d696e4e
11 files changed
+183 -98

No files matched your search

+17 -8
View File
@@ -56,7 +56,7 @@ import { ServerRailLayout, ServerRailMobileButton } from "@/components/server-ra
import { ALL_SERVERS_ID, type ServerTileItem } from "@/components/server-tile-rail"
import { toast } from "sonner"
import { ConfigHistorySheet } from "@/components/config-history-sheet"
import type { ConfigRevisionDto } from "@/lib/config-revisions"
import { parseConfigRevisions, type ConfigRevisionDto } from "@/lib/config-revisions"
// ─── Types ────────────────────────────────────────────────────────────────────
@@ -1952,6 +1952,8 @@ function FirewallPageInner() {
const [historyOpen, setHistoryOpen] = useState(false)
const [revisions, setRevisions] = useState<ConfigRevisionDto[]>([])
const [historyLoading, setHistoryLoading] = useState(false)
const [historyError, setHistoryError] = useState<string | null>(null)
const historyEpoch = useRef(0)
const [historyRestoring, setHistoryRestoring] = useState(false)
const loadLive = useCallback(async () => {
@@ -1978,19 +1980,24 @@ function FirewallPageInner() {
const historyServerId = selectedServerId === ALL_SERVERS_ID ? null : selectedServerId
useEffect(() => () => { historyEpoch.current += 1 }, [historyServerId, backendUrl, isLive])
const loadRevisions = useCallback(async () => {
if (!isLive || !historyServerId) return
const epoch = ++historyEpoch.current
setHistoryLoading(true)
setHistoryError(null)
try {
const res = await apiFetch<{ revisions: ConfigRevisionDto[] }>(
const res = await apiFetch<unknown>(
`/api/firewall/revisions?serverId=${encodeURIComponent(historyServerId)}`,
)
setRevisions(res.revisions)
} catch (err) {
toast.error("Не удалось загрузить историю", { description: String(err) })
setRevisions([])
if (epoch !== historyEpoch.current) return
setRevisions(parseConfigRevisions(res, historyServerId, "firewall"))
} catch (error) {
if (epoch !== historyEpoch.current) return
setHistoryError(error instanceof Error ? error.message : "Не удалось загрузить историю")
} finally {
setHistoryLoading(false)
if (epoch === historyEpoch.current) setHistoryLoading(false)
}
}, [isLive, historyServerId, apiFetch])
@@ -2645,7 +2652,9 @@ function FirewallPageInner() {
<ConfigHistorySheet
open={historyOpen}
onOpenChange={setHistoryOpen}
onOpenChange={v => { if (!v) historyEpoch.current += 1; setHistoryOpen(v) }}
loadError={historyError}
onRetry={() => { void loadRevisions() }}
title="История Firewall"
itemLabel="объектов"
revisions={revisions}