+
- <%# column offset 3 %>
+ <%# column offset 2 %>
<%= pj[:progress_bar] %>
- <% if current_job %>
+ <%# column offset 4 %>
+ <% if not current_job %>
+
+ <% else %>
+
+ <% if (pipeline_display rescue nil) %>
+ <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
+ <% if current_job[:log] %>
+ <% logCollection = Collection.find? current_job[:log] %>
+ <% if logCollection %>
+ <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
+ <% else %>
+ Log unavailable
+ <% end %>
+ <% end %>
+ <% elsif current_job[:state] == "Running" %>
+ <% job = Job.find? current_job[:uuid] %>
+ <% if job %>
+ <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
+ <% else %>
+ Log unavailable
+ <% end %>
+ <% end %>
+ <% end %>
+
+
<%# column offset 5 %>
<% if current_job[:state] != "Queued" %>
<% if current_job[:started_at] %>
<% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
- <% cputime = tasks.map { |task|
- if task.started_at and task.job_uuid == current_job[:uuid]
- (if task.finished_at then task.finished_at else Time.now() end) - task.started_at
- else
- 0
- end
- }.reduce(:+) || 0 %>
- <%= render_runtime(walltime, false, false) %>
- <% if cputime > 0 %> / <%= render_runtime(cputime, false, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %>
+ <% cputime = (current_job[:runtime_constraints].andand[:min_nodes] || 1) *
+ ((current_job[:finished_at] || Time.now()) - current_job[:started_at]) %>
+ <%= render_runtime(walltime, false) %>
+ <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %>
<% end %>
<% end %>
@@ -39,18 +59,8 @@
<% if current_job[:state] == "Queued" %>
<%# column offset 5 %>
- <% queuetime = Time.now - current_job[:created_at] %>
- Queued for <%= render_runtime(queuetime, true) %>.
- <% begin %>
- <% if current_job[:queue_position] == 0 %>
- This job is next in the queue to run.
- <% elsif current_job[:queue_position] == 1 %>
- There is 1 job in the queue ahead of this one.
- <% else %>
- There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one.
- <% end %>
- <% rescue %>
- <% end %>
+ <% queuetime = Time.now - Time.parse(current_job[:created_at].to_s) %>
+ Queued for <%= render_runtime(queuetime, false) %>.
<% elsif current_job[:state] == "Running" %>
<%# column offset 8 %>
@@ -66,19 +76,19 @@
<%# column offset 8 %>
<% if pj[:output_uuid] %>
- <%= link_to_if_arvados_object pj[:output_uuid], friendly_name: true %>
+ <%= link_to_arvados_object_if_readable(pj[:output_uuid], 'Output data not available', friendly_name: true) %>
<% elsif current_job[:output] %>
- <%= link_to_if_arvados_object current_job[:output], link_text: "Output of #{pj[:name]}" %>
+ <%= link_to_arvados_object_if_readable(current_job[:output], 'Output data not available', link_text: "Output of #{pj[:name]}") %>
<% else %>
No output.
<% end %>
<% end %>
- <% if current_job[:state].in? ["Queued", "Running"] %>
+ <% if current_job[:state].in? ["Queued", "Running"] and @object.editable? %>
<%# column offset 11 %>
- <%= form_tag "/jobs/#{current_job[:uuid]}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
+ <%= form_tag "/jobs/#{current_job[:uuid]}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>
<%= hidden_field_tag :return_to, url_for(@object) %>
<%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-job-button"} %>
<% end %>
@@ -96,6 +106,15 @@
+ <% # link to repo tree/file only if the repo is readable
+ # and the commit is a sha1...
+ repo =
+ (/^[0-9a-f]{40}$/ =~ current_component[:script_version] and
+ Repository.where(name: current_component[:repository]).first)
+
+ # ...and the api server provides an http:// or https:// url
+ repo = nil unless repo.andand.http_fetch_url
+ %>
<% [:script, :repository, :script_version, :supplied_script_version, :nondeterministic].each do |k| %>
@@ -104,6 +123,12 @@
|
<% if current_component[k].nil? %>
(none)
+ <% elsif repo and k == :repository %>
+ <%= link_to current_component[k], show_repository_tree_path(id: repo.uuid, commit: current_component[:script_version], path: '/') %>
+ <% elsif repo and k == :script %>
+ <%= link_to current_component[k], show_repository_blob_path(id: repo.uuid, commit: current_component[:script_version], path: 'crunch_scripts/'+current_component[:script]) %>
+ <% elsif repo and k == :script_version %>
+ <%= link_to current_component[k], show_repository_commit_path(id: repo.uuid, commit: current_component[:script_version]) %>
<% else %>
<%= current_component[k] %>
<% end %>
@@ -124,7 +149,8 @@
docker_image_locator:
|
- <%= link_to_if_arvados_object current_component[:docker_image_locator], friendly_name: true %>
+ <%= link_to_arvados_object_if_readable(current_component[:docker_image_locator],
+ current_component[:docker_image_locator], friendly_name: true) %>
|
<% else %>
@@ -148,9 +174,9 @@
<% if k == :uuid %>
- <%= link_to_if_arvados_object current_component[k], link_text: current_component[k] %>
+ <%= link_to_arvados_object_if_readable(current_component[k], current_component[k], link_text: current_component[k]) %>
<% elsif k.to_s.end_with? 'uuid' %>
- <%= link_to_if_arvados_object current_component[k], friendly_name: true %>
+ <%= link_to_arvados_object_if_readable(current_component[k], current_component[k], friendly_name: true) %>
<% elsif k.to_s.end_with? '_at' %>
<%= render_localized_date(current_component[k]) %>
<% else %>
|