X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3ba5aa15ea0156a4fce63dcb43b7f972b4c760df..e5337814593c504ef71e9f517dc1d99d41e19784:/apps/workbench/app/controllers/collections_controller.rb diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index 3b4943f588..bea72a4274 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -1,13 +1,15 @@ class CollectionsController < ApplicationController - skip_around_filter(:thread_with_mandatory_api_token, + skip_around_filter(:require_thread_api_token, only: [:show_file, :show_file_links]) skip_before_filter(:find_object_by_uuid, only: [:provenance, :show_file, :show_file_links]) + # We depend on show_file to display the user agreement: + skip_before_filter :check_user_agreements, only: [:show_file] RELATION_LIMIT = 5 def show_pane_list - %w(Files Attributes Metadata Provenance_graph Used_by JSON API) + %w(Files Provenance_graph Used_by Advanced) end def set_persistent @@ -40,6 +42,23 @@ class CollectionsController < ApplicationController end end + def choose + params[:limit] ||= 40 + + @filters += [['link_class','=','name'], + ['head_uuid','is_a','arvados#collection']] + + @objects = Link + find_objects_for_index + + @name_links = @objects + + @objects = Collection. + filter([['uuid','in',@name_links.collect(&:head_uuid)]]) + preload_links_for_objects @objects.to_a + super + end + def index if params[:search].andand.length.andand > 0 tags = Link.where(any: ['contains', params[:search]]) @@ -88,11 +107,13 @@ class CollectionsController < ApplicationController info[:links] << link end @request_url = request.url + + render_index end def show_file_links Thread.current[:reader_tokens] = [params[:reader_token]] - find_object_by_uuid + return if false.equal?(find_object_by_uuid) render layout: false end @@ -120,6 +141,18 @@ class CollectionsController < ApplicationController self.response_body = file_enumerator opts end + def sharing_scopes + ["GET /arvados/v1/collections/#{@object.uuid}", "GET /arvados/v1/collections/#{@object.uuid}/", "GET /arvados/v1/keep_services/accessible"] + end + + def search_scopes + begin + ApiClientAuthorization.filter([['scopes', '=', sharing_scopes]]).results + rescue ArvadosApiClient::AccessForbiddenException + nil + end + end + def show return super if !@object if current_user @@ -129,10 +162,10 @@ class CollectionsController < ApplicationController end @output_of = jobs_with.call(output: @object.uuid) @log_of = jobs_with.call(log: @object.uuid) - folder_links = Link.limit(RELATION_LIMIT).order("modified_at DESC") + @project_links = Link.limit(RELATION_LIMIT).order("modified_at DESC") .where(head_uuid: @object.uuid, link_class: 'name').results - folder_hash = Group.where(uuid: folder_links.map(&:tail_uuid)).to_hash - @folders = folder_links.map { |link| folder_hash[link.tail_uuid] } + project_hash = Group.where(uuid: @project_links.map(&:tail_uuid)).to_hash + @projects = project_hash.values @permissions = Link.limit(RELATION_LIMIT).order("modified_at DESC") .where(head_uuid: @object.uuid, link_class: 'permission', name: 'can_read').results @@ -142,16 +175,52 @@ class CollectionsController < ApplicationController .where(head_uuid: @object.uuid, tail_uuid: current_user.uuid, link_class: 'resources', name: 'wants') .results.any? + @search_sharing = search_scopes + end + + if params["tab_pane"] == "Provenance_graph" + @prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg", + {:request => request, + :direction => :bottom_up, + :combine_jobs => :script_only}) rescue nil + end + if params["tab_pane"] == "Used_by" + @used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg", + {:request => request, + :direction => :top_down, + :combine_jobs => :script_only, + :pdata_only => true}) rescue nil + end + super + end + + def sharing_popup + @search_sharing = search_scopes + respond_to do |format| + format.html + format.js + end + end + + helper_method :download_link + + def download_link + collections_url + "/download/#{@object.uuid}/#{@search_sharing.first.api_token}/" + end + + def share + a = ApiClientAuthorization.create(scopes: sharing_scopes) + @search_sharing = search_scopes + render 'sharing_popup' + end + + def unshare + @search_sharing = search_scopes + @search_sharing.each do |s| + s.destroy end - @prov_svg = ProvenanceHelper::create_provenance_graph(@object.provenance, "provenance_svg", - {:request => request, - :direction => :bottom_up, - :combine_jobs => :script_only}) rescue nil - @used_by_svg = ProvenanceHelper::create_provenance_graph(@object.used_by, "used_by_svg", - {:request => request, - :direction => :top_down, - :combine_jobs => :script_only, - :pdata_only => true}) rescue nil + @search_sharing = search_scopes + render 'sharing_popup' end protected @@ -164,18 +233,14 @@ class CollectionsController < ApplicationController # error we encounter, and return nil. most_specific_error = [401] token_list.each do |api_token| - using_specific_api_token(api_token) do - begin + begin + using_specific_api_token(api_token) do yield return api_token - rescue ArvadosApiClient::NotLoggedInException => error - status = 401 - rescue => error - status = (error.message =~ /\[API: (\d+)\]$/) ? $1.to_i : nil - raise unless [401, 403, 404].include?(status) end - if status >= most_specific_error.first - most_specific_error = [status, error] + rescue ArvadosApiClient::ApiError => error + if error.api_status >= most_specific_error.first + most_specific_error = [error.api_status, error] end end end