X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7f2449727f36a2687f22be1b3587674a2eb8c7ed..fbbb1beaca00df2d1483087451b81ed3c40953a9:/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 766c1c47bc..c52d339158 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,22 +16,37 @@ 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
end
+
protected
def pipeline_jobs_newschool object
ret = []
i = -1
- object.components.each do |cname, c|
+
+ comp = []
+
+ template = PipelineTemplate.find(@object.pipeline_template_uuid) rescue nil
+ if template
+ order = PipelineTemplatesHelper::sort_components(template.components)
+ order.each do |k|
+ if object.components[k]
+ comp.push([k, object.components[k]])
+ end
+ end
+ else
+ object.components.each do |k, v|
+ comp.push([k, v])
+ end
+ end
+
+ comp.each do |cname, c|
+ puts cname, c
i += 1
pj = {index: i, name: cname}
pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}