ayurishchevandClaude Sonnet 5
0838abc4a2
Both pages rendered their full lists with no way to narrow them. Adds a ?q=&status= filter (substring match on address, exact match on result status) applied dashboard-side, in Go, over the already-fetched list — no control-api/db changes needed. Overview: the filter form lives outside the polling target (#overview-live) so the recurring poll never wipes out what's typed/selected; the poll and both filter inputs share hx-sync="#overview-live:queue last" (the same fix that resolved the earlier abandoned /ips auto-refresh races) and the poll now carries hx-include="#overview-filter" so it keeps honoring the current filter on every tick. Applies uniformly to both the "Текущая проверка" and "Последние N завершённых" tables, per the confirmed design: picking a specific status naturally hides in-progress rows, since they have no result yet. Registry: no polling exists there, so the filter form reuses the full page via hx-select/hx-replace-url — simpler than adding a parallel fragment endpoint, and gives a bookmarkable/shareable filtered URL. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
90 lines
4.0 KiB
HTML
90 lines
4.0 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>
|
|
|
|
<form id="registry-filter" class="panel" onsubmit="return false" style="margin-bottom:16px">
|
|
<div class="panel-body field-row">
|
|
<div class="field" style="flex:1 1 260px">
|
|
<label for="registry-q">Поиск по IP</label>
|
|
<input type="search" id="registry-q" name="q" value="{{.Query}}" placeholder="203.0.113.10"
|
|
hx-get="/registry" hx-select="#registry-table-wrap" hx-target="#registry-table-wrap" hx-swap="outerHTML"
|
|
hx-include="#registry-filter" hx-trigger="input changed delay:300ms"
|
|
hx-replace-url="true" hx-sync="#registry-table-wrap:queue last">
|
|
</div>
|
|
<div class="field">
|
|
<label for="registry-status">Статус</label>
|
|
<select id="registry-status" name="status"
|
|
hx-get="/registry" hx-select="#registry-table-wrap" hx-target="#registry-table-wrap" hx-swap="outerHTML"
|
|
hx-include="#registry-filter" hx-trigger="change"
|
|
hx-replace-url="true" hx-sync="#registry-table-wrap:queue last">
|
|
<option value="">Все</option>
|
|
<option value="pass" {{if eq .StatusFilter "pass"}}selected{{end}}>pass</option>
|
|
<option value="partial" {{if eq .StatusFilter "partial"}}selected{{end}}>partial</option>
|
|
<option value="fail" {{if eq .StatusFilter "fail"}}selected{{end}}>fail</option>
|
|
<option value="cancelled" {{if eq .StatusFilter "cancelled"}}selected{{end}}>cancelled</option>
|
|
</select>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
|
|
<div id="registry-table-wrap">
|
|
{{template "registry_table" .}}
|
|
</div>
|
|
{{end}}
|
|
|
|
{{define "registry_table"}}
|
|
{{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 if or .Query .StatusFilter}}<p class="muted">Ничего не найдено по текущему фильтру.</p>
|
|
{{else}}<p class="muted">Реестр пуст — ни один адрес ещё не ставился на проверку.</p>{{end}}
|
|
{{end}}
|