hyrax 2.1.0.beta2 → 2.1.0.rc1

data/spec/views/hyrax/base/_relationships.html.erb_spec.rb

@@ -77,7 +77,7 @@ RSpec.describe 'hyrax/base/relationships', type: :view do
     it "renders using attribute_to_html" do
       allow(controller).to receive(:current_user).and_return(user)
       allow(solr_doc).to receive(:member_of_collection_ids).and_return([])
-      expect(presenter).to receive(:attribute_to_html).with(:admin_set, render_as: :faceted)
+      expect(presenter).to receive(:attribute_to_html).with(:admin_set, render_as: :faceted, html_dl: true)
       render 'hyrax/base/relationships', presenter: presenter
     end
 

data/spec/views/hyrax/base/_show_actions.html.erb_spec.rb

@@ -16,9 +16,10 @@ RSpec.describe 'hyrax/base/_show_actions.html.erb', type: :view do
       allow(presenter).to receive(:editor?).and_return(false)
       render 'hyrax/base/show_actions.html.erb', presenter: presenter
     end
-    it "doesn't show edit / delete links" do
+    it "doesn't show edit / delete / Add to collection links" do
       expect(rendered).not_to have_link 'Edit'
       expect(rendered).not_to have_link 'Delete'
+      expect(rendered).not_to have_link 'Add to collection'
     end
   end
 
@@ -34,9 +35,10 @@ RSpec.describe 'hyrax/base/_show_actions.html.erb', type: :view do
       it "does not show file manager link" do
         expect(rendered).not_to have_link 'File Manager'
       end
-      it "shows edit / delete links" do
+      it "shows edit / delete / Add to collection links" do
         expect(rendered).to have_link 'Edit'
         expect(rendered).to have_link 'Delete'
+        expect(rendered).to have_button 'Add to collection'
       end
     end
     context "when the work contains 1 child" do

data/spec/views/hyrax/dashboard/collections/_default_group.html.erb_spec.rb

@@ -0,0 +1,43 @@
+RSpec.describe 'hyrax/dashboard/collections/_default_group.html.erb', type: :view do
+  let(:ability) { double }
+
+  before do
+    allow(view).to receive(:docs).and_return([])
+    allow(view).to receive(:current_ability).and_return(ability)
+    stub_template 'hyrax/my/_list_collections.html.erb' => 'collection row'
+  end
+
+  context 'Managed Collections' do
+    before do
+      allow(ability).to receive(:admin?).and_return(false)
+      render
+    end
+
+    it 'shows collection table headings' do
+      expect(rendered).to have_text('Title')
+      expect(rendered).to have_text('Access')
+      expect(rendered).to have_text('Type')
+      expect(rendered).to have_text('Visibility')
+      expect(rendered).to have_text('Items')
+      expect(rendered).to have_text('Last modified')
+      expect(rendered).to have_text('Actions')
+    end
+  end
+
+  context 'All Collections' do
+    before do
+      allow(ability).to receive(:admin?).and_return(true)
+      render
+    end
+
+    it "doesn't show access" do
+      expect(rendered).to have_text('Title')
+      expect(rendered).not_to have_text('Access')
+      expect(rendered).to have_text('Type')
+      expect(rendered).to have_text('Visibility')
+      expect(rendered).to have_text('Items')
+      expect(rendered).to have_text('Last modified')
+      expect(rendered).to have_text('Actions')
+    end
+  end
+end

data/spec/views/hyrax/dashboard/collections/_list_collections.html.erb_spec.rb

@@ -0,0 +1,51 @@
+RSpec.describe 'hyrax/dashboard/collections/_list_collections.html.erb', type: :view do
+  let(:ability) { double }
+  let(:solr_document) { SolrDocument.new(collection_doc) }
+  let(:presenter) { Hyrax::CollectionPresenter.new(solr_document, ability) }
+
+  let(:collection_doc) do
+    {
+      id: '999',
+      'has_model_ssim' => ['Collection'],
+      'title_tesim' => ['Title 1'],
+      'date_created_tesim' => '2000-01-01'
+    }
+  end
+
+  before do
+    allow(view).to receive(:is_admin_set).and_return(false)
+    allow(view).to receive(:current_ability).and_return(ability)
+    allow(presenter).to receive(:available_parent_collections).and_return([])
+    allow(presenter).to receive(:collection_type_badge).and_return('A Collection Type')
+    allow(presenter).to receive(:total_viewable_items).and_return(3)
+    allow(ability).to receive(:can?).with(:edit, solr_document).and_return(false)
+
+    stub_template 'hyrax/my/_collection_action_menu.html.erb' => 'actions'
+  end
+
+  context 'Managed Collections' do
+    before do
+      allow(ability).to receive(:admin?).and_return(false)
+      allow(presenter).to receive(:managed_access).and_return('Manage Access')
+      render('list_collections.html.erb', collection_presenter: presenter)
+    end
+
+    # NOTE: Real labels are Manage, Deposit, or View, but UI shows whatever label gets returned,
+    # so no need to test all conditions.
+    it 'shows access label as returned by presenter' do
+      expect(rendered).to have_text('Manage Access')
+    end
+  end
+
+  context 'All Collections' do
+    before do
+      allow(ability).to receive(:admin?).and_return(true)
+      allow(presenter).to receive(:managed_access).and_return('Manage')
+      render('list_collections.html.erb', collection_presenter: presenter)
+    end
+
+    it "doesn't show access" do
+      expect(rendered).not_to have_text('Manage')
+    end
+  end
+end

data/spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb

@@ -28,6 +28,7 @@ RSpec.describe 'hyrax/dashboard/collections/show.html.erb', type: :view do
 
     allow(collection_type).to receive(:nestable?).and_return(true)
     allow(collection_type).to receive(:title).and_return("User Collection")
+    allow(collection_type).to receive(:badge_color).and_return("#ffa510")
 
     assign(:presenter, presenter)
     # Stub route because view specs don't handle engine routes

data/spec/views/hyrax/dashboard/show_user_spec.rb

@@ -10,6 +10,7 @@ RSpec.describe "hyrax/dashboard/show_user.html.erb", type: :view do
                     render_recent_activity: 'recent activity',
                     render_recent_notifications: 'recent notifications',
                     link_to_additional_notifications: 'additional notifications',
+                    link_to_manage_proxies: 'Manage Proxies',
                     transfers: transfer_presenter)
   end
   let(:transfer_presenter) do
@@ -40,7 +41,8 @@ RSpec.describe "hyrax/dashboard/show_user.html.erb", type: :view do
 
       it 'renders proxy partial' do
         render
-        expect(rendered).to match(/Authorize Proxies/)
+        expect(rendered).to match(/Current Proxies/)
+        expect(rendered).to match(/Manage Proxies/)
       end
     end
 
@@ -51,7 +53,8 @@ RSpec.describe "hyrax/dashboard/show_user.html.erb", type: :view do
 
       it 'does not render proxy partial' do
         render
-        expect(rendered).not_to match(/Authorize Proxies/)
+        expect(rendered).not_to match(/Current Proxies/)
+        expect(rendered).not_to match(/Manage Proxies/)
       end
     end
   end

data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb

@@ -36,6 +36,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
       allow(collection).to receive(:id).and_return(id)
       allow(collection).to receive(:member_of_collection_ids).and_return(["abc", "123"])
       allow(collection_presenter).to receive(:collection_type_badge).and_return("User Collection")
+      allow(collection_presenter).to receive(:allow_batch?).and_return(true)
       view.lookup_context.prefixes.push 'hyrax/my'
       render 'hyrax/my/collections/list_collections', collection_presenter: collection_presenter, is_admin_set: doc.admin_set?
     end
@@ -79,6 +80,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
       allow(view).to receive(:can?).with(:edit, doc).and_return(true)
       allow(doc).to receive(:to_model).and_return(stub_model(AdminSet, id: id))
       allow(collection_presenter).to receive(:collection_type_badge).and_return("Admin Set")
+      allow(collection_presenter).to receive(:allow_batch?).and_return(true)
       view.lookup_context.prefixes.push 'hyrax/my'
 
       render 'hyrax/my/collections/list_collections', collection_presenter: collection_presenter, is_admin_set: doc.admin_set?

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.1.0.beta2'
+gem 'hyrax', '2.1.0.rc1'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -620,20 +620,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -744,14 +738,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -1122,6 +1116,8 @@ files:
 - app/assets/javascripts/hyrax/collection_types.es6
 - app/assets/javascripts/hyrax/collections.js
 - app/assets/javascripts/hyrax/collections/editor.es6
+- app/assets/javascripts/hyrax/collections_utils.es6
+- app/assets/javascripts/hyrax/collections_v2.es6
 - app/assets/javascripts/hyrax/config.js.erb
 - app/assets/javascripts/hyrax/content_blocks.js
 - app/assets/javascripts/hyrax/dashboard_actions.js
@@ -1139,6 +1135,7 @@ files:
 - app/assets/javascripts/hyrax/ga_events.js
 - app/assets/javascripts/hyrax/initialize.js
 - app/assets/javascripts/hyrax/monkey_patch_turbolinks.js.coffee
+- app/assets/javascripts/hyrax/nav_safety.js
 - app/assets/javascripts/hyrax/notification.es6
 - app/assets/javascripts/hyrax/permissions.js
 - app/assets/javascripts/hyrax/permissions/control.es6
@@ -1725,6 +1722,7 @@ files:
 - app/views/hyrax/admin/admin_sets/_form_participants.html.erb
 - app/views/hyrax/admin/admin_sets/_form_visibility.html.erb
 - app/views/hyrax/admin/admin_sets/_form_workflow.erb
+- app/views/hyrax/admin/admin_sets/_show_actions.html.erb
 - app/views/hyrax/admin/admin_sets/_show_document_list.html.erb
 - app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb
 - app/views/hyrax/admin/admin_sets/_sort_and_per_page.html.erb
@@ -1735,6 +1733,7 @@ files:
 - app/views/hyrax/admin/admin_sets/show.html.erb
 - app/views/hyrax/admin/appearances/show.html.erb
 - app/views/hyrax/admin/collection_types/_form.html.erb
+- app/views/hyrax/admin/collection_types/_form_appearance.html.erb
 - app/views/hyrax/admin/collection_types/_form_metadata.html.erb
 - app/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb
 - app/views/hyrax/admin/collection_types/_form_participant_table.html.erb
@@ -1768,6 +1767,7 @@ files:
 - app/views/hyrax/base/_file_manager_thumbnail.html.erb
 - app/views/hyrax/base/_form.html.erb
 - app/views/hyrax/base/_form_child_work_relationships.html.erb
+- app/views/hyrax/base/_form_collections_error.html.erb
 - app/views/hyrax/base/_form_files.html.erb
 - app/views/hyrax/base/_form_in_works.html.erb
 - app/views/hyrax/base/_form_in_works_error.html.erb
@@ -1846,11 +1846,11 @@ files:
 - app/views/hyrax/contact_form/new.html.erb
 - app/views/hyrax/contact_mailer/contact.html.erb
 - app/views/hyrax/content_blocks/_form.html.erb
-- app/views/hyrax/content_blocks/_modal_content_block.html.erb
 - app/views/hyrax/content_blocks/edit.html.erb
 - app/views/hyrax/content_blocks/templates/agreement.html.erb
 - app/views/hyrax/content_blocks/templates/terms.html.erb
 - app/views/hyrax/dashboard/_admin_sets.html.erb
+- app/views/hyrax/dashboard/_index_partials/_current_proxy_rights.html.erb
 - app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb
 - app/views/hyrax/dashboard/_index_partials/_transfers.html.erb
 - app/views/hyrax/dashboard/_sidebar.html.erb
@@ -1862,6 +1862,7 @@ files:
 - app/views/hyrax/dashboard/collections/_button_for_update_collection.html.erb
 - app/views/hyrax/dashboard/collections/_button_remove_from_collection.html.erb
 - app/views/hyrax/dashboard/collections/_collection_title.html.erb
+- app/views/hyrax/dashboard/collections/_default_group.html.erb
 - app/views/hyrax/dashboard/collections/_document_list.html.erb
 - app/views/hyrax/dashboard/collections/_edit_actions.html.erb
 - app/views/hyrax/dashboard/collections/_flash_msg.html.erb
@@ -1992,6 +1993,7 @@ files:
 - app/views/hyrax/my/collections/_modal_delete_admin_set_deny.html.erb
 - app/views/hyrax/my/collections/_modal_delete_collection.html.erb
 - app/views/hyrax/my/collections/_modal_delete_collection_deny.html.erb
+- app/views/hyrax/my/collections/_modal_delete_collections_deny.html.erb
 - app/views/hyrax/my/collections/_modal_delete_deny.html.erb
 - app/views/hyrax/my/collections/_modal_delete_empty_collection.html.erb
 - app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb
@@ -2077,6 +2079,7 @@ files:
 - app/views/shared/_citations.html.erb
 - app/views/shared/_footer.html.erb
 - app/views/shared/_locale_picker.html.erb
+- app/views/shared/_nav_safety_modal.html.erb
 - app/views/shared/_select_work_type_modal.html.erb
 - artifacts/entity-relationship-diagram.dot
 - artifacts/entity-relationship-diagram.pdf
@@ -2112,6 +2115,7 @@ files:
 - lib/generators/hyrax/models_generator.rb
 - lib/generators/hyrax/riiif_generator.rb
 - lib/generators/hyrax/sample_data_generator.rb
+- lib/generators/hyrax/templates/app/assets/images/unauthorized.png
 - lib/generators/hyrax/templates/app/assets/images/us_404.svg
 - lib/generators/hyrax/templates/app/models/collection.rb
 - lib/generators/hyrax/templates/app/models/file_set.rb
@@ -2190,6 +2194,7 @@ files:
 - lib/generators/hyrax/templates/db/migrate/20171103080032_add_collection_type_sharing_options.rb.erb
 - lib/generators/hyrax/templates/db/migrate/20171117153051_add_unique_constraint_to_permission_template_accesses.rb.erb
 - lib/generators/hyrax/templates/db/migrate/20180302200051_add_branding_to_collection_type.rb.erb
+- lib/generators/hyrax/templates/db/migrate/20180406202557_add_badge_color_to_collection_types.rb.erb
 - lib/generators/hyrax/templates/db/seeds.rb
 - lib/generators/hyrax/templates/hyrax.scss
 - lib/generators/hyrax/templates/hyrax_helper.rb
@@ -2370,6 +2375,7 @@ files:
 - spec/conversions/power_converters/sipity_workflow_id_spec.rb
 - spec/conversions/power_converters/sipity_workflow_state_spec.rb
 - spec/factories/admin_sets.rb
+- spec/factories/admin_sets_lw.rb
 - spec/factories/api_items.rb
 - spec/factories/collection_branding_infos.rb
 - spec/factories/collection_type_participants.rb
@@ -2392,6 +2398,7 @@ files:
 - spec/factories/workflow_actions.rb
 - spec/factories/workflow_states.rb
 - spec/factories/workflows.rb
+- spec/factory_tests/adminsets_factory_spec.rb
 - spec/factory_tests/collections_factory_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
@@ -2820,12 +2827,14 @@ files:
 - spec/views/hyrax/admin/admin_sets/_form_participants.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_form_visibility.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_form_workflow.html.erb_spec.rb
+- spec/views/hyrax/admin/admin_sets/_show_actions.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_show_document_list.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/index.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/index.json.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/show.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_appearance.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form_metadata.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form_participants.html.erb_spec.rb
@@ -2869,12 +2878,14 @@ files:
 - spec/views/hyrax/collections/_subcollection_list.html.erb_spec.rb
 - spec/views/hyrax/collections/show.html.erb_spec.rb
 - spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_default_group.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_branding.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_discovery.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_list_collections.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_descriptions.html.erb_spec.rb
@@ -3090,6 +3101,7 @@ test_files:
 - spec/conversions/power_converters/sipity_workflow_id_spec.rb
 - spec/conversions/power_converters/sipity_workflow_state_spec.rb
 - spec/factories/admin_sets.rb
+- spec/factories/admin_sets_lw.rb
 - spec/factories/api_items.rb
 - spec/factories/collection_branding_infos.rb
 - spec/factories/collection_type_participants.rb
@@ -3112,6 +3124,7 @@ test_files:
 - spec/factories/workflow_actions.rb
 - spec/factories/workflow_states.rb
 - spec/factories/workflows.rb
+- spec/factory_tests/adminsets_factory_spec.rb
 - spec/factory_tests/collections_factory_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
@@ -3540,12 +3553,14 @@ test_files:
 - spec/views/hyrax/admin/admin_sets/_form_participants.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_form_visibility.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_form_workflow.html.erb_spec.rb
+- spec/views/hyrax/admin/admin_sets/_show_actions.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_show_document_list.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/index.html.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/index.json.erb_spec.rb
 - spec/views/hyrax/admin/admin_sets/show.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form.html.erb_spec.rb
+- spec/views/hyrax/admin/collection_types/_form_appearance.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form_metadata.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form_metadata_admin_set.html.erb_spec.rb
 - spec/views/hyrax/admin/collection_types/_form_participants.html.erb_spec.rb
@@ -3589,12 +3604,14 @@ test_files:
 - spec/views/hyrax/collections/_subcollection_list.html.erb_spec.rb
 - spec/views/hyrax/collections/show.html.erb_spec.rb
 - spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_default_group.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_branding.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_discovery.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb
+- spec/views/hyrax/dashboard/collections/_list_collections.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb_spec.rb
 - spec/views/hyrax/dashboard/collections/_show_descriptions.html.erb_spec.rb

data/app/views/hyrax/content_blocks/_modal_content_block.html.erb

@@ -1,15 +0,0 @@
-<div class="modal fade" id="change-tab-content-block" tabindex="-1" role="dialog">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="delete-collection-form">
-        <div class="modal-body">
-          <%= t(:'hyrax.content_blocks.change_tab_message') %>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal"><%= t('helpers.action.cancel') %></button>
-          <%= link_to 'OK', hyrax.edit_content_blocks_path, class: 'btn btn-default', id: "change-tab-btn" %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>