X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/675794872a5d064cf0a8177d662555c04b0dae51..fde712e92ad33e03dfd79f5fca99d2005cdd0795:/apps/workbench/app/controllers/pipeline_instances_controller.rb diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb index d54cd4961e..b5c9815ed5 100644 --- a/apps/workbench/app/controllers/pipeline_instances_controller.rb +++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb @@ -2,9 +2,48 @@ class PipelineInstancesController < ApplicationController skip_before_filter :find_object_by_uuid, only: :compare before_filter :find_objects_by_uuid, only: :compare include PipelineInstancesHelper + include PipelineComponentsHelper + + def copy + @object = @object.dup + @object.components.each do |cname, component| + component.delete :job + end + @object.state = 'New' + super + end + + def update + @updates ||= params[@object.class.to_s.underscore.singularize.to_sym] + if (components = @updates[:components]) + components.each do |cname, component| + if component[:script_parameters] + component[:script_parameters].each do |param, value_info| + if value_info.is_a? Hash + if resource_class_for_uuid(value_info[:value]) == Link + # Use the link target, not the link itself, as script + # parameter; but keep the link info around as well. + link = Link.find value_info[:value] + value_info[:value] = link.head_uuid + value_info[:link_uuid] = link.uuid + value_info[:link_name] = link.name + else + # Delete stale link_uuid and link_name data. + value_info[:link_uuid] = nil + value_info[:link_name] = nil + end + end + end + end + end + end + super + end def graph(pipelines) - count = {} + return nil, nil if params['tab_pane'] != "Graph" + + count = {} provenance = {} pips = {} n = 1 @@ -43,7 +82,7 @@ class PipelineInstancesController < ApplicationController pips[uuid] = 0 unless pips[uuid] != nil pips[uuid] |= n end - + n = n << 1 end @@ -60,13 +99,15 @@ class PipelineInstancesController < ApplicationController end provenance, pips = graph(@pipelines) + 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 - @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 } super end @@ -75,79 +116,96 @@ 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 - @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 - %w(Components Graph Attributes Metadata JSON API) + panes = %w(Components Graph Advanced) + if @object and @object.state.in? ['New', 'Ready'] + panes = %w(Inputs) + panes + end + if not @object.components.values.any? { |x| x[:job] rescue false } + panes -= ['Graph'] + end + panes end - def compare_pane_list + def compare_pane_list %w(Compare Graph) - end + end def index @limit = 20