X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3a31350c6265cb1135d3d4d40af436aae91a9894..040fdf6da00318b5b8e8e83eceeec783680ecb1c:/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 394bb7b889..fc8bd4b197 100644 --- a/apps/workbench/app/controllers/pipeline_instances_controller.rb +++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb @@ -1,6 +1,11 @@ class PipelineInstancesController < ApplicationController skip_before_filter :find_object_by_uuid, only: :compare before_filter :find_objects_by_uuid, only: :compare + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + 'show' == ctrl.action_name + } + include PipelineInstancesHelper include PipelineComponentsHelper @@ -86,7 +91,7 @@ class PipelineInstancesController < ApplicationController obj = Collection.find value_info_value if value_info_partitioned value_info[:value] = obj.portable_data_hash + value_info_partitioned[1] + value_info_partitioned[2] - value_info[:selection_name] = obj.name + value_info_partitioned[1] + value_info_partitioned[2] + value_info[:selection_name] = obj.name ? obj.name + value_info_partitioned[1] + value_info_partitioned[2] : obj.name else value_info[:value] = obj.portable_data_hash value_info[:selection_name] = obj.name @@ -174,12 +179,9 @@ class PipelineInstancesController < ApplicationController end def show - @pipelines = [@object] - - if params[:compare] - PipelineInstance.where(uuid: params[:compare]).each do |p| - @pipelines << p - end + # the #show action can also be called by #compare, which does its own work to set up @pipelines + unless defined? @pipelines + @pipelines = [@object] end provenance, pips = graph(@pipelines) @@ -259,18 +261,7 @@ class PipelineInstancesController < ApplicationController end if params['tab_pane'] == "Graph" - provenance, pips = graph(@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 } - end end @object = @objects.first @@ -293,9 +284,58 @@ class PipelineInstancesController < ApplicationController %w(Compare Graph) end - def index - @limit = 20 - super + helper_method :unreadable_inputs_present? + def unreadable_inputs_present? + unless @unreadable_inputs_present.nil? + return @unreadable_inputs_present + end + + input_uuids = [] + input_pdhs = [] + @object.components.each do |k, component| + next if !component + component[:script_parameters].andand.each do |p, tv| + if (tv.is_a? Hash) and ((tv[:dataclass] == "Collection") || (tv[:dataclass] == "File")) + if tv[:value] + value = tv[:value] + elsif tv[:default] + value = tv[:default] + end + if value + split = value.split '/' + if CollectionsHelper.match(split[0]) + input_pdhs << split[0] + elsif CollectionsHelper.match_uuid_with_optional_filepath(split[0]) + input_uuids << split[0] + end + end + end + end + end + + input_pdhs = input_pdhs.uniq + input_uuids = input_uuids.uniq + + preload_collections_for_objects input_uuids if input_uuids.any? + preload_for_pdhs input_pdhs if input_pdhs.any? + + @unreadable_inputs_present = false + input_uuids.each do |uuid| + if !collections_for_object(uuid).any? + @unreadable_inputs_present = true + break + end + end + if !@unreadable_inputs_present + input_pdhs.each do |pdh| + if !collection_for_pdh(pdh).any? + @unreadable_inputs_present = true + break + end + end + end + + @unreadable_inputs_present end protected @@ -307,8 +347,12 @@ class PipelineInstancesController < ApplicationController end end + def load_filters_and_paging_params + params[:limit] = 20 + super + end + def find_objects_by_uuid @objects = model_class.where(uuid: params[:uuids]) end - end