ayurishchevandClaude Sonnet 5
db97b83cd6
fillRegistrySummary derived LastResult from whichever single checks row happened to have the latest checked_at, not the cycle's actual aggregated result — a cycle with a mix of passing and failing checks (e.g. one egress target timed out while the rest, including the chronologically-last check, succeeded) rendered as a green "pass" badge on /registry, disagreeing with the correct "partial" badge already shown on /ips for the same address. Now prefers ip_queue.overall_result (the orchestrator's own aggregation) when a live queue row has a finished cycle, leaves the badge blank while a cycle is still in progress, and only falls back to classifying the most recent cycle's own checks (pass/fail/partial) once the address has been deleted from the queue and overall_result is no longer available. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
58 lines
2.5 KiB
HTML
58 lines
2.5 KiB
HTML
{{define "registry_page"}}
|
|
<!doctype html>
|
|
<html lang="ru">
|
|
<head>{{template "html_head" .}}</head>
|
|
<body>
|
|
<div class="bg-grid"></div>
|
|
<input type="checkbox" id="nav-toggle" class="nav-toggle">
|
|
<div class="shell">
|
|
{{template "sidebar_nav" .}}
|
|
<div>
|
|
{{template "topbar_mobile" .}}
|
|
<main class="main">
|
|
<div id="error-banner">{{template "banner_inner" .Banner}}</div>
|
|
{{template "registry_content" .}}
|
|
</main>
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|
|
{{end}}
|
|
|
|
{{define "registry_content"}}
|
|
<div class="topbar"><h1>Реестр IP</h1></div>
|
|
<p class="muted" style="margin-bottom:16px">Все адреса, когда-либо поставленные на проверку — накопленная статистика
|
|
сохраняется здесь даже после удаления адреса из <a href="/ips">очереди</a> и не теряется при повторном добавлении.
|
|
Глубина хранимой истории на адрес настраивается на <a href="/settings">странице настроек</a>.</p>
|
|
|
|
{{if .Items}}
|
|
<div class="panel">
|
|
<div class="table-scroll">
|
|
<table>
|
|
<thead><tr><th>Адрес</th><th>Впервые замечен</th><th>Последний раз замечен</th><th>Циклов</th><th>Последний результат</th><th>Сейчас в очереди</th></tr></thead>
|
|
<tbody>
|
|
{{range .Items}}
|
|
<tr>
|
|
<td class="addr" data-label="Адрес"><a href="/registry/{{.IPAddress}}">{{.IPAddress}}</a></td>
|
|
<td data-label="Впервые замечен">{{fmtTime .FirstSeenAt}}</td>
|
|
<td data-label="Последний раз замечен">{{fmtTime .LastSeenAt}}</td>
|
|
<td class="num" data-label="Циклов">{{.TotalCycles}}</td>
|
|
<td data-label="Последний результат">
|
|
{{if eq .LastResult "pass"}}<span class="pill pill-success">pass</span>
|
|
{{else if eq .LastResult "partial"}}<span class="pill pill-warning">partial</span>
|
|
{{else if eq .LastResult "fail"}}<span class="pill pill-danger">fail</span>
|
|
{{else if eq .LastResult "cancelled"}}<span class="pill pill-cancel">cancelled</span>
|
|
{{else}}<span class="pill pill-neutral">—</span>{{end}}
|
|
</td>
|
|
<td data-label="Сейчас в очереди">
|
|
{{if .InQueue}}<span class="pill pill-info">{{.CurrentState}}</span>{{else}}<span class="pill pill-neutral">нет</span>{{end}}
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
{{else}}<p class="muted">Реестр пуст — ни один адрес ещё не ставился на проверку.</p>{{end}}
|
|
{{end}}
|