X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/de3b2f9a31e7d6df9fb53fff149f5ee43d1664d0..04bce28b705a6ca33d2c9b19aa783f588a99c8e0:/apps/workbench/app/helpers/pipeline_instances_helper.rb?ds=sidebyside

diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index b282723c88..b6df82fa9f 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -28,6 +28,14 @@ module PipelineInstancesHelper
     ret = []
     i = -1
 
+    jobuuids = object.components.values.map { |c|
+      c[:job][:uuid] if c.is_a?(Hash) and c[:job].is_a?(Hash)
+    }.compact
+    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}
@@ -35,7 +43,11 @@ module PipelineInstancesHelper
         ret << pj
         next
       end
-      pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+      if c[:job] and c[:job][:uuid] and job[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]
@@ -87,6 +99,7 @@ module PipelineInstancesHelper
       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[:output_uuid] = c[:output_uuid]
       pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)
       ret << pj
     end