X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d8c56aa6534d87105201372cd5f9f965a8246ea4..aa0ae05d87711be4ba005971677d4d28849f08b9:/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 fbce7f550b..bce713e880 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -1,4 +1,5 @@
module PipelineInstancesHelper
+
def pipeline_jobs object=nil
object ||= @object
if object.components[:steps].is_a? Array
@@ -15,11 +16,7 @@ module PipelineInstancesHelper
end
def render_pipeline_job pj
- if pj[:percent_done]
- pj[:progress_bar] = raw("
")
- elsif pj[:progress]
- raw("")
- end
+ pj[:progress_bar] = render partial: 'job_progress', locals: {:j => pj[:job]}
pj[:output_link] = link_to_if_arvados_object pj[:output]
pj[:job_link] = link_to_if_arvados_object pj[:job][:uuid]
pj
@@ -30,10 +27,25 @@ module PipelineInstancesHelper
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}
- 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]
@@ -63,20 +75,26 @@ module PipelineInstancesHelper
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[:labeltype] = 'danger'
pj[:failed] = true
elsif pj[:job][:started_at]
pj[:result] = 'running'
+ pj[:labeltype] = 'primary'
elsif pj[:job][:uuid]
pj[:result] = 'queued'
+ pj[:labeltype] = 'default'
else
pj[:result] = 'none'
+ pj[:labeltype] = 'default'
end
pj[:job_id] = pj[:job][:uuid]
pj[:script] = pj[:job][:script] || c[:script]
+ pj[:script_parameters] = pj[:job][:script_parameters] || c[:script_parameters]
pj[:script_version] = pj[:job][:script_version] || c[:script_version]
pj[:output] = pj[:job][:output]
pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)