X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4eaf39dbe947beaaa87e656b470d7f21880ba607..789e1eb86b5286f3d34b112e0ab802bd3a2793b2:/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 9d1a0c3e6c..b0d5216efd 100644
--- 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,8 +102,28 @@ module PipelineInstancesHelper
end
if c[:job] and c[:job][:uuid] and job[c[:job][:uuid]]
pj[:job] = job[c[:job][:uuid]]
+ 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"
+ elsif pj[:job][:success] == false
+ "Failed"
+ elsif pj[:job][:success] == true
+ "Complete"
+ elsif pj[:job][:running] == true
+ "Running"
+ else
+ "Queued"
+ end
else
- pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+ pj[:job] = {}
end
pj[:percent_done] = 0
pj[:percent_running] = 0
@@ -132,19 +152,25 @@ module PipelineInstancesHelper
pj[:progress] = 0.0
end
end
- if pj[:job][:success]
+
+ case pj[:job][:state]
+ when 'Complete'
pj[:result] = 'complete'
pj[:labeltype] = 'success'
pj[:complete] = true
pj[:progress] = 1.0
- elsif pj[:job][:finished_at]
+ when 'Failed'
pj[:result] = 'failed'
pj[:labeltype] = 'danger'
pj[:failed] = true
- elsif pj[:job][:started_at]
+ when 'Cancelled'
+ pj[:result] = 'cancelled'
+ pj[:labeltype] = 'danger'
+ pj[:failed] = true
+ when 'Running'
pj[:result] = 'running'
pj[:labeltype] = 'primary'
- elsif pj[:job][:uuid]
+ when 'Queued'
pj[:result] = 'queued'
pj[:labeltype] = 'default'
else
@@ -160,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
@@ -218,7 +244,6 @@ module PipelineInstancesHelper
HOUR = 60 * MINUTE
DAY = 24 * HOUR
-
def render_runtime duration, use_words, round_to_min=true
days = 0
hours = 0
@@ -247,38 +272,38 @@ module PipelineInstancesHelper
end
if use_words
- s = ""
+ s = []
if days > 0 then
- s += "#{day} day#{'s' if days != 1}"
+ s << "#{days} day#{'s' if days != 1}"
end
if hours > 0 then
- s += " #{hours} hour#{'s' if hours != 1}"
+ s << "#{hours} hour#{'s' if hours != 1}"
end
if minutes > 0 then
- s += " #{minutes} minute#{'s' if minutes != 1}"
+ s << "#{minutes} minute#{'s' if minutes != 1}"
end
- if seconds > 0 and not round_to_min
- s += " #{seconds} second#{'s' if seconds != 1}"
+ if not round_to_min or s.size == 0
+ s << "#{seconds} second#{'s' if seconds != 1}"
end
+ s = s * " "
else
s = ""
if days > 0
- s += "#{days}d#{hours.to_s.rjust(2, '0')}h"
- elsif (hours > 0)
- s += "#{hours}h"
+ s += "#{days}d "
end
if (hours > 0)
- s += "#{minutes.to_s.rjust(2, '0')}m"
- else
- s += "#{minutes}m"
+ s += "#{hours}h"
end
+
+ s += "#{minutes}m"
+
if not round_to_min
- s += "#{seconds.to_s.rjust(2, '0')}s"
+ s += "#{seconds}s"
end
end
- s
+ raw(s)
end
end