X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/52838f7dfc576e8a11411fd9f1710a758573a6e7..f2574ec2e4ddef03c9504cd58741e73426ea1b17:/apps/workbench/app/views/pipeline_instances/_show_components.html.erb diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb index 395ef77369..b3b5402741 100644 --- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb @@ -1,47 +1,28 @@ <% content_for :css do %> - .pipeline_color_legend { - padding-left: 1em; - padding-right: 1em; - } -table.pipeline-components-table { - width: 100%; - table-layout: fixed; - overflow: hidden; -} - -table.pipeline-components-table thead th { - text-align: bottom; -} -table.pipeline-components-table div.progress { - margin-bottom: 0; -} - -table.pipeline-components-table td { - overflow: hidden; - text-overflow: ellipsis; -} <% end %> -<% content_for :js do %> - function select_Collection_source() { - var ret = []; - var lst = get_selection_list(); - for (var i = 0; i < lst.length; i++) { - if (lst[i].type == 'Collection') { - ret.push({text: lst[i].name, value: lst[i].uuid}) - } - } - return ret; - }; +<% template = PipelineTemplate.find(@object.pipeline_template_uuid) rescue nil %> + +<%= content_for :content_top do %> +
progress - <%= link_to '(refresh)', request.fullpath, class: 'refresh', remote: true, method: 'get' %> + <%# 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 | @@ -62,104 +47,67 @@ table.pipeline-components-table td { <% render_pipeline_jobs.each do |pj| %>|||
---|---|---|---|---|
+ <% job_status = render(partial: 'job_status_label', + locals: { :j => pj[:job], :title => pj[:name] }) %> <% if pj[:job].andand[:uuid] %> - <%= link_to pj[:name], job_url(id: pj[:job][:uuid]) %> + <%= link_to(job_status, job_url(id: pj[:job][:uuid])) %> <% else %> - <%= pj[:name] %> + <%= job_status %> <% end %> |
<%= pj[:script] %>
<%= pj[:script_version] %> | <%= pj[:progress_bar] %> - <% if pj[:job].andand[:cancelled_at] %> - cancelled - <% elsif pj[:failed] %> - failed - <% elsif pj[:result] == 'queued' %> - queued - <% end %> | - <%= link_to_if_arvados_object pj[:output] %> + <%= render(partial: 'job_status_label', + locals: { :j => pj[:job] }) %> + | + <%= link_to_if_arvados_object pj[:output], {:thumbnail => true} %> |
- component - | - script, version - | - parameter - | - input - | -
---|---|---|---|
<%= k %> | + <%= button_tag "Stop pipeline", {class: 'btn btn-primary pull-right', id: "run-pipeline-button"} %> + <% end %> +<% end %> -<%= v[:script] %>
- <%= v[:script_version] %> - |
+<% end %>
- - <%= sp[0][0] %> - | +<% else %> + <% if @object.state == 'New' %> +- <%= render_editable_subattribute @object, :components, [k, :script_parameters, sp[0][0].to_sym], sp[0][1] %> - | -
- | + <%= hidden_field @object.class.to_s.underscore.singularize.to_sym, :state, :value => 'RunningOnServer' %> - <% sp[1..-1].each do |p| %> - | <%= p[0] %> | -<%= p[1] %> | - <% end %> -