medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: Execution dialog would only show first result (#222) 

* bugfix: execution-dialog

* bugfix: execution-dialog
This commit is contained in:
James Read 2024-02-02 22:22:29 +01:00 committed by GitHub
parent 0c19ba59d2
commit 16acf9db91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webui/index.html
View File

@ -80,34 +80,34 @@
<dialog title = "Execution Results" id = "execution-results-popup">
<div class = "action-header">
<span role = "img" class = "icon"></span>
<span id = "execution-dialog-icon" class = "icon" role = "img"></span>
<h2>Log:
<span class = "title">?</span>
<span id = "execution-dialog-title">?</span>
</h2>
</div>
<p>
<strong>Started: </strong><span class = "datetimeStarted">unknown</span>.
<strong>Finished: </strong><span class = "datetimeFinished">unknown</span>
<strong>Started: </strong><span id = "execution-dialog-datetime-started">unknown</span>.
<strong>Finished: </strong><span id = "execution-dialog-datetime-finished">unknown</span>
</p>
<p>
<strong>Exit Code: </strong><span class = "exitCode">unknown</span>
<strong>Exit Code: </strong><span id = "execution-dialog-exit-code">unknown</span>
</p>
<p>
<strong>Status: </strong><span class = "status">unknown</span>
<strong>Status: </strong><span id = "execution-dialog-status">unknown</span>
</p>
<details>
<summary>stdout</summary>
<pre class = "stdout">
<summary>Output</summary>
<pre id = "execution-dialog-stdout">
?
</pre>
</details>
<details>
<summary>stderr</summary>
<pre class = "stderr">
<summary>Errors</summary>
<pre id = "execution-dialog-stderr">
?
</pre>
</details>

28
webui/js/ExecutionButton.js
View File

@ -18,35 +18,11 @@ class ExecutionButton extends window.HTMLElement {
}
show () {
if (window.executionDialog === undefined) {
if (typeof (window.executionDialog) === 'undefined') {
window.executionDialog = new ExecutionDialog()
}
const executionStatusArgs = {
executionUuid: this.executionUuid
}
window.executionDialog.constructFromJson(this.executionUuid)
window.executionDialog.show()
window.fetch(window.restBaseUrl + 'ExecutionStatus', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(executionStatusArgs)
}).then((res) => {
if (res.ok) {
return res.json()
} else {
throw new Error(res.statusText)
}
}
).then((json) => {
window.executionDialog.renderResult(json)
}).catch(err => {
window.executionDialog.renderError(err)
})
window.executionDialog.show(this.executionUuid)
}
onFinished (LogEntry) {

73
webui/js/ExecutionDialog.js
View File

@ -2,23 +2,56 @@
// the <dialog /> element out of index.html and just re-uses that - as only
// one dialog can be shown at a time.
export class ExecutionDialog {
constructFromJson (json) {
show (json) {
this.executionUuid = json
this.dlg = document.querySelector('dialog#execution-results-popup')
this.domIcon = this.dlg.querySelector('.icon')
this.domTitle = this.dlg.querySelector('.title')
this.domStdout = this.dlg.querySelector('.stdout')
this.domStderr = this.dlg.querySelector('.stderr')
this.domDatetimeStarted = this.dlg.querySelector('.datetimeStarted')
this.domDatetimeFinished = this.dlg.querySelector('.datetimeFinished')
this.domExitCode = this.dlg.querySelector('.exitCode')
this.domStatus = this.dlg.querySelector('.status')
this.domIcon = document.getElementById('execution-dialog-icon')
this.domTitle = document.getElementById('execution-dialog-title')
this.domStdout = document.getElementById('execution-dialog-stdout')
this.domStderr = document.getElementById('execution-dialog-stderr')
this.domDatetimeStarted = document.getElementById('execution-dialog-datetime-started')
this.domDatetimeFinished = document.getElementById('execution-dialog-datetime-finished')
this.domExitCode = document.getElementById('execution-dialog-exit-code')
this.domStatus = document.getElementById('execution-dialog-status')
this.domTitle.innerText = 'Loading...'
this.domExitCode.innerText = '?'
this.domStatus.className = ''
this.domDatetimeStarted.innerText = ''
this.domDatetimeFinished.innerText = ''
this.domStdout.innerText = ''
this.domStderr.innerText = ''
this.dlg.showModal()
this.fetchExecutionResult()
}
show () {
this.dlg.showModal()
fetchExecutionResult () {
const executionStatusArgs = {
executionUuid: this.executionUuid
}
window.fetch(window.restBaseUrl + 'ExecutionStatus', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(executionStatusArgs)
}).then((res) => {
if (res.ok) {
return res.json()
} else {
throw new Error(res.statusText)
}
}
).then((json) => {
this.renderResult(json)
}).catch(err => {
this.renderError(err)
})
}
renderResult (res) {
@ -26,15 +59,18 @@ export class ExecutionDialog {
if (res.logEntry.executionFinished) {
this.domStatus.innerText = 'Completed'
this.domStatus.classList.add('action-success')
this.domDatetimeFinished.innerText = res.logEntry.datetimeFinished
if (res.logEntry.blocked) {
this.domStatus.innerText = 'Blocked'
}
if (res.logEntry.timedOut) {
this.domExitCode.innerText = 'Timed out'
this.domStatus.innerText = 'Timed out'
this.domStatus.classList.add('action-timeout')
} else if (res.logEntry.blocked) {
this.domStatus.innerText = 'Blocked'
this.domStatus.classList.add('action-blocked')
} else if (res.logEntry.exitCode !== 0) {
this.domStatus.innerText = 'Non-Zero Exit'
this.domStatus.classList.add('action-nonzero-exit')
} else {
this.domExitCode.innerText = res.logEntry.exitCode
}
@ -47,13 +83,14 @@ export class ExecutionDialog {
this.domIcon.innerHTML = res.logEntry.actionIcon
this.domTitle.innerText = res.logEntry.actionTitle
this.domStdout.innerText = res.logEntry.stdout
this.domStdout.innerText = res.logEntry.stdout
if (res.logEntry.stderr === '') {
this.domStderr.parentElement.hidden = true
this.domStderr.parentElement.style.display = 'none'
this.domStderr.innerText = res.logEntry.stderr
} else {
this.domStderr.parentElement.hidden = false
this.domStderr.parentElement.style.display = 'block'
this.domStderr.innerText = res.logEntry.stderr
}

1
webui/style.css
View File

@ -296,6 +296,7 @@ input[type="submit"]:disabled {
.action-blocked {
transition: 1s;
background-color: purple;
color: white;
}
img.logo {