X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4bf9e0c663789cbb748e628e8e86a8ea9ab047c5..8b95d2e5cb658d61d68262df278653261bd9791c:/apps/workbench/app/views/jobs/_show_status.html.erb diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb index 99f24142ce..807520940c 100644 --- a/apps/workbench/app/views/jobs/_show_status.html.erb +++ b/apps/workbench/app/views/jobs/_show_status.html.erb @@ -1,94 +1,36 @@ +
+<%= + pj = {} + pj[:job] = @object + pj[:name] = @object[:name] || "this job" + pj[:progress_bar] = render(partial: "job_progress", + locals: {:j => @object }) + tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results + render(partial: 'pipeline_instances/running_component', + locals: { tasks: tasks, pj: pj, i: 0, expanded: true}) +%> -- script, version - | - progress - <%# format:'js' here helps browsers avoid using the cached js - content in html context (e.g., duplicate tab -> see - javascript) %> - <%= link_to '(refresh)', {format: :js}, {class: 'refresh hide', remote: true, method: 'get'} %> - | -- | - output - | -|
---|---|---|---|---|
- <%= @object[:script] %> - <%= @object[:script_version] %> - |
-
- <%= render partial: 'job_progress', locals: {:j => @object} %>
- <% if @object.running == false %>
- <% if @object[:job].andand[:uuid] %>
-
- <%= link_to("..."+@object[:job][:uuid].last(15), job_url(id: @object[:job][:uuid])) %>
-
+
+
+ Used in pipelines
+
+
+ <% pi = PipelineInstance.order("created_at desc").filter([["components", "like", "%#{@object.uuid}%"]]) %>
- <% current_job = @object %>
- <% if current_job.andand[:log] %>
- <% fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(current_job[:log])%>
- <% Collection.limit(1).where(uuid: fixup[1]).each do |c| %>
- <% c.files.each do |file| %>
- - log - - <% end %> - <% end %> - <% end %> - <% end %> + <% pi.each do |pipeline| %> + <% pipeline.components.each do |k, v| %> + <% if v[:job] and v[:job][:uuid] == @object.uuid %> +
+ <%= k %>
+ component of
+ <%= link_to_if_arvados_object pipeline, friendly_name: true %>
+ created at
+ <%= render_localized_date(pipeline.created_at) %>.
+
<% end %>
- | - <%= render(partial: 'job_status_label', - locals: { :j => @object }) %> - | - <%= link_to_if_arvados_object @object[:output], {:thumbnail => true} %> - | -|