first commit
This commit is contained in:
team 1
@@ -4,8 +4,17 @@
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h1 class="h3"><i class="bi bi-terminal"></i> Indexierung (Ingest Jobs)</h1>
|
||||
{% set latestJob = jobs is not empty ? jobs|first : null %}
|
||||
|
||||
<div class="d-flex justify-content-between align-items-center mb-4 flex-wrap gap-2">
|
||||
<div>
|
||||
<h1 class="h3 mb-1">
|
||||
<i class="bi bi-terminal"></i> Indexierung (Ingest Jobs)
|
||||
</h1>
|
||||
<div class="small text-muted">
|
||||
Übersicht über Reindex-, Dokument- und Aktivierungsjobs des Systems.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if is_granted('ROLE_SUPER_ADMIN') %}
|
||||
<form method="post"
|
||||
@@ -25,102 +34,215 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="card bg-dark border-secondary text-light mb-4 shadow-sm">
|
||||
<div class="card-body row g-4">
|
||||
<div class="col-lg-7">
|
||||
<h5 class="text-info mb-3">Was sieht man hier?</h5>
|
||||
<ul class="small mb-0">
|
||||
<li><strong>DOCUMENT</strong> verarbeitet ein einzelnes Dokument neu.</li>
|
||||
<li><strong>DOCUMENT_VERSION_ACTIVATE</strong> zieht eine aktivierte Version deterministisch neu in den Index.</li>
|
||||
<li><strong>DOCUMENT_DELETE</strong> entfernt Dokumentinhalt wieder sauber aus den Index-Artefakten.</li>
|
||||
<li><strong>GLOBAL_REINDEX</strong> baut den Wissensindex vollständig neu auf und ist der stärkste Reparaturpfad.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-5">
|
||||
<h5 class="text-info mb-3">Worauf achten?</h5>
|
||||
<ul class="small mb-0">
|
||||
<li><strong>RUNNING</strong> und <strong>QUEUED</strong> bedeuten: keine unnötigen parallelen Rebuilds starten.</li>
|
||||
<li><strong>FAILED</strong> oder <strong>ABORTED</strong> direkt prüfen.</li>
|
||||
<li>Bei inkonsistentem Indexzustand ist meist ein <strong>Global Reindex</strong> der richtige Reparaturschritt.</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if latestJob %}
|
||||
<div class="card bg-black border-secondary text-light mb-4 shadow-sm">
|
||||
<div class="card-body">
|
||||
<div class="d-flex justify-content-between align-items-start flex-wrap gap-3">
|
||||
<div>
|
||||
<div class="small text-muted mb-1">Letzter Job</div>
|
||||
<div class="fw-semibold">
|
||||
<a href="{{ path('admin_job_show', {id: latestJob.id}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ latestJob.id }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="small text-muted mb-1">Typ</div>
|
||||
<span class="badge bg-info text-dark">{{ latestJob.type }}</span>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="small text-muted mb-1">Status</div>
|
||||
{% if latestJob.status == 'COMPLETED' %}
|
||||
<span class="badge bg-success">COMPLETED</span>
|
||||
{% elseif latestJob.status == 'QUEUED' %}
|
||||
<span class="badge bg-secondary">QUEUED</span>
|
||||
{% elseif latestJob.status == 'RUNNING' %}
|
||||
<span class="badge bg-warning text-dark">RUNNING</span>
|
||||
{% elseif latestJob.status == 'FAILED' %}
|
||||
<span class="badge bg-danger">FAILED</span>
|
||||
{% elseif latestJob.status == 'ABORTED' %}
|
||||
<span class="badge bg-dark border border-danger text-danger">ABORTED</span>
|
||||
{% else %}
|
||||
<span class="badge bg-dark border border-secondary">{{ latestJob.status }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="small text-muted mb-1">Gestartet</div>
|
||||
<div class="small">
|
||||
{{ latestJob.startedAt ? latestJob.startedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="small text-muted mb-1">Beendet</div>
|
||||
<div class="small">
|
||||
{{ latestJob.finishedAt ? latestJob.finishedAt|date('d.m.Y H:i:s') : 'läuft noch / offen' }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if latestJob.errorMessage %}
|
||||
<div class="alert alert-danger small mt-3 mb-0">
|
||||
<strong>Fehler:</strong>
|
||||
{{ latestJob.errorMessage|slice(0, 250) }}{% if latestJob.errorMessage|length > 250 %}…{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if jobs is empty %}
|
||||
|
||||
<div class="alert alert-secondary">
|
||||
<div class="alert alert-secondary shadow-sm">
|
||||
Keine Ingest Jobs vorhanden.
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
|
||||
<div class="card bg-black border-secondary">
|
||||
<div class="card bg-black border-secondary shadow-sm">
|
||||
<div class="card-body p-0">
|
||||
|
||||
<table class="table table-dark table-striped table-hover align-middle mb-0">
|
||||
<thead class="table-secondary text-dark">
|
||||
<tr>
|
||||
<th>Job-ID</th>
|
||||
<th>Typ</th>
|
||||
<th>Status</th>
|
||||
<th>Dokument</th>
|
||||
<th>Version</th>
|
||||
<th>Gestartet</th>
|
||||
<th>Beendet</th>
|
||||
<th>Benutzer</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<div class="d-flex justify-content-between align-items-center px-3 py-3 border-bottom border-secondary flex-wrap gap-2">
|
||||
<div>
|
||||
<strong class="text-info">Vorhandene Jobs</strong>
|
||||
<span class="small text-muted ms-2">{{ jobs|length }} Einträge</span>
|
||||
</div>
|
||||
|
||||
{% for job in jobs %}
|
||||
<div class="small text-muted">
|
||||
Neueste Jobs stehen oben.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-dark table-striped table-hover align-middle mb-0">
|
||||
<thead class="table-secondary text-dark">
|
||||
<tr>
|
||||
|
||||
<td class="small">
|
||||
<a href="{{ path('admin_job_show', {id: job.id}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.id }}
|
||||
</a>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span class="badge bg-info text-dark">
|
||||
{{ job.type }}
|
||||
</span>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if job.status == 'COMPLETED' %}
|
||||
<span class="badge bg-success">COMPLETED</span>
|
||||
{% elseif job.status == 'QUEUED' %}
|
||||
<span class="badge bg-secondary">QUEUED</span>
|
||||
{% elseif job.status == 'RUNNING' %}
|
||||
<span class="badge bg-warning text-dark">RUNNING</span>
|
||||
{% elseif job.status == 'FAILED' %}
|
||||
<span class="badge bg-danger">FAILED</span>
|
||||
{% else %}
|
||||
<span class="badge bg-dark border border-secondary">
|
||||
{{ job.status }}
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if job.documentId %}
|
||||
<a href="{{ path('admin_document_show', {id: job.documentId}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.documentId }}
|
||||
</a>
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{{ job.documentVersionId ?? '-' }}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{{ job.startedAt ? job.startedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{{ job.finishedAt ? job.finishedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{{ job.startedBy ? job.startedBy.email : '-' }}
|
||||
</td>
|
||||
|
||||
<th style="width: 18%">Job</th>
|
||||
<th style="width: 14%">Typ</th>
|
||||
<th style="width: 12%">Status</th>
|
||||
<th style="width: 18%">Bezug</th>
|
||||
<th style="width: 12%">Gestartet</th>
|
||||
<th style="width: 12%">Beendet</th>
|
||||
<th style="width: 14%">Benutzer</th>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="8" class="text-center text-secondary py-4">
|
||||
Keine Jobs gefunden.
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
{% for job in jobs %}
|
||||
<tr>
|
||||
<td class="small">
|
||||
<div class="fw-semibold">
|
||||
<a href="{{ path('admin_job_show', {id: job.id}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.id }}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{% if job.errorMessage %}
|
||||
<div class="text-danger small mt-1"
|
||||
title="{{ job.errorMessage }}">
|
||||
{{ job.errorMessage|slice(0, 120) }}{% if job.errorMessage|length > 120 %}…{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span class="badge bg-info text-dark">
|
||||
{{ job.type }}
|
||||
</span>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if job.status == 'COMPLETED' %}
|
||||
<span class="badge bg-success">COMPLETED</span>
|
||||
{% elseif job.status == 'QUEUED' %}
|
||||
<span class="badge bg-secondary">QUEUED</span>
|
||||
{% elseif job.status == 'RUNNING' %}
|
||||
<span class="badge bg-warning text-dark">RUNNING</span>
|
||||
{% elseif job.status == 'FAILED' %}
|
||||
<span class="badge bg-danger">FAILED</span>
|
||||
{% elseif job.status == 'ABORTED' %}
|
||||
<span class="badge bg-dark border border-danger text-danger">ABORTED</span>
|
||||
{% else %}
|
||||
<span class="badge bg-dark border border-secondary">
|
||||
{{ job.status }}
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{% if job.documentId %}
|
||||
<div>
|
||||
<span class="text-muted">Dokument:</span>
|
||||
<a href="{{ path('admin_document_show', {id: job.documentId}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.documentId }}
|
||||
</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if job.documentVersionId %}
|
||||
<div class="mt-1">
|
||||
<span class="text-muted">Version:</span>
|
||||
{{ job.documentVersionId }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if not job.documentId and not job.documentVersionId %}
|
||||
-
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{{ job.startedAt ? job.startedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{{ job.finishedAt ? job.finishedAt|date('d.m.Y H:i:s') : 'offen' }}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{{ job.startedBy ? job.startedBy.email : '-' }}
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="7" class="text-center text-secondary py-4">
|
||||
Keine Jobs gefunden.
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -128,8 +250,8 @@
|
||||
{% endif %}
|
||||
|
||||
<div class="mt-4 small text-secondary">
|
||||
Hinweis: Während laufender Jobs (Status RUNNING) sollten keine
|
||||
parallelen Reindex-Prozesse gestartet werden.
|
||||
Hinweis: Während laufender Jobs (Status <strong>RUNNING</strong>) oder wartender Jobs (<strong>QUEUED</strong>)
|
||||
sollten keine unnötigen parallelen Reindex-Prozesse gestartet werden.
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
@@ -4,8 +4,18 @@
|
||||
|
||||
{% block body %}
|
||||
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h1 class="h3 mb-0">Ingest Job</h1>
|
||||
{% set jobStatus = job.status|upper %}
|
||||
{% set isActiveJob = jobStatus in ['QUEUED', 'RUNNING'] %}
|
||||
|
||||
<div class="d-flex justify-content-between align-items-center mb-4 flex-wrap gap-2">
|
||||
<div>
|
||||
<h1 class="h3 mb-1">
|
||||
<i class="bi bi-terminal"></i> Ingest Job
|
||||
</h1>
|
||||
<div class="small text-muted">
|
||||
Detailansicht für einen einzelnen Indexierungs- oder Rebuild-Job.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a href="{{ path('admin_jobs') }}"
|
||||
class="btn btn-sm btn-outline-secondary">
|
||||
@@ -13,61 +23,134 @@
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="card bg-black border-secondary text-light">
|
||||
<div class="card bg-dark border-secondary text-light mb-4 shadow-sm">
|
||||
<div class="card-body row g-4">
|
||||
<div class="col-lg-7">
|
||||
<h5 class="text-info mb-3">Einordnung</h5>
|
||||
<ul class="small mb-0">
|
||||
<li><strong>DOCUMENT</strong> verarbeitet ein einzelnes Dokument neu.</li>
|
||||
<li><strong>DOCUMENT_VERSION_ACTIVATE</strong> aktiviert eine Version und zieht sie deterministisch neu in den Index.</li>
|
||||
<li><strong>DOCUMENT_DELETE</strong> entfernt Dokumentinhalt wieder sauber aus dem Wissensbestand.</li>
|
||||
<li><strong>GLOBAL_REINDEX</strong> baut den Gesamtindex vollständig neu auf.</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-5">
|
||||
<h5 class="text-info mb-3">Aktueller Zustand</h5>
|
||||
<div class="d-flex flex-wrap gap-2">
|
||||
{% if jobStatus == 'COMPLETED' %}
|
||||
<span class="badge bg-success">COMPLETED</span>
|
||||
{% elseif jobStatus == 'QUEUED' %}
|
||||
<span class="badge bg-secondary">QUEUED</span>
|
||||
{% elseif jobStatus == 'RUNNING' %}
|
||||
<span class="badge bg-warning text-dark">RUNNING</span>
|
||||
{% elseif jobStatus == 'FAILED' %}
|
||||
<span class="badge bg-danger">FAILED</span>
|
||||
{% elseif jobStatus == 'ABORTED' %}
|
||||
<span class="badge bg-dark border border-danger text-danger">ABORTED</span>
|
||||
{% else %}
|
||||
<span class="badge bg-dark border border-secondary">{{ jobStatus }}</span>
|
||||
{% endif %}
|
||||
|
||||
{% if isActiveJob %}
|
||||
<span class="badge text-bg-info">Polling aktiv</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card bg-black border-secondary text-light shadow-sm">
|
||||
<div class="card-body">
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>ID:</strong>
|
||||
<span class="small text-light">{{ job.id }}</span>
|
||||
<div class="row g-4">
|
||||
<div class="col-lg-6">
|
||||
<div class="mb-3">
|
||||
<div class="small text-muted mb-1">Job-ID</div>
|
||||
<div class="fw-semibold small text-light">{{ job.id }}</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div class="small text-muted mb-1">Typ</div>
|
||||
<div>
|
||||
<span class="badge bg-info text-dark">{{ job.type }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div class="small text-muted mb-1">Status</div>
|
||||
<div id="job-status-badge">
|
||||
{% if jobStatus == 'COMPLETED' %}
|
||||
<span class="badge bg-success">COMPLETED</span>
|
||||
{% elseif jobStatus == 'QUEUED' %}
|
||||
<span class="badge bg-secondary">QUEUED</span>
|
||||
{% elseif jobStatus == 'RUNNING' %}
|
||||
<span class="badge bg-warning text-dark">RUNNING</span>
|
||||
{% elseif jobStatus == 'FAILED' %}
|
||||
<span class="badge bg-danger">FAILED</span>
|
||||
{% elseif jobStatus == 'ABORTED' %}
|
||||
<span class="badge bg-dark border border-danger text-danger">ABORTED</span>
|
||||
{% else %}
|
||||
<span class="badge bg-dark border border-secondary">{{ jobStatus }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div class="small text-muted mb-1">Dokument</div>
|
||||
<div>
|
||||
{% if job.documentId %}
|
||||
<a href="{{ path('admin_document_show', {id: job.documentId}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.documentId }}
|
||||
</a>
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-0">
|
||||
<div class="small text-muted mb-1">Dokumentversion</div>
|
||||
<div>{{ job.documentVersionId ?? '-' }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-6">
|
||||
<div class="mb-3">
|
||||
<div class="small text-muted mb-1">Gestartet</div>
|
||||
<div>
|
||||
{{ job.startedAt ? job.startedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div class="small text-muted mb-1">Beendet</div>
|
||||
<div id="job-finished-at">
|
||||
{{ job.finishedAt ? job.finishedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<div class="small text-muted mb-1">Gestartet von</div>
|
||||
<div>{{ job.startedBy ? job.startedBy.email : '-' }}</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-0">
|
||||
<div class="small text-muted mb-1">Polling</div>
|
||||
<div class="small text-light">
|
||||
{% if isActiveJob %}
|
||||
Status wird automatisch aktualisiert.
|
||||
{% else %}
|
||||
Kein Live-Polling nötig.
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Typ:</strong>
|
||||
<span class="badge bg-info text-dark">{{ job.type }}</span>
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Status:</strong>
|
||||
<span id="job-status-badge"></span>
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Dokument:</strong>
|
||||
{% if job.documentId %}
|
||||
<a href="{{ path('admin_document_show', {id: job.documentId}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.documentId }}
|
||||
</a>
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Version:</strong>
|
||||
{{ job.documentVersionId ?? '-' }}
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Gestartet:</strong>
|
||||
{{ job.startedAt|date('d.m.Y H:i:s') }}
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Beendet:</strong>
|
||||
<span id="job-finished-at">
|
||||
{{ job.finishedAt ? job.finishedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Gestartet von:</strong>
|
||||
{{ job.startedBy ? job.startedBy.email : '-' }}
|
||||
</div>
|
||||
|
||||
{# Loader #}
|
||||
<div id="job-loader"
|
||||
class="mt-3 d-none">
|
||||
class="mt-4 {% if not isActiveJob %}d-none{% endif %}">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<div class="spinner-border spinner-border-sm text-info" role="status"></div>
|
||||
<div>
|
||||
@@ -79,10 +162,10 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# Fehlerbereich #}
|
||||
<div id="job-error"
|
||||
class="alert alert-danger mt-3 {% if not job.errorMessage %}d-none{% endif %}">
|
||||
class="alert alert-danger mt-4 {% if not job.errorMessage %}d-none{% endif %}">
|
||||
{% if job.errorMessage %}
|
||||
<strong>Fehler:</strong><br>
|
||||
{{ job.errorMessage }}
|
||||
{% endif %}
|
||||
</div>
|
||||
@@ -91,13 +174,13 @@
|
||||
</div>
|
||||
|
||||
<div class="mt-4 small text-secondary">
|
||||
Hinweis: Bei DOCUMENT_VERSION_ACTIVATE-Jobs wird ein vollständiger
|
||||
NDJSON-Rebuild und FAISS-Reindex durchgeführt.
|
||||
Hinweis: Bei <strong>DOCUMENT_VERSION_ACTIVATE</strong>-Jobs wird ein vollständiger
|
||||
NDJSON-Rebuild und FAISS-Reindex durchgeführt. Bei <strong>GLOBAL_REINDEX</strong>
|
||||
wird der gesamte Wissensindex neu aufgebaut.
|
||||
</div>
|
||||
|
||||
<script>
|
||||
(function () {
|
||||
|
||||
const statusUrl = {{ path('admin_job_status', {id: job.id})|json_encode|raw }};
|
||||
const badgeWrap = document.getElementById('job-status-badge');
|
||||
const finishedAtEl = document.getElementById('job-finished-at');
|
||||
@@ -106,18 +189,26 @@
|
||||
|
||||
let timer = null;
|
||||
|
||||
function escapeHtml(value) {
|
||||
return String(value)
|
||||
.replaceAll('&', '&')
|
||||
.replaceAll('<', '<')
|
||||
.replaceAll('>', '>')
|
||||
.replaceAll('"', '"')
|
||||
.replaceAll("'", ''');
|
||||
}
|
||||
|
||||
function renderBadge(status) {
|
||||
const map = {
|
||||
COMPLETED: 'bg-success',
|
||||
QUEUED: 'bg-secondary',
|
||||
RUNNING: 'bg-warning text-dark',
|
||||
FAILED: 'bg-danger',
|
||||
ABORTED: 'bg-dark'
|
||||
ABORTED: 'bg-dark border border-danger text-danger'
|
||||
};
|
||||
|
||||
const css = map[status] || 'bg-secondary';
|
||||
badgeWrap.innerHTML =
|
||||
`<span class="badge ${css}">${status}</span>`;
|
||||
const css = map[status] || 'bg-dark border border-secondary';
|
||||
badgeWrap.innerHTML = `<span class="badge ${css}">${escapeHtml(status || 'UNKNOWN')}</span>`;
|
||||
}
|
||||
|
||||
function stopPolling() {
|
||||
@@ -127,20 +218,39 @@
|
||||
}
|
||||
}
|
||||
|
||||
function renderError(message) {
|
||||
if (!message) {
|
||||
errorEl.classList.add('d-none');
|
||||
errorEl.innerHTML = '';
|
||||
return;
|
||||
}
|
||||
|
||||
errorEl.classList.remove('d-none');
|
||||
errorEl.innerHTML = `<strong>Fehler:</strong><br>${escapeHtml(message)}`;
|
||||
}
|
||||
|
||||
async function poll() {
|
||||
try {
|
||||
const res = await fetch(statusUrl);
|
||||
if (!res.ok) return;
|
||||
const res = await fetch(statusUrl, {
|
||||
headers: {
|
||||
'Accept': 'application/json'
|
||||
},
|
||||
cache: 'no-store'
|
||||
});
|
||||
|
||||
if (!res.ok) {
|
||||
stopPolling();
|
||||
return;
|
||||
}
|
||||
|
||||
const data = await res.json();
|
||||
const status = (data.status || '').toUpperCase();
|
||||
const status = String(data.status || '').toUpperCase();
|
||||
|
||||
renderBadge(status);
|
||||
|
||||
finishedAtEl.textContent =
|
||||
data.finishedAt
|
||||
? new Date(data.finishedAt).toLocaleString('de-DE')
|
||||
: '-';
|
||||
finishedAtEl.textContent = data.finishedAt
|
||||
? new Date(data.finishedAt).toLocaleString('de-DE')
|
||||
: '-';
|
||||
|
||||
if (status === 'QUEUED' || status === 'RUNNING') {
|
||||
loaderEl.classList.remove('d-none');
|
||||
@@ -149,26 +259,22 @@
|
||||
stopPolling();
|
||||
}
|
||||
|
||||
if (status === 'FAILED' && data.errorMessage) {
|
||||
errorEl.classList.remove('d-none');
|
||||
errorEl.innerHTML =
|
||||
`<strong>Fehler:</strong><br>${data.errorMessage}`;
|
||||
if (status === 'FAILED' || status === 'ABORTED') {
|
||||
renderError(data.errorMessage || '');
|
||||
} else {
|
||||
renderError('');
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
stopPolling();
|
||||
}
|
||||
}
|
||||
|
||||
// Initial render from server state
|
||||
renderBadge("{{ job.status|upper }}");
|
||||
renderBadge({{ jobStatus|json_encode|raw }});
|
||||
|
||||
if (["QUEUED", "RUNNING"].includes("{{ job.status|upper }}")) {
|
||||
loaderEl.classList.remove('d-none');
|
||||
if ({{ isActiveJob ? 'true' : 'false' }}) {
|
||||
timer = setInterval(poll, 2000);
|
||||
}
|
||||
|
||||
})();
|
||||
</script>
|
||||
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user