v1.0.71: finished status shows instance name
This commit is contained in:
@@ -242,7 +242,7 @@ function showParams(opId,opName){
|
||||
});
|
||||
}
|
||||
|
||||
function setFinishedState(statusText, statusClass, statusError, statusDuration){
|
||||
function setFinishedState(statusText, statusClass, statusError, statusDuration, instanceName){
|
||||
const btn=document.getElementById('btn-test');
|
||||
btn.disabled=false;
|
||||
btn.textContent='Готово';
|
||||
@@ -250,7 +250,8 @@ function setFinishedState(statusText, statusClass, statusError, statusDuration){
|
||||
const opName=selectedOp?.opName||'операция';
|
||||
const durationText=statusDuration!==undefined&&statusDuration!==null?`${statusDuration}s`:'0s';
|
||||
const extra=statusError||'';
|
||||
document.getElementById('test-status').innerHTML=` <span class="badge ${statusClass}">${statusText}</span> <span style="color:var(--muted);">${opName}</span> <span style="color:var(--muted);">${durationText}</span> ${extra}`;
|
||||
const instName=instanceName||findInstName()||selectedInst||'';
|
||||
document.getElementById('test-status').innerHTML=` <span class="badge ${statusClass}">${statusText}</span> <span style="color:var(--muted);">${opName}</span> <span style="color:var(--muted);">${durationText}</span> <span style="color:var(--muted);">${instName}</span> ${extra}`;
|
||||
}
|
||||
|
||||
function setRunningState(opName, displayName){
|
||||
@@ -289,13 +290,14 @@ async function executeOp(params){
|
||||
if(d.status==='FAIL'){document.getElementById('test-status').innerHTML=` <span class="badge">FAIL</span> ${d.error||''}`;btn.disabled=false;return;}
|
||||
// start polling
|
||||
const opUid=d.opUid;
|
||||
const instanceName=d.displayName||displayName;
|
||||
pollTimer=setInterval(async()=>{
|
||||
const sr=await fetch('/api/test/status/'+opUid);
|
||||
const sd=await sr.json();
|
||||
showStages(sd.stages||[]);
|
||||
if(sd.status!=='RUNNING'){
|
||||
stopPoll();
|
||||
setFinishedState(sd.status, sd.status==='OK'?'badge-success':'badge', sd.error, sd.duration);
|
||||
setFinishedState(sd.status, sd.status==='OK'?'badge-success':'badge', sd.error, sd.duration, instanceName);
|
||||
if(sd.status==='OK'){
|
||||
await refreshInstances();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user