Show script results directly on order details
This commit is contained in:
@@ -58,7 +58,7 @@ function OutputChannel({ value, name, nativePowerShell }: { value: unknown; name
|
||||
}
|
||||
export function ConsoleOutput({ job }: { job: RecordValue }) {
|
||||
const state = stringField(job, 'state');
|
||||
return <section aria-label="Gespeichertes Konsolenergebnis"><h3>Konsolenergebnis</h3>
|
||||
return <section aria-label="Gespeichertes Konsolenergebnis">
|
||||
{state === 'unknown' && <p className="warning">Wirkung unklar. Ein weiterer Versuch benötigt einen Abgleich und einen neuen genehmigten Plan.</p>}
|
||||
{job.cancel_requested === true && <p className="warning">Abbruch angefordert. Die Rückmeldung des Geräts steht aus.</p>}
|
||||
{job.pending_reason != null && <p>Wartegrund: {String(job.pending_reason)}</p>}
|
||||
|
||||
+31
-14
@@ -375,23 +375,39 @@ function OperationDetail({ tenantId, id, auth, openPlan, customerName }: {
|
||||
if (!data) return <section data-operation-id={id}><ErrorBox error={op.error}/>{!op.error && <p>Auftrag wird geladen …</p>}</section>;
|
||||
const names = targets(data);
|
||||
const jobs = Array.isArray(data.jobs) ? data.jobs.map(j => record(j)) : [];
|
||||
const singleJob = jobs.length === 1 ? jobs[0] : null;
|
||||
const name = (job: RecordValue) => {
|
||||
const target = names.find(t => t.asset_id === job.asset_id && t.agent_id === job.agent_id);
|
||||
return target ? deviceName(target) : display(job.asset_id, 'Gerät unbekannt');
|
||||
};
|
||||
const selected = jobs.find(job => job.job_id === jobId);
|
||||
return <section data-operation-id={id}><ErrorBox error={op.error}/><h2>{orderTitle(data)}</h2>
|
||||
<dl className="facts"><Fact label="Kunde">{display(data.customer_name, customerName)}</Fact>
|
||||
<Fact label="Status"><Status value={statusOf(data)}/></Fact><Fact label="Eingereicht">{when(data.created_at)}</Fact>
|
||||
<Fact label="Antragsteller"><Requester id={data.requester} ownId={auth.principal.id}/></Fact>
|
||||
<Fact label="Anlass">{display(data.reason, 'Kein Anlass angegeben')}</Fact></dl>
|
||||
<h3>Geräte und Ergebnisse</h3>
|
||||
{jobs.length ? <ul className="job-list">{jobs.map(job => <li key={objectId(job,'job')}>
|
||||
<button className="link" data-job-id={job.job_id} onClick={() => setJobId(objectId(job,'job'))}>{name(job)}</button>
|
||||
<Status value={job.state}/></li>)}</ul>
|
||||
: <><p>{names.map(deviceName).join(', ')}</p><p className="muted">{data.approval_state === 'pending_approval'
|
||||
? 'Nach der Genehmigung erscheint hier der Fortschritt je Gerät.' : 'Für diesen Auftrag liegen keine Ausführungen vor.'}</p></>}
|
||||
{selected && jobId && <JobDetail key={jobId} tenantId={tenantId} id={jobId} hostname={name(selected)} auth={auth}/>}
|
||||
{singleJob ? <JobDetail key={objectId(singleJob, 'job')} tenantId={tenantId}
|
||||
id={objectId(singleJob, 'job')} hostname={name(singleJob)} auth={auth}/>
|
||||
: <div className="order-results">
|
||||
<h3>Geräte und Ergebnisse</h3>
|
||||
{jobs.length ? <ul className="job-list">{jobs.map(job => {
|
||||
const resultId = objectId(job, 'job');
|
||||
const hostname = name(job);
|
||||
const expanded = jobId === resultId;
|
||||
const action = expanded ? 'Ergebnis schließen' : 'Ergebnis anzeigen';
|
||||
return <li key={resultId}>
|
||||
<div className="job-row">
|
||||
<strong>{hostname}</strong>
|
||||
<Status value={job.state}/>
|
||||
<button type="button" data-job-id={resultId} aria-expanded={expanded}
|
||||
aria-label={action + ' für ' + hostname}
|
||||
onClick={() => setJobId(expanded ? null : resultId)}>{action}</button>
|
||||
</div>
|
||||
{expanded && <JobDetail tenantId={tenantId} id={resultId} hostname={hostname} auth={auth}/>}
|
||||
</li>;
|
||||
})}</ul>
|
||||
: <><p>{names.map(deviceName).join(', ')}</p><p className="muted">{data.approval_state === 'pending_approval'
|
||||
? 'Nach der Genehmigung erscheint hier der Fortschritt je Gerät.' : 'Für diesen Auftrag liegen keine Ausführungen vor.'}</p></>}
|
||||
</div>}
|
||||
{allowed(auth, 'plans:approve') && <button className="quiet" onClick={() => openPlan(objectId(data,'plan'))}>
|
||||
{data.approval_state === 'pending_approval' ? 'Antrag prüfen' : 'Genehmigungsdetail öffnen'}
|
||||
</button>}
|
||||
@@ -401,18 +417,19 @@ function OperationDetail({ tenantId, id, auth, openPlan, customerName }: {
|
||||
function JobDetail({ tenantId, id, auth, hostname }: { tenantId: string; id: string; auth: Session; hostname: string }) {
|
||||
const job = useResource(async signal => record(await request(tenantPath(tenantId, '/jobs/'+encodeURIComponent(id)), { signal })), [tenantId, id], true);
|
||||
const [error, setError] = useState<string | null>(null), [busy, setBusy] = useState(false);
|
||||
if (job.error) return <ErrorBox error={job.error}/>;
|
||||
const state = job.data?.state;
|
||||
const data = job.error ? null : job.data;
|
||||
const state = data?.state;
|
||||
const terminal = ['succeeded','failed','cancelled','expired','unknown','closed_unknown'];
|
||||
return <article data-job-id={id}><h3>Ergebnis für {hostname}</h3><ErrorBox error={job.error ?? error}/>
|
||||
{job.data && <><ConsoleOutput job={job.data}/><JsonView value={job.data} label="Technische Ausführungsdaten"/></>}
|
||||
{job.data && allowed(auth,'jobs:cancel') && !terminal.includes(String(state)) && !job.data.cancel_requested && <details><summary>Abbruch anfordern</summary>
|
||||
return <article className="job-result" data-job-id={id}><h3>Ergebnis für {hostname}</h3><ErrorBox error={job.error ?? error}/>
|
||||
{!data && !job.error && <p>Ergebnis wird geladen …</p>}
|
||||
{data && <><ConsoleOutput job={data}/><JsonView value={data} label="Technische Ausführungsdaten"/></>}
|
||||
{data && allowed(auth,'jobs:cancel') && !terminal.includes(String(state)) && !data.cancel_requested && <details><summary>Abbruch anfordern</summary>
|
||||
<form onSubmit={async e => {e.preventDefault(); const reason = new FormData(e.currentTarget).get('reason'); setBusy(true); setError(null);
|
||||
try {await request(tenantPath(tenantId, '/jobs/'+encodeURIComponent(id)+'/cancel'), { csrf:auth.csrf_token, body:{reason} }); job.reload();}
|
||||
catch (e) {setError(errorText(e));} finally {setBusy(false);}
|
||||
}}><label>Abbruchgrund<input name="reason" required/></label><button disabled={busy}>Abbruch anfordern</button></form>
|
||||
</details>}
|
||||
{job.data && state === 'unknown' && <UnknownClosure tenantId={tenantId} id={id} job={job.data} auth={auth} done={job.reload}/>}
|
||||
{data && state === 'unknown' && <UnknownClosure tenantId={tenantId} id={id} job={data} auth={auth} done={job.reload}/>}
|
||||
</article>;
|
||||
}
|
||||
function UnknownClosure({ tenantId, id, job, auth, done }: { tenantId: string; id: string; job: RecordValue; auth: Session; done: () => void }) {
|
||||
|
||||
+12
-1
@@ -110,7 +110,18 @@ section.fleet { padding:0; overflow:hidden; }
|
||||
.selection > div { flex:1; }
|
||||
.facts { display:grid; grid-template-columns:repeat(auto-fit,minmax(175px,1fr)); gap:18px 24px; margin-bottom:0; }
|
||||
.facts dt { color:var(--subtle); font-size:.82rem; } .facts dd { margin:2px 0; font-weight:600; }
|
||||
.job-list { list-style:none; padding:0; } .job-list li { display:flex; align-items:center; gap:10px; flex-wrap:wrap; padding:8px 0; border-top:1px solid var(--line); }
|
||||
.order-results { margin-top:24px; }
|
||||
.job-list { list-style:none; padding:0; }
|
||||
.job-list > li { padding:8px 0; border-top:1px solid var(--line); }
|
||||
.job-row { display:flex; align-items:center; gap:10px; flex-wrap:wrap; }
|
||||
.job-row strong { flex:1 1 8rem; }
|
||||
.job-row button { margin:0; }
|
||||
.job-result { margin-top:22px; border-color:#b9d5c8; background:#f2f8f5; }
|
||||
.job-result > h3 { font-size:1.15rem; }
|
||||
.job-result > section { margin:0; padding:0; border:0; background:none; }
|
||||
.job-result > section > p:first-child { margin-top:0; }
|
||||
.job-result .console-output { background:var(--surface); }
|
||||
.job-list .job-result { margin:8px 0 2px; }
|
||||
.device-detail > .quiet { margin-bottom:18px; }
|
||||
.sr-only { position:absolute; width:1px; height:1px; margin:-1px; padding:0; overflow:hidden; clip:rect(0,0,0,0); white-space:nowrap; border:0; }
|
||||
@media(max-width:1100px) and (min-width:761px) { .workbench {grid-template-columns:165px minmax(0,1fr);} .content {padding-left:18px;padding-right:18px;} .brand {font-size:1rem;} .fleet-table th,.fleet-table td {padding-inline:6px;} }
|
||||
|
||||
Reference in New Issue
Block a user