[ARVADOS] updated: 3b151b842b11182172b5cab36d9648ea63bd1e39
Git user
git at public.curoverse.com
Tue Jun 20 19:01:29 EDT 2017
Summary of changes:
.../app/assets/javascripts/edit_collection_tags.js | 2 +-
apps/workbench/app/controllers/users_controller.rb | 30 +-
.../app/views/collections/_show_tag_rows.html.erb | 8 +-
.../app/views/collections/_show_tags.html.erb | 6 +-
.../app/views/users/_repositories.html.erb | 96 +++----
apps/workbench/config/routes.rb | 2 +-
.../test/controllers/users_controller_test.rb | 9 +-
.../workbench/test/integration/collections_test.rb | 82 ++++++
.../test/integration/user_settings_menu_test.rb | 34 +--
build/package-build-dockerfiles/Makefile | 2 +-
build/package-build-dockerfiles/centos7/Dockerfile | 2 +-
build/package-build-dockerfiles/debian8/Dockerfile | 2 +-
.../ubuntu1204/Dockerfile | 2 +-
.../ubuntu1404/Dockerfile | 2 +-
.../ubuntu1604/Dockerfile | 2 +-
build/run-tests.sh | 4 +-
sdk/cwl/arvados_cwl/__init__.py | 3 +-
sdk/cwl/arvados_cwl/arvjob.py | 9 +
sdk/cwl/arvados_cwl/done.py | 62 +++--
sdk/cwl/test_with_arvbox.sh | 10 +-
sdk/cwl/tests/test_job.py | 68 ++++-
sdk/go/arvados/collection_fs.go | 235 ++++++++++++++++
sdk/go/arvados/collection_fs_test.go | 125 +++++++++
sdk/go/arvadostest/fixtures.go | 3 +
sdk/go/keepclient/collectionreader.go | 21 +-
sdk/python/arvados/commands/put.py | 18 +-
sdk/python/tests/test_arv_put.py | 38 ++-
.../app/controllers/arvados/v1/users_controller.rb | 36 +--
services/api/app/models/node.rb | 29 +-
.../functional/arvados/v1/users_controller_test.rb | 20 --
services/api/test/integration/users_test.rb | 9 +-
services/api/test/unit/node_test.rb | 21 +-
services/crunch-run/crunchrun.go | 4 +-
services/crunch-run/crunchrun_test.go | 13 +-
services/keep-web/cache.go | 32 +--
services/keep-web/cache_test.go | 12 +-
services/keep-web/handler.go | 308 ++++++++++++++++-----
services/keep-web/handler_test.go | 106 +++++++
services/keep-web/server_test.go | 4 +-
.../arvnodeman/computenode/driver/ec2.py | 19 +-
services/nodemanager/arvnodeman/daemon.py | 2 +-
.../nodemanager/arvnodeman/test/fake_driver.py | 32 ++-
services/nodemanager/setup.py | 6 +-
.../tests/test_computenode_driver_ec2.py | 50 ++++
services/nodemanager/tests/testutil.py | 3 +-
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 2 +-
46 files changed, 1242 insertions(+), 343 deletions(-)
create mode 100644 sdk/go/arvados/collection_fs.go
create mode 100644 sdk/go/arvados/collection_fs_test.go
via 3b151b842b11182172b5cab36d9648ea63bd1e39 (commit)
via ef15d01d2cb3c988185edd2b891d2b227fb33f3b (commit)
via 8c2b89cb6a34b2f1a4ed672e8a883c680ffca80a (commit)
via 55063ad6fc06f74392338802dd70cd315abf3a1a (commit)
via b1f94004653da79774a8c9afd641ab7b492398a6 (commit)
via 3a4b025c204ef645c9e44163d57f985f7ecfc2ae (commit)
via 9318b234cbfae138524e45080f549c277e15776b (commit)
via f054bc3d7d3d26962e62c2ea7c27214b08e85bb6 (commit)
via 9e575bce7c0757f270b584d434d2ada5bc98bc3d (commit)
via 02c1d68ab5eeafffb09482d0432f8c4a6cb6dfca (commit)
via 9c6aa66e38395f4ca658a258d27fee2c05c595e2 (commit)
via eca14e106a73ebe62f5aa0fc3060ade2d42f8e20 (commit)
via a249cd98f534ab0a1cba1345b33142f438b7d0f6 (commit)
via 74b3ad1f061185ca695e8bbead723b5212bbb06a (commit)
via 04efddf61ee4a0e5c65a72a538fe3f026ae94e8e (commit)
via e7dc406d4babf0fae50837c7f0040dc485242e36 (commit)
via 5598bbc3c71da60b7b7a665b36495b957d6a3c52 (commit)
via e2cd53d9007d56e1de4816f6aeab4bd769271162 (commit)
via 1883b07d5de707066bf996c1526073df323c3991 (commit)
via 48f4c496e659bc28446bfd5aa2d469d5316d49cb (commit)
via 9ca7acc39ed2e1e2100869e17be3e5cff7c835b6 (commit)
via e7672a0b679659d6ba90d23b4e102fba747fa9ef (commit)
via cf9874c59fa5a73d395743aaf71555b441161e3e (commit)
via 62a1c9045b8313cc7e1b6be16ab922e3eff1bcfd (commit)
via 4db4e97167a25b519581fb5f4ebef2169464333e (commit)
via 04f9ccc7ca627d41175f44f515e4581b6937f43b (commit)
via 110b7d2f628aa9b60fc2beecb66ead15cc60660f (commit)
via e2a4e065951ea459570ae75dbe2ed4fd4b6d4bd8 (commit)
via b89fda1904ec63d637c43831df66b334f6a78377 (commit)
via 7409b2f682d562cd7ef7bcf558597ae2181ea7c1 (commit)
via f77d63e6cfaf7278c1cb0fb05e5a4e3f45320e3a (commit)
via a7240d9ad7e1bd676097665fe3fdc1727cbc2e1b (commit)
via 312b1a86d1ec886f4baec15034ba1600a9cf1ec2 (commit)
via 490895ac6ab70a5340b80e734b81a2250412635c (commit)
via c40b0299b306f2b508e178b2df210f8a3d9d10e7 (commit)
via b7f7d35140e9b412b835817d4f8a078271af4fc0 (commit)
via 51920838d495265bddb71e61dbd8122b1fe0cb6e (commit)
via 405d6345dcbe1494e2a9202bcb5cdf519e7d3e0a (commit)
via 82de7379de9a488a1e5ace7bb854a4c271c466a8 (commit)
via 1a86e126dcc5d60666d8233a1b458591a6632190 (commit)
via 050be6a5be43ab503820955dbca2751ca368063c (commit)
via 4b056c34fa04a3b611a0cf5f70e9b8d59b7ef632 (commit)
via 510a92b885ff547dd7eecb34093f27a7245f021f (commit)
via abf007273ba68c2eb541763e40b19d1703132685 (commit)
via a4a1652b72a4fc0fb784f08152ef31f97534c76d (commit)
via 08793025fb951153ce374f8eb4f984ee21f6a2bc (commit)
via e3a2f5a80c1e4bd645e7e8bff27ef94f89ceae3e (commit)
via 6ab526bb7fef3d7d42ff728fa30444e75de7be38 (commit)
via 7cdfe579a8ad314cf303a280b0de68b026244748 (commit)
via f8f8b9030fd63fd6ccc10d02cd2e4cba6ea685b8 (commit)
via 3120003dc579730ac67cac8a47f209b14ec748d3 (commit)
via d516e20a5cfce7f1f0c78587f3ce847125c98921 (commit)
via 42677f11798ac78f2898fe5ce9913ff8e14578e8 (commit)
from 02717e4b0875ac5dd204bad1ca034e5814dc237d (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 3b151b842b11182172b5cab36d9648ea63bd1e39
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 20 19:00:32 2017 -0400
9426: test Tags tab
Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>
diff --git a/apps/workbench/app/views/collections/_show_tag_rows.html.erb b/apps/workbench/app/views/collections/_show_tag_rows.html.erb
index da69925..653fb37 100644
--- a/apps/workbench/app/views/collections/_show_tag_rows.html.erb
+++ b/apps/workbench/app/views/collections/_show_tag_rows.html.erb
@@ -7,10 +7,10 @@
<td>
<i class="glyphicon glyphicon-remove collection-tag-remove hide" style="cursor: pointer;"></i>
</td>
- <td class="collection-tag-field">
+ <td class="collection-tag-field collection-tag-field-key">
<%= k %>
</td>
- <td class="collection-tag-field">
+ <td class="collection-tag-field collection-tag-field-value">
<%= v %>
</td>
</tr>
@@ -21,6 +21,6 @@
<td>
<i class="glyphicon glyphicon-remove collection-tag-remove hide" style="cursor: pointer"></i>
</td>
- <td class="collection-tag-field"></td>
- <td class="collection-tag-field"></td>
+ <td class="collection-tag-field collection-tag-field-key"></td>
+ <td class="collection-tag-field collection-tag-field-value"></td>
</tr>
diff --git a/apps/workbench/app/views/collections/_show_tags.html.erb b/apps/workbench/app/views/collections/_show_tags.html.erb
index 4ffe7ff..a1f58ae 100644
--- a/apps/workbench/app/views/collections/_show_tags.html.erb
+++ b/apps/workbench/app/views/collections/_show_tags.html.erb
@@ -5,7 +5,7 @@
<div class="collection-tags-container" style="padding-left:2em;padding-right:2em;">
<% if object.editable? %>
<p title="Edit tags" id="edit-collection-tags">
- <button type="button" class="btn btn-primary edit-collection-tags">Edit</button>
+ <a type="button" class="btn btn-primary edit-collection-tags">Edit</a>
</p>
<% end %>
@@ -31,7 +31,7 @@
<div>
<% if object.editable? %>
<div class="pull-left">
- <button class="btn btn-primary btn-sm collection-tag-add hide"><i class="glyphicon glyphicon-plus"></i> Add new tag </button>
+ <a class="btn btn-primary btn-sm collection-tag-add hide"><i class="glyphicon glyphicon-plus"></i> Add new tag </a>
</div>
<div class="pull-right">
<%= link_to(save_tags_collection_path, {class: 'btn btn-sm btn-primary collection-tag-save hide', :remote => true, method: 'post', return_to: request.url}) do %>
diff --git a/apps/workbench/test/integration/collections_test.rb b/apps/workbench/test/integration/collections_test.rb
index 8b43e5d..208379c 100644
--- a/apps/workbench/test/integration/collections_test.rb
+++ b/apps/workbench/test/integration/collections_test.rb
@@ -420,4 +420,86 @@ class CollectionsTest < ActionDispatch::IntegrationTest
first('.lock-collection-btn').click
accept_alert
end
+
+ test "collection tags tab" do
+ need_selenium
+
+ visit page_with_token('active', '/collections/zzzzz-4zz18-bv31uwvy3neko21')
+
+ click_link 'Tags'
+
+ # verify initial state
+ assert_selector 'a', text: 'Edit'
+ assert_no_selector 'a', text: 'Add new tag'
+ assert_no_selector 'a', text: 'Save'
+ assert_no_selector 'a', text: 'Cancel'
+
+ # Verify controls in edit mode
+ first('.edit-collection-tags').click
+ assert_selector 'a.disabled', text: 'Edit'
+ assert_selector 'a', text: 'Add new tag'
+ assert_selector 'a', text: 'Save'
+ assert_selector 'a', text: 'Cancel'
+
+ # add two tags
+ first('.edit-collection-tags').click
+
+ first('.glyphicon-plus').click
+ first('.collection-tag-field-key').click
+ first('.collection-tag-field-key').set('key 1')
+ first('.collection-tag-field-value').click
+ first('.collection-tag-field-value').set('value 1')
+
+ first('.glyphicon-plus').click
+ editable_key_fields = page.all('.collection-tag-field-key')
+ editable_key_fields[1].click
+ editable_key_fields[1].set('key 2')
+ editable_val_fields = page.all('.collection-tag-field-value')
+ editable_val_fields[1].click
+ editable_val_fields[1].set('value 2')
+
+ click_on 'Save'
+
+ # added tags; verify
+ assert_text 'key 1'
+ assert_text 'value 1'
+ assert_text 'key 2'
+ assert_text 'value 2'
+ assert_selector 'a', text: 'Edit'
+ assert_no_selector 'a', text: 'Save'
+
+ # remove first tag
+ first('.edit-collection-tags').click
+ assert_not_nil first('.glyphicon-remove')
+ first('.glyphicon-remove').click
+ click_on 'Save'
+
+ assert_text 'key 2'
+ assert_text 'value 2'
+ assert_no_text 'key 1'
+ assert_no_text 'value 1'
+ assert_selector 'a', text: 'Edit'
+
+ # Click on cancel and verify
+ first('.edit-collection-tags').click
+ first('.collection-tag-field-key').click
+ first('.collection-tag-field-key').set('this key wont stick')
+ first('.collection-tag-field-value').click
+ first('.collection-tag-field-value').set('this value wont stick')
+
+ click_on 'Cancel'
+
+ assert_text 'key 2'
+ assert_text 'value 2'
+ assert_no_text 'this key wont stick'
+ assert_no_text 'this value wont stick'
+
+ # remove all tags
+ first('.edit-collection-tags').click
+ first('.glyphicon-remove').click
+ click_on 'Save'
+ assert_selector 'a', text: 'Edit'
+ assert_no_text 'key 2'
+ assert_no_text 'value 2'
+ end
end
commit ef15d01d2cb3c988185edd2b891d2b227fb33f3b
Merge: 3a4b025 8c2b89c
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 20 17:25:25 2017 -0400
Merge branch 'master' into 9426-collection-tags
commit 3a4b025c204ef645c9e44163d57f985f7ecfc2ae
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 20 15:13:33 2017 -0400
9426: use "get" method for tags action
Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>
diff --git a/apps/workbench/app/assets/javascripts/edit_collection_tags.js b/apps/workbench/app/assets/javascripts/edit_collection_tags.js
index 9a7ebec..06cd64b 100644
--- a/apps/workbench/app/assets/javascripts/edit_collection_tags.js
+++ b/apps/workbench/app/assets/javascripts/edit_collection_tags.js
@@ -48,7 +48,7 @@ $(document).
}).
on('click', '.collection-tag-cancel', function(e){
$.ajax($(location).attr('pathname')+'/tags', {
- type: 'POST'
+ type: 'GET'
});
});
diff --git a/apps/workbench/app/views/collections/_show_tags.html.erb b/apps/workbench/app/views/collections/_show_tags.html.erb
index 54c9c5c..4ffe7ff 100644
--- a/apps/workbench/app/views/collections/_show_tags.html.erb
+++ b/apps/workbench/app/views/collections/_show_tags.html.erb
@@ -37,7 +37,7 @@
<%= link_to(save_tags_collection_path, {class: 'btn btn-sm btn-primary collection-tag-save hide', :remote => true, method: 'post', return_to: request.url}) do %>
Save
<% end %>
- <%= link_to(tags_collection_path, {class: 'btn btn-sm btn-primary collection-tag-cancel hide', :remote => true, method: 'post', return_to: request.url}) do %>
+ <%= link_to(tags_collection_path, {class: 'btn btn-sm btn-primary collection-tag-cancel hide', :remote => true, method: 'get', return_to: request.url}) do %>
Cancel
<% end %>
</div>
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 5bd4849..bf7118f 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -88,7 +88,7 @@ ArvadosWorkbench::Application.routes.draw do
post 'unshare', :on => :member
get 'choose', on: :collection
post 'remove_selected_files', on: :member
- post 'tags', on: :member
+ get 'tags', on: :member
post 'save_tags', on: :member
end
get('/collections/download/:uuid/:reader_token/*file' => 'collections#show_file',
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list