3177: store input pdh value even when input dataclass is File. Update two tests to...

[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 ae8384eeeab84cb74d2e590f2300629ed1ccc6c9..b0d5216efd1588069050d5b0d5aa371abc07492d 100644 (file)
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -18,12 +18,12 @@ module PipelineInstancesHelper
   def render_pipeline_job pj
     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[:job_link] = link_to_if_arvados_object pj[:job][:uuid] if pj[:job]
     pj
   end
 
   # Merge (started_at, finished_at) time range into the list of time ranges in
-  # timestamps (timestamps must be sorted and non-overlapping).  
+  # timestamps (timestamps must be sorted and non-overlapping).
   # return the updated timestamps list.
   def merge_range timestamps, started_at, finished_at
     # in the comments below, 'i' is the entry in the timestamps array and 'j'
@@ -62,7 +62,7 @@ module PipelineInstancesHelper
 
     timestamps << [started_at, finished_at]
   end
-  
+
   # Accept a list of objects with [:started_at] and [:finshed_at] keys and
   # merge overlapping ranges to compute the time spent running after periods of
   # overlapping execution are factored out.
@@ -102,9 +102,14 @@ module PipelineInstancesHelper
       end
       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] : {}
-
+      elsif c[:job].is_a?(Hash)
+        pj[:job] = c[:job]
+        if pj[:job][:started_at].is_a? String
+          pj[:job][:started_at] = Time.parse(pj[:job][:started_at])
+        end
+        if pj[:job][:finished_at].is_a? String
+          pj[:job][:finished_at] = Time.parse(pj[:job][:finished_at])
+        end
         # If necessary, figure out the state based on the other fields.
         pj[:job][:state] ||= if pj[:job][:cancelled_at]
                                "Cancelled"
@@ -117,6 +122,8 @@ module PipelineInstancesHelper
                              else
                                "Queued"
                              end
+      else
+        pj[:job] = {}
       end
       pj[:percent_done] = 0
       pj[:percent_running] = 0
@@ -179,7 +186,7 @@ module PipelineInstancesHelper
       pj[:nondeterministic] = pj[:job][:nondeterministic] || c[:nondeterministic]
       pj[:output] = pj[:job][:output]
       pj[:output_uuid] = c[:output_uuid]
-      pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)
+      pj[:finished_at] = pj[:job][:finished_at]
       ret << pj
     end
     ret
@@ -262,7 +269,7 @@ module PipelineInstancesHelper
 
     if round_to_min and seconds >= 30
       minutes += 1
-    end    
+    end
 
     if use_words
       s = []