Merge branch 'master' into 3112-report-bug

[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..b282723c88d0dad6b7a9722bc88febbbb1335ae0 100644 (file)
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -22,33 +22,19 @@ module PipelineInstancesHelper
     pj
   end
 
-
   protected
 
   def pipeline_jobs_newschool object
     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}
+      if not c.is_a?(Hash)
+        ret << pj
+        next
+      end
       pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
       pj[:percent_done] = 0
       pj[:percent_running] = 0
@@ -79,17 +65,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]