optimize ui
add new ki endpoint params
This commit is contained in:
team2
@@ -1,32 +1,43 @@
|
||||
{% extends 'admin/base.html.twig' %}
|
||||
|
||||
{% block title %}Ingest Jobs{% endblock %}
|
||||
{% block title %}Indexierung (Ingest Jobs){% endblock %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<h1 class="h4 mb-4">Indexierung (Ingest Jobs-Liste)</h1>
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h1 class="h3">Indexierung (Ingest Jobs)</h1>
|
||||
|
||||
<form method="post"
|
||||
action="{{ path('admin_global_reindex') }}"
|
||||
onsubmit="return confirm('Global Reindex starten? Dies kann einige Zeit dauern.');">
|
||||
{% if is_granted('ROLE_SUPER_ADMIN') %}
|
||||
<form method="post"
|
||||
action="{{ path('admin_global_reindex') }}"
|
||||
onsubmit="return confirm('Global Reindex starten? Dies kann je nach Datenmenge mehrere Minuten dauern.');"
|
||||
class="mb-0">
|
||||
|
||||
<button type="submit"
|
||||
class="btn btn-danger mb-3">
|
||||
Global Reindex starten
|
||||
</button>
|
||||
</form>
|
||||
<input type="hidden"
|
||||
name="_token"
|
||||
value="{{ csrf_token('global_reindex') }}">
|
||||
|
||||
<button type="submit"
|
||||
class="btn btn-sm btn-outline-danger">
|
||||
Global Reindex starten
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if jobs is empty %}
|
||||
|
||||
<div class="alert alert-secondary">
|
||||
Keine Jobs vorhanden.
|
||||
Keine Ingest Jobs vorhanden.
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
|
||||
<div class="card bg-black text-info border-secondary">
|
||||
<div class="card bg-black border-secondary">
|
||||
<div class="card-body p-0">
|
||||
|
||||
<table class="table table-dark table-hover mb-0">
|
||||
<thead>
|
||||
<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>
|
||||
@@ -35,20 +46,26 @@
|
||||
<th>Version</th>
|
||||
<th>Gestartet</th>
|
||||
<th>Beendet</th>
|
||||
<th>User</th>
|
||||
<th>Benutzer</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
{% for job in jobs %}
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
<td class="small">
|
||||
<a href="{{ path('admin_job_show', {id: job.id}) }}"
|
||||
class="text-light">
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.id }}
|
||||
</a>
|
||||
</td>
|
||||
<td>{{ job.type }}</td>
|
||||
|
||||
<td>
|
||||
<span class="badge bg-info text-dark">
|
||||
{{ job.type }}
|
||||
</span>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if job.status == 'COMPLETED' %}
|
||||
@@ -60,52 +77,59 @@
|
||||
{% elseif job.status == 'FAILED' %}
|
||||
<span class="badge bg-danger">FAILED</span>
|
||||
{% else %}
|
||||
<span class="badge bg-secondary">{{ job.status }}</span>
|
||||
<span class="badge bg-dark border border-secondary">
|
||||
{{ job.status }}
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if job.documentId %}
|
||||
<a href="/admin/documents/{{ job.documentId }}" class="text-light">{{ job.documentId }}</a>
|
||||
<a href="{{ path('admin_document_show', {id: job.documentId}) }}"
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.documentId }}
|
||||
</a>
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if job.documentVersionId %}
|
||||
{{ job.documentVersionId }}
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
{{ job.documentVersionId ?? '-' }}
|
||||
</td>
|
||||
|
||||
<td>{{ job.startedAt|date('d.m.Y H:i:s') }}</td>
|
||||
|
||||
<td>
|
||||
{% if job.finishedAt %}
|
||||
{{ job.finishedAt|date('d.m.Y H:i:s') }}
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
<td class="small">
|
||||
{{ job.startedAt ? job.startedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if job.startedBy %}
|
||||
{{ job.startedBy.email }}
|
||||
{% else %}
|
||||
-
|
||||
{% endif %}
|
||||
<td class="small">
|
||||
{{ job.finishedAt ? job.finishedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</td>
|
||||
|
||||
<td class="small">
|
||||
{{ job.startedBy ? job.startedBy.email : '-' }}
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="8" class="text-center text-secondary py-4">
|
||||
Keine Jobs gefunden.
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
|
||||
<div class="mt-4 small text-secondary">
|
||||
Hinweis: Während laufender Jobs (Status RUNNING) sollten keine
|
||||
parallelen Reindex-Prozesse gestartet werden.
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -4,48 +4,38 @@
|
||||
|
||||
{% block body %}
|
||||
|
||||
<a href="{{ path('admin_jobs') }}"
|
||||
class="btn btn-sm btn-outline-light mb-3">
|
||||
← Zurück
|
||||
</a>
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h1 class="h3 mb-0">Ingest Job</h1>
|
||||
|
||||
<h1 class="h4 mb-4">Ingest Job</h1>
|
||||
<a href="{{ path('admin_jobs') }}"
|
||||
class="btn btn-sm btn-outline-secondary">
|
||||
Zurück zur Übersicht
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="card bg-black text-info border-secondary">
|
||||
<div class="card bg-black border-secondary text-light">
|
||||
<div class="card-body">
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>ID:</strong> {{ job.id }}
|
||||
<strong>ID:</strong>
|
||||
<span class="small text-light">{{ job.id }}</span>
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
<strong>Typ:</strong> {{ job.type }}
|
||||
<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">
|
||||
{% 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">ABORTED</span>
|
||||
{% else %}
|
||||
<span class="badge bg-secondary">{{ job.status }}</span>
|
||||
{% endif %}
|
||||
</span>
|
||||
<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">
|
||||
class="text-light text-decoration-none">
|
||||
{{ job.documentId }}
|
||||
</a>
|
||||
{% else %}
|
||||
@@ -66,8 +56,8 @@
|
||||
<div class="mb-2">
|
||||
<strong>Beendet:</strong>
|
||||
<span id="job-finished-at">
|
||||
{{ job.finishedAt ? job.finishedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</span>
|
||||
{{ job.finishedAt ? job.finishedAt|date('d.m.Y H:i:s') : '-' }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="mb-2">
|
||||
@@ -75,32 +65,33 @@
|
||||
{{ job.startedBy ? job.startedBy.email : '-' }}
|
||||
</div>
|
||||
|
||||
{# Loader #}
|
||||
<div id="job-loader"
|
||||
class="mt-3"
|
||||
style="{% if job.status in ['QUEUED','RUNNING'] %}{% else %}display:none;{% endif %}">
|
||||
class="mt-3 d-none">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<div class="spinner-border spinner-border-sm text-info" role="status"></div>
|
||||
<div>
|
||||
<strong>Prozess läuft…</strong><br>
|
||||
<small class="text-secondary">
|
||||
Diese Seite aktualisiert den Status automatisch.
|
||||
Der Status wird automatisch aktualisiert.
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# Fehlerbereich #}
|
||||
<div id="job-error"
|
||||
class="alert alert-danger mt-3"
|
||||
style="{% if job.status == 'FAILED' %}{% else %}display:none;{% endif %}">
|
||||
{% if job.errorMessage %}
|
||||
<strong>Fehler:</strong><br>
|
||||
{{ job.errorMessage }}
|
||||
{% endif %}
|
||||
class="alert alert-danger mt-3 d-none">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</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.
|
||||
</div>
|
||||
|
||||
<script>
|
||||
(function () {
|
||||
|
||||
@@ -112,31 +103,27 @@
|
||||
|
||||
let timer = null;
|
||||
|
||||
function renderBadge(status) {
|
||||
const map = {
|
||||
COMPLETED: 'bg-success',
|
||||
QUEUED: 'bg-secondary',
|
||||
RUNNING: 'bg-warning text-dark',
|
||||
FAILED: 'bg-danger',
|
||||
ABORTED: 'bg-dark'
|
||||
};
|
||||
|
||||
const css = map[status] || 'bg-secondary';
|
||||
badgeWrap.innerHTML =
|
||||
`<span class="badge ${css}">${status}</span>`;
|
||||
}
|
||||
|
||||
function stopPolling() {
|
||||
if (timer !== null) {
|
||||
if (timer) {
|
||||
clearInterval(timer);
|
||||
timer = null;
|
||||
}
|
||||
}
|
||||
|
||||
function setBadge(status) {
|
||||
let html = '';
|
||||
if (status === 'COMPLETED')
|
||||
html = '<span class="badge bg-success">COMPLETED</span>';
|
||||
else if (status === 'QUEUED')
|
||||
html = '<span class="badge bg-secondary">QUEUED</span>';
|
||||
else if (status === 'RUNNING')
|
||||
html = '<span class="badge bg-warning text-dark">RUNNING</span>';
|
||||
else if (status === 'FAILED')
|
||||
html = '<span class="badge bg-danger">FAILED</span>';
|
||||
else if (status === 'ABORTED')
|
||||
html = '<span class="badge bg-dark">ABORTED</span>';
|
||||
else
|
||||
html = '<span class="badge bg-secondary">' + status + '</span>';
|
||||
|
||||
badgeWrap.innerHTML = html;
|
||||
}
|
||||
|
||||
async function poll() {
|
||||
try {
|
||||
const res = await fetch(statusUrl);
|
||||
@@ -145,23 +132,24 @@
|
||||
const data = await res.json();
|
||||
const status = (data.status || '').toUpperCase();
|
||||
|
||||
setBadge(status);
|
||||
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.style.display = '';
|
||||
loaderEl.classList.remove('d-none');
|
||||
} else {
|
||||
loaderEl.style.display = 'none';
|
||||
loaderEl.classList.add('d-none');
|
||||
stopPolling();
|
||||
}
|
||||
|
||||
if (status === 'FAILED' && data.errorMessage) {
|
||||
errorEl.style.display = '';
|
||||
errorEl.classList.remove('d-none');
|
||||
errorEl.innerHTML =
|
||||
'<strong>Fehler:</strong><br>' + data.errorMessage;
|
||||
`<strong>Fehler:</strong><br>${data.errorMessage}`;
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
@@ -169,8 +157,13 @@
|
||||
}
|
||||
}
|
||||
|
||||
timer = setInterval(poll, 1000);
|
||||
poll();
|
||||
// Initial render from server state
|
||||
renderBadge("{{ job.status|upper }}");
|
||||
|
||||
if (["QUEUED","RUNNING"].includes("{{ job.status|upper }}")) {
|
||||
loaderEl.classList.remove('d-none');
|
||||
timer = setInterval(poll, 2000);
|
||||
}
|
||||
|
||||
})();
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user