projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3136: Fetch actual job objects for use in rendering pipeline jobs.
[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 e3a2b62a4dfd228c68064b78df9037cf17083168..bce713e880d08943c1a22a3fba9b196ed61cc96a 100644
(file)
--- a/
apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/
apps/workbench/app/helpers/pipeline_instances_helper.rb
@@
-22,17
+22,30
@@
module PipelineInstancesHelper
pj
end
pj
end
-
protected
def pipeline_jobs_newschool object
ret = []
i = -1
protected
def pipeline_jobs_newschool object
ret = []
i = -1
+ jobuuids = object.components.select { |cname, c| c[:job] and c[:job][:uuid] }
+ job = {}
+ Job.where(uuid: jobuuids).each do |j|
+ job[j[:uuid]] = j
+ end
+
object.components.each do |cname, c|
i += 1
pj = {index: i, name: cname}
object.components.each do |cname, c|
i += 1
pj = {index: i, name: cname}
- pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+ if not c.is_a?(Hash)
+ ret << pj
+ next
+ end
+ if c[:job] and c[:job][:uuid]
+ pj[:job] = job[c[:job][:uuid]]
+ else
+ pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+ end
pj[:percent_done] = 0
pj[:percent_running] = 0
if pj[:job][:success]
pj[:percent_done] = 0
pj[:percent_running] = 0
if pj[:job][:success]
@@
-62,17
+75,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]