projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3140-project-content-tabs
[arvados.git]
/
apps
/
workbench
/
app
/
helpers
/
pipeline_instances_helper.rb
diff --git
a/apps/workbench/app/helpers/pipeline_instances_helper.rb
b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index db2a467b7e00bc2fee3675646ebd9e010bed7724..35d28d542b05ad8a9c71a94fc43fd1f5928d47f9 100644
(file)
--- a/
apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/
apps/workbench/app/helpers/pipeline_instances_helper.rb
@@
-22,13
+22,22
@@
module PipelineInstancesHelper
pj
end
pj
end
- def pip
i
eline_log_history(job_uuids)
+ def pipeline_log_history(job_uuids)
results = []
results = []
- log_history = Log.where(event_type: '
transient-log-entry
',
- object_uuid: job_uuids).order('id DESC')
.limit(5).all
+ log_history = Log.where(event_type: '
stderr
',
+ object_uuid: job_uuids).order('id DESC')
if !log_history.results.empty?
if !log_history.results.empty?
- results = log_history.results.reverse
+ reversed_results = log_history.results.reverse
+ reversed_results.each do |entry|
+ if entry.andand.properties
+ properties = entry.properties
+ text = properties[:text]
+ if text
+ results = results.concat text.split("\n")
+ end
+ end
+ end
end
return results
end
return results
@@
-73,17
+82,22
@@
module PipelineInstancesHelper
end
if pj[:job][:success]
pj[:result] = 'complete'
end
if pj[:job][:success]
pj[:result] = 'complete'
+ pj[:labeltype] = 'success'
pj[:complete] = true
pj[:progress] = 1.0
elsif pj[:job][:finished_at]
pj[:result] = 'failed'
pj[:complete] = true
pj[:progress] = 1.0
elsif pj[:job][:finished_at]
pj[:result] = 'failed'
+ pj[:labeltype] = 'danger'
pj[:failed] = true
elsif pj[:job][:started_at]
pj[:result] = 'running'
pj[:failed] = true
elsif pj[:job][:started_at]
pj[:result] = 'running'
+ pj[:labeltype] = 'primary'
elsif pj[:job][:uuid]
pj[:result] = 'queued'
elsif pj[:job][:uuid]
pj[:result] = 'queued'
+ pj[:labeltype] = 'default'
else
pj[:result] = 'none'
else
pj[:result] = 'none'
+ pj[:labeltype] = 'default'
end
pj[:job_id] = pj[:job][:uuid]
pj[:script] = pj[:job][:script] || c[:script]
end
pj[:job_id] = pj[:job][:uuid]
pj[:script] = pj[:job][:script] || c[:script]