X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/991ff5eadf234141ddaa274c17c0262944e5d6ae..137c26497b8bf7454da2e62842e038f69569604b:/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 348004620e..35d28d542b 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -1,30 +1,4 @@
module PipelineInstancesHelper
- def pipeline_summary object=nil
- object ||= @object
- ret = {todo:0, running:0, queued:0, done:0, failed:0, total:0}
- object.components.values.each do |c|
- ret[:total] += 1
- case
- when !c[:job]
- ret[:todo] += 1
- when c[:job][:success]
- ret[:done] += 1
- when c[:job][:failed]
- ret[:failed] += 1
- when c[:job][:finished_at]
- ret[:running] += 1 # XXX finished but !success and !failed??
- when c[:job][:started_at]
- ret[:running] += 1
- else
- ret[:queued] += 1
- end
- end
- ret.merge! Hash[ret.collect do |k,v|
- [('percent_' + k.to_s).to_sym,
- ret[:total]<1 ? 0 : (100.0*v/ret[:total]).floor]
- end]
- ret
- end
def pipeline_jobs object=nil
object ||= @object
@@ -42,21 +16,39 @@ 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
+ def pipeline_log_history(job_uuids)
+ results = []
+
+ log_history = Log.where(event_type: 'stderr',
+ object_uuid: job_uuids).order('id DESC')
+ if !log_history.results.empty?
+ 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
+
protected
def pipeline_jobs_newschool object
ret = []
i = -1
+
object.components.each do |cname, c|
i += 1
pj = {index: i, name: cname}
@@ -90,17 +82,22 @@ 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]