Merge branch 'master' into 2756-eventbus-in-workbench

[arvados.git] / 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 c52d33915822f717d047c9335544e4e3b68de2d8..7b6fb727637fc6dc0e56fac95c303321bf050abc 100644 (file)
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -22,6 +22,26 @@ module PipelineInstancesHelper
     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
 
@@ -29,24 +49,7 @@ module PipelineInstancesHelper
     ret = []
     i = -1
 
-    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
+    object.components.each do |cname, c|
       i += 1
       pj = {index: i, name: cname}
       pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}