[ARVADOS] updated: 9878a4d9e0b535a13a323dfb8776866b542ece1a
git at public.curoverse.com
git at public.curoverse.com
Tue Jun 17 09:43:51 EDT 2014
Summary of changes:
.../controllers/pipeline_instances_controller.rb | 111 +++++++++++----------
.../app/views/application/_content.html.erb | 4 +-
2 files changed, 61 insertions(+), 54 deletions(-)
via 9878a4d9e0b535a13a323dfb8776866b542ece1a (commit)
from 439e1417599cad4e65d506a11b583a6ebabc7604 (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 9878a4d9e0b535a13a323dfb8776866b542ece1a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 17 09:43:48 2014 -0400
Ajax load of tab panels now includes any query parameters the page was
originally loaded with. Also fixed related problem where the 'compare' route
of pipeline_instances controller wasn't aware of tab partials. closes #3013
diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 97c5e17..e84d0e4 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -115,73 +115,80 @@ class PipelineInstancesController < ApplicationController
@rows = [] # each is {name: S, components: [...]}
- # Build a table: x=pipeline y=component
- @objects.each_with_index do |pi, pi_index|
- pipeline_jobs(pi).each do |component|
- # Find a cell with the same name as this component but no
- # entry for this pipeline
- target_row = nil
- @rows.each_with_index do |row, row_index|
- if row[:name] == component[:name] and !row[:components][pi_index]
- target_row = row
+ if params['tab_pane'] == "Compare" or params['tab_pane'].nil?
+ # Build a table: x=pipeline y=component
+ @objects.each_with_index do |pi, pi_index|
+ pipeline_jobs(pi).each do |component|
+ # Find a cell with the same name as this component but no
+ # entry for this pipeline
+ target_row = nil
+ @rows.each_with_index do |row, row_index|
+ if row[:name] == component[:name] and !row[:components][pi_index]
+ target_row = row
+ end
end
+ if !target_row
+ target_row = {name: component[:name], components: []}
+ @rows << target_row
+ end
+ target_row[:components][pi_index] = component
end
- if !target_row
- target_row = {name: component[:name], components: []}
- @rows << target_row
- end
- target_row[:components][pi_index] = component
end
- end
- @rows.each do |row|
- # Build a "normal" pseudo-component for this row by picking the
- # most common value for each attribute. If all values are
- # equally common, there is no "normal".
- normal = {} # attr => most common value
- highscore = {} # attr => how common "normal" is
- score = {} # attr => { value => how common }
- row[:components].each do |pj|
- next if pj.nil?
- pj.each do |k,v|
- vstr = for_comparison v
- score[k] ||= {}
- score[k][vstr] = (score[k][vstr] || 0) + 1
- highscore[k] ||= 0
- if score[k][vstr] == highscore[k]
- # tie for first place = no "normal"
- normal.delete k
- elsif score[k][vstr] == highscore[k] + 1
- # more pipelines have v than anything else
- highscore[k] = score[k][vstr]
- normal[k] = vstr
+ @rows.each do |row|
+ # Build a "normal" pseudo-component for this row by picking the
+ # most common value for each attribute. If all values are
+ # equally common, there is no "normal".
+ normal = {} # attr => most common value
+ highscore = {} # attr => how common "normal" is
+ score = {} # attr => { value => how common }
+ row[:components].each do |pj|
+ next if pj.nil?
+ pj.each do |k,v|
+ vstr = for_comparison v
+ score[k] ||= {}
+ score[k][vstr] = (score[k][vstr] || 0) + 1
+ highscore[k] ||= 0
+ if score[k][vstr] == highscore[k]
+ # tie for first place = no "normal"
+ normal.delete k
+ elsif score[k][vstr] == highscore[k] + 1
+ # more pipelines have v than anything else
+ highscore[k] = score[k][vstr]
+ normal[k] = vstr
+ end
end
end
- end
- # Add a hash in component[:is_normal]: { attr => is_the_value_normal? }
- row[:components].each do |pj|
- next if pj.nil?
- pj[:is_normal] = {}
- pj.each do |k,v|
- pj[:is_normal][k] = (normal.has_key?(k) && normal[k] == for_comparison(v))
+ # Add a hash in component[:is_normal]: { attr => is_the_value_normal? }
+ row[:components].each do |pj|
+ next if pj.nil?
+ pj[:is_normal] = {}
+ pj.each do |k,v|
+ pj[:is_normal][k] = (normal.has_key?(k) && normal[k] == for_comparison(v))
+ end
end
end
end
- provenance, pips = graph(@objects)
+ if params['tab_pane'] == "Graph"
+ provenance, pips = graph(@objects)
- @pipelines = @objects
+ @pipelines = @objects
- if provenance
- @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
- :request => request,
- :all_script_parameters => true,
- :combine_jobs => :script_and_version,
- :script_version_nodes => true,
- :pips => pips }
+ if provenance
+ @prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+ :request => request,
+ :all_script_parameters => true,
+ :combine_jobs => :script_and_version,
+ :script_version_nodes => true,
+ :pips => pips }
+ end
end
+
@object = @objects.first
+
+ show
end
def show_pane_list
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 33ec16f..418923c 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -26,7 +26,7 @@
if (!tab_pane_valid_state[pane]) {
tab_pane_valid_state[pane] = true;
$(document).trigger('ajax:send');
- $.ajax('<%=j url_for() %>?tab_pane='+pane, {dataType: 'html', type: 'GET'}).
+ $.ajax('<%=j url_for() %>?<%= raw(controller.request.query_string) %>&tab_pane='+pane, {dataType: 'html', type: 'GET'}).
done(function(data, status, jqxhr) {
$('#' + pane + ' > div > div').html(data);
$(document).trigger('ajax:complete');
@@ -68,7 +68,7 @@
<% else %>
data-object-uuid="<%= @object.uuid %>"
<% end %>
->
+ >
<% content_for :js do %>
<% if i == 0 %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list