[ARVADOS] updated: b354e03622eb2e47c055b6fcc38b24c22a59ab9f
git at public.curoverse.com
git at public.curoverse.com
Tue Feb 25 15:24:51 EST 2014
Summary of changes:
apps/workbench/Gemfile.lock | 6 --
.../controllers/pipeline_instances_controller.rb | 6 ++
.../app/views/collections/_show_files.html.erb | 1 +
.../pipeline_instances/_show_components.html.erb | 93 +++++++++++++++++---
4 files changed, 89 insertions(+), 17 deletions(-)
via b354e03622eb2e47c055b6fcc38b24c22a59ab9f (commit)
from ad8e91c2c580b2a6188fccafb05672b7130ec931 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b354e03622eb2e47c055b6fcc38b24c22a59ab9f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Feb 25 15:26:04 2014 -0500
Checkpoint, working on form to set component inputs.
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 247fa30..7f4dc8e 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -36,9 +36,6 @@ GEM
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
builder (3.0.4)
- byebug (2.7.0)
- columnize (~> 0.3)
- debugger-linecache (~> 1.2)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
@@ -52,10 +49,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
- columnize (0.3.6)
commonjs (0.2.7)
daemon_controller (1.1.7)
- debugger-linecache (1.2.0)
erubis (2.7.0)
execjs (2.0.2)
highline (1.6.20)
@@ -157,7 +152,6 @@ DEPENDENCIES
andand
bootstrap-sass (~> 3.1.0)
bootstrap-x-editable-rails
- byebug
coffee-rails (~> 3.2.0)
httpclient
jquery-rails
diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 42cb2e9..a8a35b5 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -45,6 +45,12 @@ class PipelineInstancesController < ApplicationController
end
def show
+ if @object.components.empty? and @object.pipeline_template_uuid
+ template = PipelineTemplate.find(@object.pipeline_template_uuid)
+ @object.components= template.components
+ @object.save
+ end
+
@pipelines = [@object]
if params[:compare]
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 53fbad8..705ded3 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -8,6 +8,7 @@
</colgroup>
<thead>
<tr>
+ <th></th>
<th>path</th>
<th>file</th>
<th style="text-align:right">size</th>
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 9597964..88bed69 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -3,32 +3,38 @@
padding-left: 1em;
padding-right: 1em;
}
+table.pipeline-components-table {
+ width: 100%;
+ table-layout: fixed;
+}
+
table.pipeline-components-table thead th {
text-align: bottom;
}
table.pipeline-components-table div.progress {
margin-bottom: 0;
}
+
<% end %>
-<br />
+<% if @object.active != nil %>
<table class="table pipeline-components-table">
<colgroup>
- <col width="15%" />
- <col width="15%" />
- <col width="35%" />
- <col width="35%" />
+ <col style="width: 15%" />
+ <col style="width: 35%" />
+ <col style="width: 15%" />
+ <col style="width: 35%" />
</colgroup>
<thead>
<tr>
<th>
component
</th><th>
+ script, version
+ </th><th>
progress
<%= link_to '(refresh)', request.fullpath, class: 'refresh', remote: true, method: 'get' %>
</th><th>
- script, version
- </th><th>
output
</th>
</tr>
@@ -43,6 +49,9 @@ table.pipeline-components-table div.progress {
<%= pj[:name] %>
<% end %>
</td><td>
+ <%= pj[:script] %>
+ <br /><span class="deemphasize"><%= pj[:script_version] %></span>
+ </td><td>
<%= pj[:progress_bar] %>
<% if pj[:job].andand[:cancelled_at] %>
<span class="pull-right label label-warning">cancelled</span>
@@ -52,9 +61,6 @@ table.pipeline-components-table div.progress {
<span class="pull-right label">queued</span>
<% end %>
</td><td>
- <%= pj[:script] %>
- <br /><span class="deemphasize"><%= pj[:script_version] %></span>
- </td><td>
<%= link_to_if_arvados_object pj[:output] %>
</td>
</tr>
@@ -71,4 +77,69 @@ setInterval(function(){$('a.refresh').click()}, 30000);
<% end %>
<% end %>
-<pre><%= JSON.pretty_generate @object.attributes %></pre>
+<% else %>
+
+ <%= form_tag @object, :method => :put do |f| %>
+
+ <%= hidden_field @object.class.to_s.underscore.singularize.to_sym, :active, :value => true %>
+ <%= button_tag "Run pipeline", {class: 'btn btn-primary pull-right'} %>
+ <% end %>
+
+<table class="table pipeline-components-table" style="margin-top: -.1em">
+ <colgroup>
+ <col style="width: 15%" />
+ <col style="width: 35%" />
+ <col style="width: 15%" />
+ <col style="width: 35%" />
+ </colgroup>
+
+ <thead>
+ <tr>
+ <th>
+ component
+ </th><th>
+ script, version
+ </th><th>
+ parameter
+ </th><th>
+ input
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <% @object.components.each do |k, v| %>
+
+ <% sp = v[:script_parameters].collect do |k, v| [k, v] end %>
+
+ <tr>
+ <td><%= k %></td>
+
+ <td><%= v[:script] %>
+ <br /><span class="deemphasize"> <%= v[:script_version] %></span>
+ </td>
+
+ <td>
+ <%= sp[0][0] %>
+ </td>
+
+ <td>
+ <%= sp[0][1] %>
+ </td>
+ </tr>
+
+ <% if sp.length > 1 %>
+ <tr>
+ <td></td>
+ <td></td>
+
+ <% sp[1..-1].each do |p| %>
+ <%= p[0] %>
+ <%= p[1] %>
+ <% end %>
+ </tr>
+ <% end %>
+ <% end %>
+ </tbody>
+ </table>
+
+<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list