diff --git a/apps/admin/site/app.js b/apps/admin/site/app.js index 0f2be69..1699548 100644 --- a/apps/admin/site/app.js +++ b/apps/admin/site/app.js @@ -3,19 +3,10 @@ const state = { username: null, view: "dashboard", - bands: { page: 1, pageSize: 50, q: "", location_q: "", country: "", status: "", genre: "", enriched: "", has_lat: "", has_location: "", sort: "ma_id", dir: "asc", total: 0 }, - runs: { page: 1, pageSize: 50, run_type: "", status: "", total: 0 }, - logs: { page: 1, pageSize: 100, level: "", autoRefresh: true }, - audit: { page: 1, pageSize: 50 }, - logsTimer: null, - queueTimer: null, - geoTimer: null, - cmdLogTimer: null, - monitorTimer: null, - monitorLogs: [], - monitorLastId: 0, - monitorPaused: false, - monitorInterval: 5000, + bands: { page: 1, pageSize: 50, q: "", location_q: "", country: "", status: "", genre: "", enriched: "", has_lat: "", has_location: "", has_conflict: "", sort: "ma_id", dir: "asc", total: 0 }, + activity: { page: 1, pageSize: 50, type: "", status: "", total: 0 }, + llm: { page: 1 }, + overviewTimer: null, }; // ------------------------------------------------------------------ @@ -44,11 +35,7 @@ async function api(path, opts = {}) { function showLogin() { document.getElementById("login-screen").classList.remove("hidden"); document.getElementById("app").classList.add("hidden"); - if (state.logsTimer) { clearInterval(state.logsTimer); state.logsTimer = null; } - if (state.queueTimer) { clearInterval(state.queueTimer); state.queueTimer = null; } - if (state.geoTimer) { clearInterval(state.geoTimer); state.geoTimer = null; } - if (state.cmdLogTimer) { clearInterval(state.cmdLogTimer); state.cmdLogTimer = null; } - if (state.monitorTimer) { clearInterval(state.monitorTimer); state.monitorTimer = null; } + if (state.overviewTimer) { clearInterval(state.overviewTimer); state.overviewTimer = null; } } function showApp() { @@ -102,9 +89,9 @@ document.getElementById("logout-btn").addEventListener("click", async () => { }); // ------------------------------------------------------------------ -// Router +// Router — 5 onglets : Vue d'ensemble, Groupes, Activité, Actions, LLM // ------------------------------------------------------------------ -const VIEWS = ["dashboard", "bands", "queue", "runs", "monitor", "logs", "geocoding", "llm", "conflicts", "jobs", "checkpoints", "audit"]; +const VIEWS = ["dashboard", "bands", "activity", "actions", "llm"]; function router() { const hash = (location.hash || "#/dashboard").replace("#/", ""); @@ -113,24 +100,13 @@ function router() { document.querySelectorAll(".nav a").forEach((a) => { a.classList.toggle("active", a.dataset.view === view); }); - if (state.logsTimer) { clearInterval(state.logsTimer); state.logsTimer = null; } - if (state.queueTimer) { clearInterval(state.queueTimer); state.queueTimer = null; } - if (state.geoTimer) { clearInterval(state.geoTimer); state.geoTimer = null; } - if (state.cmdLogTimer) { clearInterval(state.cmdLogTimer); state.cmdLogTimer = null; } - if (state.monitorTimer) { clearInterval(state.monitorTimer); state.monitorTimer = null; } + if (state.overviewTimer) { clearInterval(state.overviewTimer); state.overviewTimer = null; } const renderers = { - dashboard: renderDashboard, + dashboard: renderOverview, bands: renderBands, - conflicts: renderConflicts, - queue: renderQueue, - runs: renderRuns, - monitor: renderMonitor, - logs: renderLogs, - geocoding: renderGeocoding, + activity: renderActivity, + actions: renderActions, llm: renderLLM, - jobs: renderJobs, - checkpoints: renderCheckpoints, - audit: renderAudit, }; renderers[view](); } @@ -146,17 +122,25 @@ function fmtDate(s) { } const content = () => document.getElementById("content"); -// ------------------------------------------------------------------ -// Dashboard -// ------------------------------------------------------------------ +function statCard(label, value, cls = "") { + return `
${esc(label)}
${Number(value).toLocaleString("fr-FR")}
`; +} +function barRow(label, count, max) { + const pct = Math.max(2, Math.round((count / max) * 100)); + return `
${esc(label)}
${count}
`; +} +function emptyRow() { return `
Aucune donnée
`; } +function statusBadge(status) { + const cls = status === "done" ? "ok" : status === "error" ? "err" : status === "running" ? "warn" : "muted"; + return `${esc(status)}`; +} + // Découpe un genre complexe ("Doom/Death Metal; Gothic/Progressive") en mots-clés function splitGenreElements(genreRows) { const counts = new Map(); for (const { genre, total } of genreRows) { if (!genre) continue; - // Retire les parenthèses et leur contenu (ex: "(early)", "(later)") const cleaned = genre.replace(/\([^)]*\)/g, ""); - // Découpe sur / ; , const tokens = cleaned.split(/[\/;,]+/); for (const tok of tokens) { const kw = tok.trim(); @@ -169,7 +153,10 @@ function splitGenreElements(genreRows) { .sort((a, b) => b.n - a.n); } -async function renderDashboard() { +// ------------------------------------------------------------------ +// Vue d'ensemble — stats bands + genre/pays + live (crawl/jobs/géocodage) +// ------------------------------------------------------------------ +async function renderOverview() { content().innerHTML = `
Chargement…
`; try { const r = await api("/admin/api/stats"); @@ -186,10 +173,21 @@ async function renderDashboard() { ${statCard("Non enrichis", t.not_enriched, "warn")} ${statCard("Géocodés", t.geocoded, "ok")} ${statCard("Sans localisation", t.not_geocoded, "warn")} - ${statCard("Jamais crawlés (nouveau système)", t.total - t.crawled_by_current_system, "warn")} ${statCard("Jamais enrichis (band_page absent)", t.never_enriched, "err")} ${statCard("Stale (>30j)", t.stale, "warn")} + +
+
En direct
+ Auto-refresh 15s +
+
+
…
+
…
+
…
+
…
+
+

Par statut

@@ -208,98 +206,131 @@ async function renderDashboard() { `; } catch (e) { content().innerHTML = `
Erreur : ${esc(e.message)}
`; + return; } + + await loadOverviewLive(); + if (state.overviewTimer) clearInterval(state.overviewTimer); + state.overviewTimer = setInterval(loadOverviewLive, 15000); } -function statCard(label, value, cls = "") { - return `
${esc(label)}
${Number(value).toLocaleString("fr-FR")}
`; -} -function barRow(label, count, max) { - const pct = Math.max(2, Math.round((count / max) * 100)); - return `
${esc(label)}
${count}
`; -} -function emptyRow() { return `
Aucune donnée
`; } +async function loadOverviewLive() { + const el = document.getElementById("ov-live"); + if (!el) return; + try { + const [live, geo, queue] = await Promise.all([ + api("/admin/api/live"), + api("/admin/api/geocoding"), + api("/admin/api/queue"), + ]); -// ------------------------------------------------------------------ -// Queue -// ------------------------------------------------------------------ -async function renderQueue() { - if (!document.getElementById("q-body")) { - content().innerHTML = ` -
-
-
-

Derniers runs d'enrichissement

-
- Auto-refresh 15s - -
-
-
- - -
IDStatutDébutFinVusEnrichisProgressionErreur
+ // --- Crawl en cours --- + const runsHtml = live.active_runs.length + ? live.active_runs.map(r => { + const elapsed = Math.round((Date.now() - new Date(r.started_at)) / 60000); + return `
+
+ ▶ ${esc(r.run_type)} +
+ ${elapsed}min · ${r.bands_seen} vus · ${r.bands_new} nouveaux · ${r.bands_enriched} enrichis +
+ ${r.error ? `
${esc(r.error)}
` : ""} +
+ +
`; + }).join("") + : `
Aucun run actif
`; + + // --- Géocodage (band_locations) --- + const locs = geo.locations || []; + const locTotal = locs.reduce((s, x) => s + x.n, 0); + const locDone = (locs.find(x => x.status === "done")?.n || 0) + (locs.find(x => x.status === "country_only")?.n || 0); + const locLlm = locs.find(x => x.status === "llm_needed")?.n || 0; + const locManual = locs.find(x => x.status === "manual")?.n || 0; + const locErr = locs.find(x => x.status === "error")?.n || 0; + const locPct = locTotal ? Math.round((locDone / locTotal) * 100) : 0; + const provTxt = (geo.providers || []).map(p => `${esc(p.provider)}: ${p.n.toLocaleString("fr-FR")}${p.avg_conf != null ? ` (conf~${p.avg_conf})` : ""}`).join(" · "); + const geoHtml = ` +
+
+
+
${locPct}% — ${locDone.toLocaleString("fr-FR")} / ${locTotal.toLocaleString("fr-FR")}
+
+ ${locLlm ? `⚡ ${locLlm} LLM needed` : ""} + ${locManual ? `${locManual} manuel` : ""} + ${locErr ? `✗ ${locErr} erreurs` : ""} +
+
${provTxt || "—"}
+ `; + + // --- Jobs en attente --- + const jobsHtml = live.pending_jobs.length + ? live.pending_jobs.map(j => { + const age = Math.round((Date.now() - new Date(j.created_at)) / 60000); + return `
+
+ ${esc(j.job_type)} +
par ${esc(j.requested_by || "?")} · ${age}min
+
+ +
`; + }).join("") + : `
Aucun job en attente
`; + + const b = queue.breakdown; + const queueHtml = ` +
+ ${b.new_bands} nouveaux (priorité 1) + ${b.modified_since_enrich} modifiés depuis enrich (p.2) + ${b.legacy_pending} legacy à ré-enrichir (p.3) + ${b.stale} stale >30j (p.4)
`; - document.getElementById("q-cleanup-btn").addEventListener("click", async () => { - const btn = document.getElementById("q-cleanup-btn"); - btn.disabled = true; - try { - const r = await api("/admin/api/crawl-runs/cleanup", { method: "POST", body: JSON.stringify({ older_than_minutes: 30 }) }); - alert(`${r.cleaned} run(s) annulé(s).`); - await loadQueue(); - } catch (e) { - alert(`Erreur: ${e.message}`); - } finally { btn.disabled = false; } - }); - } - await loadQueue(); - if (state.queueTimer) clearInterval(state.queueTimer); - state.queueTimer = setInterval(loadQueue, 15000); -} -async function loadQueue() { - try { - const r = await api("/admin/api/queue"); - const b = r.breakdown; - const statsEl = document.getElementById("q-stats"); - if (statsEl) statsEl.innerHTML = ` - ${statCard("Nouveaux (priorité 1)", b.new_bands, "err")} - ${statCard("Modifiés depuis enrich (p.2)", b.modified_since_enrich, "warn")} - ${statCard("Legacy à ré-enrichir (p.3)", b.legacy_pending, "warn")} - ${statCard("Stale >30j (p.4)", b.stale, "ok")} + el.innerHTML = ` +
+

Crawl en cours (${live.active_runs.length})

+ ${runsHtml} +
+
+

Géocodage

+ ${geoHtml} +
+
+

Jobs en attente (${live.pending_jobs.length})

+ ${jobsHtml} +
+
+

File d'enrichissement

+ ${queueHtml} +
`; - const tbody = document.getElementById("q-body"); - if (tbody) tbody.innerHTML = r.recent_enrich_runs.map((x) => { - const isRunning = x.status === "running"; - const elapsed = isRunning ? Math.round((Date.now() - new Date(x.started_at)) / 60000) : null; - const prog = isRunning && x.bands_seen > 0 - ? `${x.bands_seen} vus, ${x.bands_enriched} enrichis${elapsed ? `, ${elapsed}min` : ""}` - : isRunning ? `en attente… (${elapsed}min)` : "—"; - return ` - ${x.id} - ${statusBadge(x.status)} - ${fmtDate(x.started_at)} - ${fmtDate(x.finished_at)} - ${x.bands_seen} - ${x.bands_enriched} - ${prog} - ${esc(x.error || "")} - `; - }).join("") || `Aucun run`; + const ts = document.getElementById("ov-live-ts"); + if (ts) ts.textContent = `Actualisé à ${new Date().toLocaleTimeString("fr-FR")}`; } catch (e) { - const tbody = document.getElementById("q-body"); - if (tbody) tbody.innerHTML = `Erreur : ${esc(e.message)}`; + const ts = document.getElementById("ov-live-ts"); + if (ts) ts.textContent = `Erreur : ${e.message}`; } } -function statusBadge(status) { - const cls = status === "done" ? "ok" : status === "error" ? "err" : status === "running" ? "warn" : "muted"; - return `${esc(status)}`; +async function adminCancelRun(id) { + if (!confirm(`Annuler le run #${id} ?`)) return; + try { + await api(`/admin/api/crawl-runs/${id}/cancel`, { method: "POST", body: "{}" }); + await loadOverviewLive(); + } catch (e) { alert(`Erreur : ${e.message}`); } +} + +async function adminCancelJob(id) { + if (!confirm(`Annuler le job trigger #${id} ?`)) return; + try { + await api(`/admin/api/job-triggers/${id}/cancel`, { method: "POST", body: "{}" }); + await loadOverviewLive(); + } catch (e) { alert(`Erreur : ${e.message}`); } } // ------------------------------------------------------------------ -// Bands +// Groupes (Bands + Conflits fondus) // ------------------------------------------------------------------ async function renderBands() { const s = state.bands; @@ -326,6 +357,9 @@ async function renderBands() { +
Chargement…
@@ -341,6 +375,7 @@ async function renderBands() { s.themes_q = document.getElementById("b-themes_q").value.trim(); s.has_lat = document.getElementById("b-has_lat").value; s.has_location = document.getElementById("b-has_location").value; + s.has_conflict = document.getElementById("b-has_conflict").checked ? "true" : ""; s.page = 1; loadBands(); }); @@ -375,6 +410,7 @@ async function loadBands() { if (s.themes_q) params.set("themes_q", s.themes_q); if (s.has_lat) params.set("has_lat", s.has_lat); if (s.has_location) params.set("has_location", s.has_location); + if (s.has_conflict) params.set("has_conflict", s.has_conflict); try { const r = await api(`/admin/api/bands?${params}`); @@ -429,6 +465,24 @@ async function loadBands() { } } +// Lignes de conflit champ-par-champ (crawler_pending vs valeur actuelle), +// réutilisées par le modal band. +function conflictRowsHtml(band) { + const pending = band.crawler_pending || {}; + return Object.entries(pending).map(([field, crawlerVal]) => { + const myVal = band[field] ?? "—"; + return ` + ${esc(field)} + ${esc(String(myVal))} + ${esc(String(crawlerVal))} + + + + + `; + }).join(""); +} + async function openBandModal(maId) { let band, locations = [], llmCalls = []; try { @@ -450,6 +504,19 @@ async function openBandModal(maId) { })(); const srcRow = (label, val) => `
${esc(label)}${val}
`; + const conflictRows = conflictRowsHtml(band); + const conflictHtml = conflictRows ? ` +
+ ⚠️ Conflits en attente +

+ Champs verrouillés manuellement pour lesquels le crawler a trouvé une valeur différente. +

+
+ + ${conflictRows} +
ChampMa valeur (verrouillée)Valeur Metal ArchivesAction
+
` : ""; + const locRowsHtml = locations.length ? locations.map(l => { const coords = (l.lat != null && l.lon != null) ? `${Number(l.lat).toFixed(3)}, ${Number(l.lon).toFixed(3)}` : "—"; const conf = l.geocode_confidence != null ? Number(l.geocode_confidence).toFixed(2) : "—"; @@ -529,6 +596,7 @@ async function openBandModal(maId) { + ${conflictHtml} ${provenanceHtml}
@@ -542,6 +610,25 @@ async function openBandModal(maId) { backdrop.querySelector(".modal-close").addEventListener("click", close); backdrop.addEventListener("click", (e) => { if (e.target === backdrop) close(); }); backdrop.querySelector("#m-cancel").addEventListener("click", close); + + const conflictBody = backdrop.querySelector("#m-conflict-body"); + if (conflictBody) { + conflictBody.addEventListener("click", async (e) => { + const btn = e.target.closest("[data-conflict-action]"); + if (!btn) return; + const { conflictAction, field } = btn.dataset; + btn.disabled = true; + try { + await api(`/admin/api/bands/${maId}/resolve-conflict`, { + method: "POST", + body: JSON.stringify({ field, action: conflictAction }), + }); + close(); + openBandModal(maId); + } catch (err) { alert(err.message); btn.disabled = false; } + }); + } + backdrop.querySelector("#m-save").addEventListener("click", async () => { const errEl = backdrop.querySelector("#m-error"); errEl.textContent = ""; @@ -567,603 +654,315 @@ async function openBandModal(maId) { } // ------------------------------------------------------------------ -// Crawl runs +// Activité — liste unifiée (crawl_run + admin_audit_log), cliquable → détail + logs // ------------------------------------------------------------------ -async function renderRuns() { - const s = state.runs; +async function renderActivity() { + const s = state.activity; content().innerHTML = `
- - - - - + + - - + + Auto-refresh 15s
-
Chargement…
-
+
Chargement…
+
`; - document.getElementById("r-apply").addEventListener("click", () => { - s.run_type = document.getElementById("r-type").value; - s.status = document.getElementById("r-status").value; + document.getElementById("a-apply").addEventListener("click", () => { + s.type = document.getElementById("a-type").value; + s.status = document.getElementById("a-status").value; s.page = 1; - loadRuns(); + loadActivity(); }); - await loadRuns(); + await loadActivity(); + if (state.overviewTimer) clearInterval(state.overviewTimer); + state.overviewTimer = setInterval(async () => { + await loadActivity(); + const el = document.getElementById("a-refresh-status"); + if (el) el.textContent = `Actualisé ${new Date().toLocaleTimeString("fr-FR")}`; + }, 15000); } -async function loadRuns() { - const s = state.runs; +function activitySummary(row) { + const sum = row.summary || {}; + if (row.type === "run") { + const parts = []; + if (sum.bands_seen != null) parts.push(`${sum.bands_seen} vus`); + if (sum.bands_new) parts.push(`${sum.bands_new} nouveaux`); + if (sum.bands_updated) parts.push(`${sum.bands_updated} MAJ`); + if (sum.bands_enriched) parts.push(`${sum.bands_enriched} enrichis`); + if (sum.error) parts.push(`erreur: ${sum.error}`); + return parts.join(" · ") || "—"; + } + return `${esc(sum.target_table || "")} #${sum.target_id ?? ""}`; +} + +async function loadActivity() { + const s = state.activity; const params = new URLSearchParams({ page: s.page, pageSize: s.pageSize }); - if (s.run_type) params.set("run_type", s.run_type); + if (s.type) params.set("type", s.type); if (s.status) params.set("status", s.status); try { - const r = await api(`/admin/api/crawl-runs?${params}`); + const r = await api(`/admin/api/activity?${params}`); s.total = r.total; - document.getElementById("r-table").innerHTML = ` + document.getElementById("a-table").innerHTML = ` - + ${r.items.map((x) => ` - - - - + + + + - - - - - - - + + - `).join("") || ``} + `).join("") || ``}
IDTypePaysStatutDébutFinVusNouveauxMAJEnrichisErreur
DateTypeSous-typeStatutActeurRésumé
${x.id}${esc(x.run_type)}${esc((x.countries || []).join(", "))}
${fmtDate(x.ts)}${x.type === "run" ? "Run" : "Admin"}${esc(x.subtype)} ${statusBadge(x.status)}${fmtDate(x.started_at)}${fmtDate(x.finished_at)}${x.bands_seen}${x.bands_new}${x.bands_updated}${x.bands_enriched}${esc(x.error || "")}${esc(x.actor || "—")}${activitySummary(x)}
Aucun run
Aucune activité
`; - const totalPages = Math.max(1, Math.ceil(s.total / s.pageSize)); - document.getElementById("r-pager").innerHTML = ` - - Page ${s.page} / ${totalPages} (${s.total} runs) - - `; - document.getElementById("r-prev")?.addEventListener("click", () => { s.page--; loadRuns(); }); - document.getElementById("r-next")?.addEventListener("click", () => { s.page++; loadRuns(); }); - } catch (e) { - document.getElementById("r-table").innerHTML = `
Erreur : ${esc(e.message)}
`; - } -} - -// ------------------------------------------------------------------ -// Live Monitor -// ------------------------------------------------------------------ -async function renderMonitor() { - state.monitorLogs = []; - state.monitorLastId = 0; - state.monitorPaused = false; - - content().innerHTML = ` -
-
- - Connexion… -
-
- - - -
-
- -
-
…
-
…
-
…
-
- -
-
-

Journal en direct

- - - -
-
-
- `; - - document.getElementById("mon-pause-btn").addEventListener("click", () => { - state.monitorPaused = !state.monitorPaused; - const btn = document.getElementById("mon-pause-btn"); - btn.textContent = state.monitorPaused ? "▶ Reprendre" : "⏸ Pause"; - btn.style.borderColor = state.monitorPaused ? "rgba(198,26,26,0.5)" : ""; - }); - - document.getElementById("mon-clear-btn").addEventListener("click", () => { - state.monitorLogs = []; - state.monitorLastId = 0; - renderMonitorStream(); - }); - - document.getElementById("mon-level").addEventListener("input", renderMonitorStream); - document.getElementById("mon-search").addEventListener("input", renderMonitorStream); - - document.getElementById("mon-interval").addEventListener("change", (e) => { - state.monitorInterval = Number(e.target.value) || 5000; - if (state.monitorTimer) clearInterval(state.monitorTimer); - state.monitorTimer = setInterval(tickMonitor, state.monitorInterval); - }); - - await tickMonitor(); - state.monitorTimer = setInterval(tickMonitor, state.monitorInterval); -} - -async function tickMonitor() { - if (state.monitorPaused) return; - const dot = document.getElementById("mon-dot"); - const tsEl = document.getElementById("mon-ts"); - try { - const [live, logs] = await Promise.all([ - api("/admin/api/live"), - api(`/admin/api/logs?pageSize=100${state.monitorLastId ? `&min_id=${state.monitorLastId}` : ""}`), - ]); - - renderMonitorStatus(live); - - if (logs.items.length) { - const maxId = Math.max(...logs.items.map(x => x.id)); - if (maxId > state.monitorLastId) state.monitorLastId = maxId; - state.monitorLogs = [...logs.items, ...state.monitorLogs].slice(0, 500); - renderMonitorStream(logs.items.length); - } else if (!state.monitorLogs.length) { - renderMonitorStream(0); - } - - if (dot) { dot.style.background = "var(--ok)"; dot.classList.add("live"); } - if (tsEl) tsEl.textContent = `Actualisé à ${new Date().toLocaleTimeString("fr-FR")}`; - } catch (e) { - if (dot) { dot.style.background = "var(--err)"; dot.classList.remove("live"); } - if (tsEl) tsEl.textContent = `Erreur : ${e.message}`; - } -} - -function renderMonitorStatus(live) { - const el = document.getElementById("mon-status"); - if (!el) return; - - // --- Crawl runs --- - const runsHtml = live.active_runs.length - ? live.active_runs.map(r => { - const elapsed = Math.round((Date.now() - new Date(r.started_at)) / 60000); - return `
-
- ▶ ${esc(r.run_type)} -
- ${elapsed}min · ${r.bands_seen} vus · ${r.bands_new} nouveaux · ${r.bands_enriched} enrichis -
- ${r.error ? `
${esc(r.error)}
` : ""} -
- -
`; - }).join("") - : `
Aucun run actif
`; - - // --- Géocodeur --- - const gTotal = live.geo_queue.reduce((s, x) => s + x.n, 0); - const gDone = live.geo_queue.find(x => x.status === "done")?.n || 0; - const gQ = live.geo_queue.find(x => x.status === "queued")?.n || 0; - const gErr = live.geo_queue.find(x => x.status === "error")?.n || 0; - const gProc = live.geo_queue.find(x => x.status === "processing")?.n || 0; - const gPct = gTotal ? Math.round((gDone / gTotal) * 100) : 0; - const geoHtml = ` -
-
-
-
${gPct}% — ${gDone.toLocaleString("fr-FR")} / ${gTotal.toLocaleString("fr-FR")}
-
- ${gQ} en attente - ${gProc ? `⚡ ${gProc} en cours` : ""} - ${gErr ? `✗ ${gErr} erreurs` : ""} -
- ${live.geo_processing.map(p => ` -
- ⚡ ${esc(p.name)} (${esc(p.country || "?")}) - ${p.tries > 1 ? `essai ${p.tries}` : ""} -
`).join("")} - `; - - // --- Jobs en attente --- - const jobsHtml = live.pending_jobs.length - ? live.pending_jobs.map(j => { - const age = Math.round((Date.now() - new Date(j.created_at)) / 60000); - return `
-
- ${esc(j.job_type)} -
par ${esc(j.requested_by || "?")} · ${age}min
-
- -
`; - }).join("") - : `
Aucun job en attente
`; - - el.innerHTML = ` -
-

Crawl en cours - (${live.active_runs.length}) -

- ${runsHtml} -
-
-

Géocodeur

- ${geoHtml} -
-
-

Jobs en attente - (${live.pending_jobs.length}) -

- ${jobsHtml} -
- `; -} - -function renderMonitorStream(newCount = 0) { - const stream = document.getElementById("mon-stream"); - if (!stream) return; - const level = document.getElementById("mon-level")?.value || ""; - const search = (document.getElementById("mon-search")?.value || "").toLowerCase(); - - const filtered = state.monitorLogs.filter(x => { - if (level && x.level !== level) return false; - if (search && !x.message.toLowerCase().includes(search)) return false; - return true; - }); - - const countEl = document.getElementById("mon-count"); - if (countEl) { - countEl.textContent = `${filtered.length} entrée${filtered.length !== 1 ? "s" : ""}${state.monitorLogs.length !== filtered.length ? ` / ${state.monitorLogs.length} total` : ""}`; - } - - const wasAtTop = stream.scrollTop < 40; - stream.innerHTML = filtered.map((x, i) => { - const lvlCls = x.level === "error" ? "err" : x.level === "warning" ? "warn" : "muted"; - return `
- ${fmtDate(x.created_at)} - ${esc(x.level)} - ${esc(x.message)}${x.ma_id ? ` #${x.ma_id}` : ""} -
`; - }).join("") || `
Aucun log${level || search ? " (filtres actifs)" : ""}
`; - - if (wasAtTop || newCount > 0) stream.scrollTop = 0; -} - -async function adminCancelRun(id) { - if (!confirm(`Annuler le run #${id} ?`)) return; - try { - await api(`/admin/api/crawl-runs/${id}/cancel`, { method: "POST", body: "{}" }); - await tickMonitor(); - } catch (e) { alert(`Erreur : ${e.message}`); } -} - -async function adminCancelJob(id) { - if (!confirm(`Annuler le job trigger #${id} ?`)) return; - try { - await api(`/admin/api/job-triggers/${id}/cancel`, { method: "POST", body: "{}" }); - await tickMonitor(); - } catch (e) { alert(`Erreur : ${e.message}`); } -} - -// ------------------------------------------------------------------ -// Logs (historique) -// ------------------------------------------------------------------ -async function renderLogs() { - const s = state.logs; - content().innerHTML = ` -
- - - -
-
Chargement…
- `; - document.getElementById("l-apply").addEventListener("click", () => { - s.level = document.getElementById("l-level").value; - loadLogs(); - }); - document.getElementById("l-auto").addEventListener("change", (e) => { - s.autoRefresh = e.target.checked; - setupLogsTimer(); - }); - await loadLogs(); - setupLogsTimer(); -} - -function setupLogsTimer() { - if (state.logsTimer) { clearInterval(state.logsTimer); state.logsTimer = null; } - if (state.logs.autoRefresh) { - state.logsTimer = setInterval(loadLogs, 10000); - } -} - -async function loadLogs() { - const s = state.logs; - const params = new URLSearchParams({ page: 1, pageSize: s.pageSize }); - if (s.level) params.set("level", s.level); - try { - const r = await api(`/admin/api/logs?${params}`); - document.getElementById("l-list").innerHTML = r.items.map((x) => ` -
- ${fmtDate(x.created_at)} - ${esc(x.level)} - ${esc(x.message)}${x.ma_id ? ` (ma_id=${x.ma_id})` : ""} -
- `).join("") || `
Aucun log
`; - } catch (e) { - document.getElementById("l-list").innerHTML = `
Erreur : ${esc(e.message)}
`; - } -} - -// ------------------------------------------------------------------ -// Conflits (champs verrouillés ≠ valeur crawler) -// ------------------------------------------------------------------ -async function renderConflicts() { - content().innerHTML = `
Chargement…
`; - try { - const r = await api("/admin/api/conflicts?page=1&pageSize=100"); - if (!r.items.length) { - content().innerHTML = `
Aucun conflit — toutes les éditions manuelles sont cohérentes avec les données Metal Archives.
`; - return; - } - content().innerHTML = ` -

- Ces bands ont des champs édités manuellement (🔒) pour lesquels le crawler a trouvé une valeur différente. - Choisissez champ par champ ce que vous voulez conserver. -

-
${r.items.map(conflictCard).join("")}
- `; - document.getElementById("conflict-list").addEventListener("click", async (e) => { - const btn = e.target.closest("[data-action]"); - if (!btn) return; - const { action, maId, field } = btn.dataset; - btn.disabled = true; - try { - await api(`/admin/api/bands/${maId}/resolve-conflict`, { - method: "POST", - body: JSON.stringify({ field, action }), - }); - renderConflicts(); - } catch (err) { alert(err.message); btn.disabled = false; } + document.getElementById("a-table").querySelectorAll("tr[data-id]").forEach((tr) => { + tr.addEventListener("click", () => openActivityModal(tr.dataset.type, Number(tr.dataset.id), r.items.find(x => x.type === tr.dataset.type && x.id === Number(tr.dataset.id)))); }); + + const totalPages = Math.max(1, Math.ceil(s.total / s.pageSize)); + document.getElementById("a-pager").innerHTML = ` + + Page ${s.page} / ${totalPages} (${s.total.toLocaleString("fr-FR")}) + + `; + document.getElementById("a-prev")?.addEventListener("click", () => { s.page--; loadActivity(); }); + document.getElementById("a-next")?.addEventListener("click", () => { s.page++; loadActivity(); }); } catch (e) { - content().innerHTML = `
Erreur : ${esc(e.message)}
`; + document.getElementById("a-table").innerHTML = `
Erreur : ${esc(e.message)}
`; } } -function conflictCard(b) { - const pending = b.crawler_pending || {}; - const locked = b.locked_fields || {}; - const rows = Object.entries(pending).map(([field, crawlerVal]) => { - const myVal = b[field] ?? "—"; - return ` - ${esc(field)} - ${esc(String(myVal))} - ${esc(String(crawlerVal))} - - - - - `; - }).join(""); - return `
-

${esc(b.name)} #${b.ma_id} · ${esc(b.country||"")}

-
- - ${rows} -
ChampMa valeur (verrouillée)Valeur Metal ArchivesAction
-
`; +async function openActivityModal(type, id, row) { + const backdrop = document.createElement("div"); + backdrop.className = "modal-backdrop"; + + let bodyHtml; + if (type === "run") { + const sum = row?.summary || {}; + bodyHtml = ` +
+ ${statusBadge(row?.status)} · démarré ${fmtDate(row?.ts)} · terminé ${fmtDate(row?.finished_at)} + ${sum.countries ? ` · pays: ${esc((sum.countries||[]).join(", "))}` : ""} +
+
${activitySummary(row)}
+ ${row?.status === "running" ? `` : ""} +

Logs

+
Chargement…
+ `; + } else { + const sum = row?.summary || {}; + bodyHtml = ` +
${fmtDate(row?.ts)} · ${esc(row?.actor || "")} · ${esc(row?.subtype || "")}
+
Cible : ${esc(sum.target_table || "")} #${sum.target_id ?? ""}
+
+
+
Avant
+ 
${esc(JSON.stringify(sum.before, null, 2))}
+
+
+
Après
+ 
${esc(JSON.stringify(sum.after, null, 2))}
+
+
+ `; + } + + backdrop.innerHTML = ` +
+ × +

${type === "run" ? `Run #${id} — ${esc(row?.subtype || "")}` : `Action admin #${id}`}

+ ${bodyHtml} +
+ `; + document.body.appendChild(backdrop); + const close = () => backdrop.remove(); + backdrop.querySelector(".modal-close").addEventListener("click", close); + backdrop.addEventListener("click", (e) => { if (e.target === backdrop) close(); }); + + if (type === "run") { + try { + const logs = await api(`/admin/api/logs?run_id=${id}&pageSize=200`); + const logsEl = backdrop.querySelector("#act-logs"); + if (logsEl) logsEl.innerHTML = logs.items.map(x => { + const lvlCls = x.level === "error" ? "err" : x.level === "warning" ? "warn" : "muted"; + return `
+ ${fmtDate(x.created_at)} + ${esc(x.level)} + ${esc(x.message)} +
`; + }).join("") || `
Aucun log pour ce run
`; + } catch (e) { + const logsEl = backdrop.querySelector("#act-logs"); + if (logsEl) logsEl.innerHTML = `
Erreur : ${esc(e.message)}
`; + } + } } // ------------------------------------------------------------------ -// Géocodage +// Actions — toutes les commandes possibles, groupées et vérifiées // ------------------------------------------------------------------ -async function renderGeocoding() { - if (!document.getElementById("loc-stats")) { - content().innerHTML = ` -
-
Pipeline géocodage
- Auto-refresh 30s +async function renderActions() { + content().innerHTML = ` +
+ +
+

🕷 Crawl

+

Consommés par le crawler dans sa prochaine itération (~1 min).

+
+ + + +
+
-
-
-

Pipeline band_locations

-
- - - - -
+
+

🗺 Géocodage

+

L'enqueue tourne aussi automatiquement en tâche de fond (rattrapage). Statistiques dans Vue d'ensemble.

+
+ + + +
-
-
-
-
-
—
-
-
+
-
+
+

🧹 Maintenance

+
+ +
+
+
+ +

⚠️ Zone dangereuse — tout recommencer

À utiliser si le géocodage est corrompu. « Reset complet » remet toutes les - localisations en queue et efface leurs coordonnées (les appels seront refaits, cache réutilisé - quand possible). « Purger cache Nominatim » supprime les vieux géocodages de l'ancien pipeline - pour forcer un re-géocodage Geoapify frais. + localisations en queue et efface leurs coordonnées (cache réutilisé quand + possible). « Purger cache Nominatim » supprime les vieux géocodages de + l'ancien pipeline pour forcer un re-géocodage Geoapify frais.

-
+
-
-

20 derniers géocodages (bands)

-
Chargement…
-
- `; +
- // Nouveau pipeline — actions - const makeLocAction = (btnId, fbId, url, body, confirmMsg) => { - document.getElementById(btnId).addEventListener("click", async () => { - if (confirmMsg && !confirm(confirmMsg)) return; - const btn = document.getElementById(btnId); - btn.disabled = true; - const fb = document.getElementById(fbId); - fb.textContent = "En cours…"; fb.style.color = "var(--muted)"; - try { - const r = await api(url, { method: "POST", body: JSON.stringify(body || {}) }); - fb.textContent = `✓ ${r.count} entrée(s) modifiée(s).`; - fb.style.color = "var(--ok)"; - await loadGeocoding(); - } catch (e) { - fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; - } finally { btn.disabled = false; } - }); - }; +
+

Checkpoints crawler (lecture seule)

+
Chargement…
+
+ `; - document.getElementById("loc-enqueue").addEventListener("click", async () => { - const btn = document.getElementById("loc-enqueue"); + // Crawl + document.querySelectorAll("[data-job]").forEach((btn) => { + btn.addEventListener("click", async () => { + const job_type = btn.dataset.job; btn.disabled = true; - const fb = document.getElementById("loc-feedback"); - fb.textContent = "Job envoyé, le daemon va démarrer l'enqueue (peut prendre quelques secondes)…"; - fb.style.color = "var(--muted)"; + const fb = document.getElementById("job-feedback"); + fb.textContent = "Envoi…"; fb.style.color = "var(--muted)"; try { - await api("/admin/api/job-triggers", { method: "POST", body: JSON.stringify({ job_type: "geocoder_enqueue" }) }); - fb.textContent = "✓ Job geocoder_enqueue créé — le daemon parse les bands en arrière-plan."; + const r = await api("/admin/api/job-triggers", { method: "POST", body: JSON.stringify({ job_type }) }); + fb.textContent = `✓ Job #${r.id} créé — le crawler le consommera sous ~1 min (visible dans Activité).`; fb.style.color = "var(--ok)"; - setTimeout(() => loadGeocoding(), 3000); } catch (e) { fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; } finally { btn.disabled = false; } }); + }); - makeLocAction("loc-reset-errors", "loc-feedback", "/admin/api/locations/reset-errors", {}, null); - makeLocAction("loc-reset-llm", "loc-feedback", "/admin/api/locations/reset-llm", {}, "Remettre en queue les entrées llm_needed et manual ?"); - makeLocAction("loc-requeue-all", "loc-feedback", "/admin/api/locations/requeue-all", { include_done: true }, "Re-queue TOUTES les band_locations (erreurs + LLM + manual + done) ?"); + // Géocodage — actions simples + const makeLocAction = (btnId, fbId, url, body, confirmMsg, successMsg) => { + document.getElementById(btnId).addEventListener("click", async () => { + if (confirmMsg && !confirm(confirmMsg)) return; + const btn = document.getElementById(btnId); + btn.disabled = true; + const fb = document.getElementById(fbId); + fb.textContent = "En cours…"; fb.style.color = "var(--muted)"; + try { + const r = await api(url, { method: "POST", body: JSON.stringify(body || {}) }); + fb.textContent = successMsg ? successMsg(r) : `✓ ${r.count} entrée(s) modifiée(s).`; + fb.style.color = "var(--ok)"; + } catch (e) { + fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; + } finally { btn.disabled = false; } + }); + }; - // Zone dangereuse — reset complet & purge cache - makeLocAction("loc-reset-all", "danger-feedback", "/admin/api/locations/reset-all", {}, - "⚠️ RESET COMPLET : remettre TOUTES les localisations en queue et effacer leurs coordonnées ? Le worker va tout re-géocoder (cache réutilisé quand possible)."); - makeLocAction("cache-purge-nominatim", "danger-feedback", "/admin/api/geocode-cache/purge-nominatim", {}, - "⚠️ Supprimer toutes les entrées de cache Nominatim (ancien pipeline) ? Ces lieux seront re-géocodés via Geoapify (coûte des appels API)."); - } + document.getElementById("loc-enqueue").addEventListener("click", async () => { + const btn = document.getElementById("loc-enqueue"); + btn.disabled = true; + const fb = document.getElementById("geo-feedback"); + fb.textContent = "Job envoyé, le daemon va démarrer l'enqueue (peut prendre quelques secondes)…"; + fb.style.color = "var(--muted)"; + try { + await api("/admin/api/job-triggers", { method: "POST", body: JSON.stringify({ job_type: "geocoder_enqueue" }) }); + fb.textContent = "✓ Job geocoder_enqueue créé — suivre sa progression dans Activité."; + fb.style.color = "var(--ok)"; + } catch (e) { + fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; + } finally { btn.disabled = false; } + }); - await loadGeocoding(); - if (state.geoTimer) clearInterval(state.geoTimer); - state.geoTimer = setInterval(async () => { - await loadGeocoding(); - const el = document.getElementById("geo-refresh-status"); - if (el) el.textContent = `Actualisé ${new Date().toLocaleTimeString("fr-FR")}`; - }, 30000); -} + makeLocAction("loc-reset-errors", "geo-feedback", "/admin/api/locations/reset-errors", {}, null); + makeLocAction("loc-reset-llm", "geo-feedback", "/admin/api/locations/reset-llm", {}, "Remettre en queue les entrées llm_needed et manual ?"); + makeLocAction("loc-requeue-all", "geo-feedback", "/admin/api/locations/requeue-all", { include_done: true }, "Re-queue TOUTES les band_locations (erreurs + LLM + manual + done) ?"); -const LOC_STATUS_LABELS = { - queued: "En queue", processing: "En cours", done: "Done", - error: "Erreur", llm_needed: "LLM needed", manual: "Manuel", - country_only: "Pays (centroïde)", skipped: "Ignoré", -}; + // Zone dangereuse + makeLocAction("loc-reset-all", "danger-feedback", "/admin/api/locations/reset-all", {}, + "⚠️ RESET COMPLET : remettre TOUTES les localisations en queue et effacer leurs coordonnées ? Le worker va tout re-géocoder (cache réutilisé quand possible)."); + makeLocAction("cache-purge-nominatim", "danger-feedback", "/admin/api/geocode-cache/purge-nominatim", {}, + "⚠️ Supprimer toutes les entrées de cache Nominatim (ancien pipeline) ? Ces lieux seront re-géocodés via Geoapify (coûte des appels API)."); -async function loadGeocoding() { + // Maintenance + document.getElementById("cmd-cleanup").addEventListener("click", async () => { + const btn = document.getElementById("cmd-cleanup"); + btn.disabled = true; + const fb = document.getElementById("maintenance-feedback"); + fb.textContent = "Nettoyage…"; fb.style.color = "var(--muted)"; + try { + const r = await api("/admin/api/crawl-runs/cleanup", { method: "POST", body: JSON.stringify({ older_than_minutes: 30 }) }); + fb.textContent = `✓ ${r.cleaned} run(s) annulé(s).`; + fb.style.color = "var(--ok)"; + } catch (e) { + fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; + } finally { btn.disabled = false; } + }); + + // Checkpoints (lecture seule) try { - const r = await api("/admin/api/geocoding"); - - // Nouveau pipeline — band_locations - const locs = r.locations || []; - const locTotal = locs.reduce((s, x) => s + x.n, 0); - const locDone = (locs.find((x) => x.status === "done")?.n || 0) + - (locs.find((x) => x.status === "country_only")?.n || 0); - const locLlm = locs.find((x) => x.status === "llm_needed")?.n || 0; - const locManual = locs.find((x) => x.status === "manual")?.n || 0; - const locErr = locs.find((x) => x.status === "error")?.n || 0; - const locPct = locTotal ? Math.round((locDone / locTotal) * 100) : 0; - const rawCost = Number(r.llm_cache?.total_cost_usd); - const llmCost = (Number.isFinite(rawCost) ? rawCost : 0).toFixed(4); - - const llmNull = r.llm_cache?.n_null || 0; - const locStatsEl = document.getElementById("loc-stats"); - if (locStatsEl) locStatsEl.innerHTML = ` - ${statCard("Total locations", locTotal)} - ${statCard("Géocodées", locDone, "ok")} - ${statCard("LLM needed", locLlm, locLlm ? "warn" : "")} - ${statCard("Manuel", locManual, locManual ? "warn" : "")} - ${statCard("Erreurs", locErr, locErr ? "err" : "")} - ${statCard("LLM cache", r.llm_cache?.n || 0)} - ${statCard("LLM null", llmNull, llmNull ? "warn" : "")} - ${statCard("Coût LLM (USD)", "$" + llmCost)} + const r = await api("/admin/api/crawl-checkpoints"); + document.getElementById("checkpoints-wrap").innerHTML = ` + + + + ${r.items.map((x) => ``).join("") || ``} + +
CléValeurMis à jour
${esc(x.key)}${esc(x.value || "—")}${fmtDate(x.updated_at)}
Aucun checkpoint
`; - const locBar = document.getElementById("loc-bar"); - if (locBar) locBar.style.width = locPct + "%"; - const locPctEl = document.getElementById("loc-pct"); - if (locPctEl) locPctEl.textContent = `${locPct}% — ${locDone.toLocaleString("fr-FR")} / ${locTotal.toLocaleString("fr-FR")} — statuts: ${locs.map((x) => `${LOC_STATUS_LABELS[x.status] || x.status} ${x.n}`).join(", ")}`; - - // Breakdown par provider (source du géocodage) + par modèle LLM - const provEl = document.getElementById("loc-providers"); - if (provEl) { - const provTxt = (r.providers || []).map((p) => `${esc(p.provider)}: ${p.n.toLocaleString("fr-FR")}${p.avg_conf != null ? ` (conf~${p.avg_conf})` : ""}`).join(" · "); - const modelTxt = (r.llm_models || []).map((m) => `${esc(m.model)}: ${m.n} (null ${m.n_null})`).join(" · "); - provEl.innerHTML = `
Sources géocodage : ${provTxt || "—"}
` + - (modelTxt ? `
Modèles LLM : ${modelTxt}
` : "") + - `
Cache géocodage : ${(r.cache_size || 0).toLocaleString("fr-FR")} entrées
`; - } - - const recentWrap = document.getElementById("geo-recent-wrap"); - if (recentWrap) recentWrap.innerHTML = ` - - - ${r.recent.map((x) => ` - - - - - - - - `).join("") || ``} - -
MA IDNomPaysProviderQueryGéocodé leErreur
${x.ma_id}${esc(x.name)}${esc(x.country || "")}${esc(x.geocode_provider || "")}${esc(x.geocode_query || "")}${fmtDate(x.geocoded_at)}${esc(x.geocode_error || "")}
Aucun
`; } catch (e) { - const pctEl = document.getElementById("loc-pct"); - if (pctEl) pctEl.textContent = `Erreur : ${esc(e.message)}`; + document.getElementById("checkpoints-wrap").innerHTML = `
Erreur : ${esc(e.message)}
`; } } @@ -1259,210 +1058,6 @@ async function loadLLM() { } } -// ------------------------------------------------------------------ -// Centre de commandes (Jobs + Géocodeur + Maintenance + Live log) -// ------------------------------------------------------------------ -async function renderJobs() { - content().innerHTML = ` -
- -
-

🕷 Crawler

-

Consommés par le crawler dans sa prochaine itération (~1 min).

-
- - - -
-
-
- -
-

🗺 Géocodeur

-

Le géocodeur et le worker Groq tournent en continu. L'enqueue parse les bands en band_locations.

-
- - Les resets/purges du géocodage sont dans l'onglet Géocodage. -
-
-
- -
-

🧹 Maintenance

-
- -
-
-
- -
- -
-

Historique des jobs déclenchés

-
Chargement…
-
- -
-
-

Journal en direct (20 dernières lignes — auto-refresh 10s)

- -
-
Chargement…
-
- `; - - // Crawler jobs - document.querySelectorAll("[data-job]").forEach((btn) => { - btn.addEventListener("click", async () => { - const job_type = btn.dataset.job; - btn.disabled = true; - const fb = document.getElementById("job-feedback"); - fb.textContent = "Envoi…"; fb.style.color = "var(--muted)"; - try { - const r = await api("/admin/api/job-triggers", { method: "POST", body: JSON.stringify({ job_type }) }); - fb.textContent = `✓ Job #${r.id} créé — le crawler le consommera sous ~1 min.`; - fb.style.color = "var(--ok)"; - await Promise.all([loadJobsList(), loadCmdLogTail()]); - } catch (e) { - fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; - } finally { btn.disabled = false; } - }); - }); - - // Geocoder enqueue - document.getElementById("cmd-enqueue").addEventListener("click", async () => { - const btn = document.getElementById("cmd-enqueue"); - btn.disabled = true; - const fb = document.getElementById("geo-cmd-feedback"); - fb.textContent = "Envoi du job…"; fb.style.color = "var(--muted)"; - try { - await api("/admin/api/job-triggers", { method: "POST", body: JSON.stringify({ job_type: "geocoder_enqueue" }) }); - fb.textContent = "✓ Job geocoder_enqueue créé — le daemon parse les bands en arrière-plan."; - fb.style.color = "var(--ok)"; - await loadCmdLogTail(); - } catch (e) { - fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; - } finally { btn.disabled = false; } - }); - - // Cleanup - document.getElementById("cmd-cleanup").addEventListener("click", async () => { - const btn = document.getElementById("cmd-cleanup"); - btn.disabled = true; - const fb = document.getElementById("maintenance-feedback"); - fb.textContent = "Nettoyage…"; fb.style.color = "var(--muted)"; - try { - const r = await api("/admin/api/crawl-runs/cleanup", { method: "POST", body: JSON.stringify({ older_than_minutes: 30 }) }); - fb.textContent = `✓ ${r.cleaned} run(s) annulé(s).`; - fb.style.color = "var(--ok)"; - await loadCmdLogTail(); - } catch (e) { - fb.textContent = `Erreur: ${e.message}`; fb.style.color = "var(--err)"; - } finally { btn.disabled = false; } - }); - - await Promise.all([loadJobsList(), loadCmdLogTail()]); - if (state.cmdLogTimer) clearInterval(state.cmdLogTimer); - state.cmdLogTimer = setInterval(async () => { - await loadCmdLogTail(); - const ts = document.getElementById("cmd-log-ts"); - if (ts) ts.textContent = `Actualisé à ${new Date().toLocaleTimeString("fr-FR")}`; - }, 10000); -} - -async function loadJobsList() { - const el = document.getElementById("jobs-list"); - if (!el) return; - try { - const r = await api("/admin/api/job-triggers"); - el.innerHTML = `
- - - ${r.items.map((x) => ` - - - - - - - - - `).join("") || ``} - -
IDTypeStatutDemandé parCréé leDémarréTerminéErreur
${x.id}${esc(x.job_type)}${statusBadge(x.status)}${esc(x.requested_by || "—")}${fmtDate(x.created_at)}${fmtDate(x.started_at)}${fmtDate(x.finished_at)}${esc(x.error || "")}
Aucun job
`; - } catch (e) { - el.innerHTML = `
Erreur : ${esc(e.message)}
`; - } -} - -async function loadCmdLogTail() { - const el = document.getElementById("cmd-log-tail"); - if (!el) return; - try { - const r = await api("/admin/api/logs?pageSize=20&page=1"); - el.innerHTML = ` - - - ${r.items.map((x) => ` - - - - `).join("") || ``} - -
DateNiveauMessage
${fmtDate(x.created_at)}${esc(x.level)}${esc(x.message)}
Aucun log
`; - } catch (e) { - el.innerHTML = `
Erreur : ${esc(e.message)}
`; - } -} - -// ------------------------------------------------------------------ -// Checkpoints -// ------------------------------------------------------------------ -async function renderCheckpoints() { - content().innerHTML = `
Chargement…
`; - try { - const r = await api("/admin/api/crawl-checkpoints"); - content().innerHTML = ` -
- - - ${r.items.map((x) => ``).join("") || ``} - -
CléValeurMis à jour
${esc(x.key)}${esc(x.value || "—")}${fmtDate(x.updated_at)}
Aucun checkpoint
- `; - } catch (e) { - content().innerHTML = `
Erreur : ${esc(e.message)}
`; - } -} - -// ------------------------------------------------------------------ -// Audit log -// ------------------------------------------------------------------ -async function renderAudit() { - content().innerHTML = `
Chargement…
`; - try { - const r = await api(`/admin/api/audit-log?page=1&pageSize=${state.audit.pageSize}`); - content().innerHTML = ` -
- - - ${r.items.map((x) => ` - - - - - - - - `).join("") || ``} - -
DateAdminActionTableID cible
${fmtDate(x.created_at)}${esc(x.admin_username)}${esc(x.action)}${esc(x.target_table)}${esc(x.target_id)}
Aucune action
- `; - } catch (e) { - content().innerHTML = `
Erreur : ${esc(e.message)}
`; - } -} - // ------------------------------------------------------------------ // Boot // ------------------------------------------------------------------ diff --git a/apps/admin/site/index.html b/apps/admin/site/index.html index 5fd26cf..a7a51f7 100644 --- a/apps/admin/site/index.html +++ b/apps/admin/site/index.html @@ -30,18 +30,11 @@
Admin
diff --git a/apps/api/src/adminRoutes.js b/apps/api/src/adminRoutes.js index 9f299f4..67002f0 100644 --- a/apps/api/src/adminRoutes.js +++ b/apps/api/src/adminRoutes.js @@ -110,7 +110,7 @@ export default async function adminRoutes(fastify, opts) { // ------------------------------------------------------------------ fastify.get("/admin/api/bands", async (req, reply) => { try { - const { q, location_q, country, status, genre, themes_q, enriched, has_lat, has_location, sort, dir } = req.query || {}; + const { q, location_q, country, status, genre, themes_q, enriched, has_lat, has_location, has_conflict, sort, dir } = req.query || {}; const { page, pageSize, offset } = pagination(req.query || {}); const where = []; @@ -154,6 +154,7 @@ export default async function adminRoutes(fastify, opts) { if (has_lat === "false" || has_lat === "0") where.push(`lat IS NULL`); if (has_location === "true" || has_location === "1") where.push(`location_text IS NOT NULL AND location_text != ''`); if (has_location === "false" || has_location === "0") where.push(`(location_text IS NULL OR location_text = '')`); + if (has_conflict === "true" || has_conflict === "1") where.push(`crawler_pending IS NOT NULL AND crawler_pending <> '{}'::jsonb`); if (themes_q) { const tq = String(themes_q).trim().slice(0, 100); if (tq.length >= 1) { where.push(`themes ILIKE $${i}`); vals.push(`%${tq}%`); i++; } @@ -302,36 +303,10 @@ export default async function adminRoutes(fastify, opts) { }); // ------------------------------------------------------------------ - // Crawl runs / checkpoints + // Checkpoints + // (l'historique des crawl_run est exposé de façon unifiée par + // GET /admin/api/activity, avec le détail logs via GET /admin/api/logs?run_id=) // ------------------------------------------------------------------ - fastify.get("/admin/api/crawl-runs", async (req, reply) => { - try { - const { run_type, status } = req.query || {}; - const { page, pageSize, offset } = pagination(req.query || {}); - const where = []; - const vals = []; - let i = 1; - if (run_type) { where.push(`run_type = $${i}`); vals.push(run_type); i++; } - if (status) { where.push(`status = $${i}`); vals.push(status); i++; } - const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : ""; - - const countRes = await pool.query(`SELECT count(*)::int AS total FROM crawl_run ${whereSql}`, vals); - vals.push(pageSize, offset); - const dataRes = await pool.query(` - SELECT id, run_type, countries, status, started_at, finished_at, - bands_seen, bands_new, bands_updated, bands_enriched, error - FROM crawl_run ${whereSql} - ORDER BY started_at DESC - LIMIT $${i} OFFSET $${i + 1} - `, vals); - - return { ok: true, items: dataRes.rows, total: countRes.rows[0].total, page, pageSize }; - } catch (err) { - fastify.log.error(err); - return reply.code(500).send({ ok: false, error: "Erreur crawl runs" }); - } - }); - fastify.get("/admin/api/crawl-checkpoints", async (req, reply) => { try { const r = await pool.query(`SELECT key, value, updated_at FROM crawl_checkpoint ORDER BY key`); @@ -397,27 +372,11 @@ export default async function adminRoutes(fastify, opts) { }); // ------------------------------------------------------------------ - // Conflits : champs verrouillés avec valeur différente côté crawler + // Conflits : champs verrouillés avec valeur différente côté crawler. + // La liste bulk est remplacée par le filtre has_conflict=1 sur + // GET /admin/api/bands (visible dans l'onglet Groupes) ; la résolution + // champ par champ reste ici et est utilisée depuis le modal band. // ------------------------------------------------------------------ - fastify.get("/admin/api/conflicts", async (req, reply) => { - try { - const { page, pageSize, offset } = pagination(req.query || {}); - const r = await pool.query(` - SELECT ma_id, name, country, status, genre, themes, formed_year, - locked_fields, crawler_pending - FROM bands - WHERE crawler_pending IS NOT NULL AND crawler_pending != '{}'::jsonb - ORDER BY updated_at DESC - LIMIT $1 OFFSET $2 - `, [pageSize, offset]); - const count = await pool.query(`SELECT count(*)::int AS n FROM bands WHERE crawler_pending IS NOT NULL AND crawler_pending != '{}'::jsonb`); - return { ok: true, items: r.rows, total: count.rows[0].n, page, pageSize }; - } catch (err) { - fastify.log.error(err); - return reply.code(500).send({ ok: false, error: "Erreur conflicts" }); - } - }); - fastify.post("/admin/api/bands/:ma_id/resolve-conflict", async (req, reply) => { try { const id = Number(req.params.ma_id); @@ -780,22 +739,67 @@ export default async function adminRoutes(fastify, opts) { } }); + // Le journal d'audit (actions admin) est désormais exposé de façon unifiée + // par GET /admin/api/activity (type=admin_action), avec crawl_run côté + // system. writeAuditLog() continue d'alimenter admin_audit_log ci-dessous. + // ------------------------------------------------------------------ - // Journal d'audit (actions admin) + // Activité — liste unifiée : crawl_run (crawl/enrich/geocoder_enqueue, + // manuel ou planifié) + admin_audit_log (actions admin). Une seule liste + // chronologique cliquable pour l'admin ; le détail d'un 'run' se récupère + // via GET /admin/api/logs?run_id=, celui d'un 'admin_action' est déjà + // inclus (before/after). // ------------------------------------------------------------------ - fastify.get("/admin/api/audit-log", async (req, reply) => { + fastify.get("/admin/api/activity", async (req, reply) => { try { + const { type, status } = req.query || {}; const { page, pageSize, offset } = pagination(req.query || {}); - const r = await pool.query(` - SELECT id, admin_username, action, target_table, target_id, before_data, after_data, created_at + + const base = ` + SELECT + 'run'::text AS type, id, run_type AS subtype, status, + NULL::text AS actor, started_at AS ts, finished_at, + jsonb_build_object( + 'bands_seen', bands_seen, 'bands_new', bands_new, + 'bands_updated', bands_updated, 'bands_enriched', bands_enriched, + 'error', error, 'countries', countries + ) AS summary + FROM crawl_run + UNION ALL + SELECT + 'admin_action'::text AS type, id, action AS subtype, 'done'::text AS status, + admin_username AS actor, created_at AS ts, created_at AS finished_at, + jsonb_build_object( + 'target_table', target_table, 'target_id', target_id, + 'before', before_data, 'after', after_data + ) AS summary FROM admin_audit_log - ORDER BY created_at DESC - LIMIT $1 OFFSET $2 - `, [pageSize, offset]); - return { ok: true, items: r.rows, page, pageSize }; + `; + + const where = []; + const vals = []; + let i = 1; + if (type) { where.push(`type = $${i}`); vals.push(String(type)); i++; } + if (status) { where.push(`status = $${i}`); vals.push(String(status)); i++; } + const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : ""; + + const countSql = `SELECT count(*)::int AS total FROM (${base}) t ${whereSql}`; + const dataSql = ` + SELECT * FROM (${base}) t + ${whereSql} + ORDER BY ts DESC + LIMIT $${i} OFFSET $${i + 1} + `; + + const [countRes, dataRes] = await Promise.all([ + pool.query(countSql, vals), + pool.query(dataSql, [...vals, pageSize, offset]), + ]); + + return { ok: true, items: dataRes.rows, total: countRes.rows[0].total, page, pageSize }; } catch (err) { fastify.log.error(err); - return reply.code(500).send({ ok: false, error: "Erreur audit log" }); + return reply.code(500).send({ ok: false, error: "Erreur activité" }); } }); }