[ARVADOS] updated: 8680153856ed2319735b6a1f832601354bbdfa61
git at public.curoverse.com
git at public.curoverse.com
Thu Mar 5 14:40:15 EST 2015
Summary of changes:
apps/workbench/app/controllers/actions_controller.rb | 18 ++++++++++++++----
.../app/controllers/application_controller.rb | 8 ++++++++
.../test/integration/anonymous_access_test.rb | 5 +++++
apps/workbench/test/integration/collections_test.rb | 7 +++----
apps/workbench/test/integration/projects_test.rb | 15 ++++++++++++---
5 files changed, 42 insertions(+), 11 deletions(-)
via 8680153856ed2319735b6a1f832601354bbdfa61 (commit)
via 57991d19a58903863194043717b2875417a40fe7 (commit)
via d0583fc94ca74daf94327ad3446ff72bd5e5bea1 (commit)
from 6ba419ef43b3e06b2bc48b0204146349ab64ab5b (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 8680153856ed2319735b6a1f832601354bbdfa61
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Mar 5 14:38:01 2015 -0500
5261: Redirect to destination project's Collections tab when copying/moving collections.
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 59dcbb9..7086dcd 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -46,10 +46,10 @@ class ActionsController < ApplicationController
def move_or_copy action
uuids_to_add = params["selection"]
uuids_to_add = [ uuids_to_add ] unless uuids_to_add.is_a? Array
- uuids_to_add.
+ resource_classes = uuids_to_add.
collect { |x| ArvadosBase::resource_class_for_uuid(x) }.
- uniq.
- each do |resource_class|
+ uniq
+ resource_classes.each do |resource_class|
resource_class.filter([['uuid','in',uuids_to_add]]).each do |src|
if resource_class == Collection and not Collection.attribute_info.include?(:name)
dst = Link.new(owner_uuid: @object.uuid,
@@ -87,7 +87,17 @@ class ActionsController < ApplicationController
end
end
end
- redirect_to @object
+ if (resource_classes == [Collection] and
+ @object.is_a? Group and
+ @object.group_class == 'project')
+ # In the common case where only collections are copied/moved
+ # into a project, it's polite to land on the collections tab on
+ # the destination project.
+ redirect_to project_url(@object.uuid, anchor: 'Data_collections')
+ else
+ # Otherwise just land on the default (Summary) tab.
+ redirect_to @object
+ end
end
def arv_normalize mt, *opts
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 4338d19..0a026f1 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -24,10 +24,9 @@ class CollectionsTest < ActionDispatch::IntegrationTest
click_link 'Copy to project...'
find('.selectable', text: project_name).click
find('.modal-footer a,button', text: 'Copy').click
- wait_for_ajax
- # It should navigate to the project after copying...
- assert(page.has_text?(project_name))
- assert(page.has_text?("Copy of #{collection_name}"))
+ # Should navigate to the Data collections tab of the project after copying
+ assert_text project_name
+ assert_text "Copy of #{collection_name}"
end
test "Collection page renders name" do
commit 57991d19a58903863194043717b2875417a40fe7
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Mar 5 14:07:52 2015 -0500
5261: When redirecting during an AJAX request, send the target URI in
a JSON object {"href":"..."} instead of responding 302.
This lets us use "redirect_to X" to mean "send the user to page X"
regardless of whether the request is an XHR. Without it, client-side
code never sees the 302 at all: the browser handles the redirect
transparently, and the client-side code typically ends up trying to
parse HTML content as JSON.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index b52591b..0a13fa6 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -267,6 +267,14 @@ class ApplicationController < ActionController::Base
end
end
+ def redirect_to uri, *args
+ if request.xhr?
+ render json: {href: uri}
+ else
+ super
+ end
+ end
+
def choose
params[:limit] ||= 40
respond_to do |f|
commit d0583fc94ca74daf94327ad3446ff72bd5e5bea1
Author: Tom Clegg <tom at curoverse.com>
Date: Thu Mar 5 13:58:52 2015 -0500
5261: Update tests.
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 6508879..d81eb9f 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -55,6 +55,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
test "selection actions when anonymous user accesses shared project" do
visit PUBLIC_PROJECT
+ assert_selector 'a', text: 'Summary'
assert_selector 'a', text: 'Data collections'
assert_selector 'a', text: 'Jobs and pipelines'
assert_selector 'a', text: 'Pipeline templates'
@@ -63,6 +64,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
assert_no_selector 'a', text: 'Other objects'
assert_no_selector 'button', text: 'Add data'
+ click_link 'Data collections'
click_button 'Selection'
within('.selection-action-container') do
assert_selector 'li', text: 'Compare selected'
@@ -75,6 +77,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
test "anonymous user accesses data collections tab in shared project" do
visit PUBLIC_PROJECT
+ click_link 'Data collections'
collection = api_fixture('collections')['user_agreement_in_anonymously_accessible_project']
assert_text 'GNU General Public License'
@@ -114,6 +117,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
].each do |type|
test "anonymous user accesses jobs and pipelines tab in shared project and clicks on #{type}" do
visit PUBLIC_PROJECT
+ click_link 'Data collections'
assert_text 'GNU General Public License'
click_link 'Jobs and pipelines'
@@ -155,6 +159,7 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
test "anonymous user accesses pipeline templates tab in shared project" do
visit PUBLIC_PROJECT
+ click_link 'Data collections'
assert_text 'GNU General Public License'
assert_selector 'a', text: 'Pipeline templates'
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 88972e5..9ee328c 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -11,6 +11,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
test 'Check collection count for A Project in the tab pane titles' do
project_uuid = api_fixture('groups')['aproject']['uuid']
visit page_with_token 'active', '/projects/' + project_uuid
+ click_link 'Data collections'
wait_for_ajax
collection_count = page.all("[data-pk*='collection']").count
assert_selector '#Data_collections-tab span', text: "(#{collection_count})"
@@ -256,6 +257,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
visit page_with_token 'active', '/'
find("#projects-menu").click
find(".dropdown-menu a", text: dest['name']).click
+ click_link 'Data collections'
assert page.has_text?(my_collection['name']), 'Collection not found in dest project after copy'
when 'Move'
@@ -263,6 +265,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
visit page_with_token 'active', '/'
find("#projects-menu").click
find(".dropdown-menu a", text: dest['name']).click
+ click_link 'Data collections'
assert page.has_text?(my_collection['name']), 'Collection not found in dest project after move'
when 'Remove'
@@ -275,6 +278,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
visit page_with_token 'active', '/'
find("#projects-menu").click
find(".dropdown-menu a", text: src['name']).click
+ click_link 'Data collections'
assert page.has_text?(item['name']), 'Collection not found in src project'
within('tr', text: item['name']) do
@@ -313,6 +317,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
find("#projects-menu").click
find(".dropdown-menu a", text: my_project['name']).click
+ click_link 'Data collections'
click_button 'Selection'
within('.selection-action-container') do
assert_selector 'li.disabled', text: 'Create new collection with selected collections'
@@ -326,6 +331,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
visit page_with_token 'active', '/'
find("#projects-menu").click
find(".dropdown-menu a", text: my_project['name']).click
+ click_link 'Data collections'
assert page.has_text?(my_collection['name']), 'Collection not found in project'
within('tr', text: my_collection['name']) do
@@ -459,11 +465,13 @@ class ProjectsTest < ActionDispatch::IntegrationTest
end
end
- # "Move selected" and "Remove selected" options should not be available when current user cannot write to the project
+ # "Move selected" and "Remove selected" options should not be
+ # available when current user cannot write to the project
test "move selected and remove selected actions not available when current user cannot write to project" do
my_project = api_fixture('groups')['anonymously_accessible_project']
visit page_with_token 'active', "/projects/#{my_project['uuid']}"
+ click_link 'Data collections'
click_button 'Selection'
within('.selection-action-container') do
assert_selector 'li', text: 'Create new collection with selected collections'
@@ -485,6 +493,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
visit page_with_token user, '/'
find("#projects-menu").click
find(".dropdown-menu a", text: my_project['name']).click
+ click_link 'Data collections'
assert page.has_text?(my_collection['name']), 'Collection not found in project'
within('tr', text: my_collection['name']) do
@@ -707,9 +716,9 @@ class ProjectsTest < ActionDispatch::IntegrationTest
# As of 2014-12-19, the first tab of project#show uses infinite scrolling.
# Make sure that it loads data even if we visit another tab directly.
need_selenium 'to land on specified tab using {url}#Advanced'
- project = api_fixture("groups", "aproject")
+ user = api_fixture("users", "active")
visit(page_with_token("active_trustedclient",
- "/projects/#{project['uuid']}#Advanced"))
+ "/projects/#{user['uuid']}#Advanced"))
assert_text("API response")
find("#page-wrapper .nav-tabs :first-child a").click
assert_text("Collection modified at")
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list