Merge branch '10029-wb-send-request-id'

[arvados.git] / apps / workbench / app / models / pipeline_instance_work_unit.rb

diff --git a/apps/workbench/app/models/pipeline_instance_work_unit.rb b/apps/workbench/app/models/pipeline_instance_work_unit.rb
index 8285424a2982c0f0630f01abc509619e6b556918..dd5685ac3d8082d5a5836896afa310b416e728f2 100644 (file)
--- a/apps/workbench/app/models/pipeline_instance_work_unit.rb
+++ b/apps/workbench/app/models/pipeline_instance_work_unit.rb
@@ -1,11 +1,11 @@
 class PipelineInstanceWorkUnit < ProxyWorkUnit
   def children
-    return self.my_children if self.my_children
+    return @my_children if @my_children
 
     items = []
 
     jobs = {}
-    results = Job.where(uuid: self.proxied.job_ids.values).results
+    results = Job.where(uuid: @proxied.job_ids.values).results
     results.each do |j|
       jobs[j.uuid] = j
     end
@@ -21,15 +21,26 @@ class PipelineInstanceWorkUnit < ProxyWorkUnit
             items << JobWorkUnit.new(job, name)
           end
         else
-          items << ProxyWorkUnit.new(c, name)
+          items << JobWorkUnit.new(c, name)
         end
       else
-        self.unreadable_children = true
+        @unreadable_children = true
         break
       end
     end
 
-    self.my_children = items
+    @my_children = items
+  end
+
+  def outputs
+    items = []
+    components = get(:components)
+    components.each do |name, c|
+      if c.is_a?(Hash)
+        items << c[:output_uuid] if c[:output_uuid]
+      end
+    end
+    items
   end
 
   def uri
@@ -40,4 +51,8 @@ class PipelineInstanceWorkUnit < ProxyWorkUnit
   def title
     "pipeline"
   end
+
+  def template_uuid
+    get(:pipeline_template_uuid)
+  end
 end