lee/OliveTin
1
0
Fork 0
mirror of https://github.com/OliveTin/OliveTin synced 2025-12-13 09:35:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bugfix: Fixed crash when requesting execution status that could not be found (NPE) (#440)

Browse Source
This commit is contained in:
James Read
2024-10-15 11:48:55 +01:00
committed by GitHub
parent de81ec00fd
commit 32b5fee108
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/grpcapi/grpcApi.go
View File

@@ -213,12 +213,13 @@ func (api *oliveTinAPI) ExecutionStatus(ctx ctx.Context, req *pb.ExecutionStatus
if req.ExecutionTrackingId != "" { if req.ExecutionTrackingId != "" {
ile = getExecutionStatusByTrackingID(api, req.ExecutionTrackingId) ile = getExecutionStatusByTrackingID(api, req.ExecutionTrackingId)
} else { } else {
ile = getMostRecentExecutionStatusById(api, req.ActionId) ile = getMostRecentExecutionStatusById(api, req.ActionId)
} }
if ile == nil { if ile == nil {
return nil, status.Errorf(codes.NotFound, "Execution not found.") return nil, status.Error(codes.NotFound, "Execution not found")
} else { } else {
res.LogEntry = internalLogEntryToPb(ile) res.LogEntry = internalLogEntryToPb(ile)
} }

2
webui.dev/js/marshaller.js
View File

@@ -407,7 +407,7 @@ function marshalMreOutput (dashboardComponent, fieldset) {
}) })
const updateMre = (pre, json) => { const updateMre = (pre, json) => {
pre.innerHTML = json.stdout pre.innerHTML = json.output
} }
window.addEventListener('ExecutionFinished', (e) => { window.addEventListener('ExecutionFinished', (e) => {