X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eaa436ddd4aadf4fad387ea6115e35c885828ce0..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 f314c658ce..35d28d542b 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,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}
@@ -61,23 +80,29 @@ module PipelineInstancesHelper
pj[:progress] = 0.0
end
end
- if pj[:job]
- if pj[:job][:success]
- pj[:result] = 'complete'
- pj[:complete] = true
- pj[:progress] = 1.0
- elsif pj[:job][:finished_at]
- pj[:result] = 'failed'
- pj[:failed] = true
- elsif pj[:job][:started_at]
- pj[:result] = 'running'
- else
- pj[:result] = 'queued'
- 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]
- pj[:script_version] = pj[:job][:script_version]
+ 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)
ret << pj