hyrax 2.1.0.rc3 → 2.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025cc22285626454040035c0cf14f5d89d818fa8
-  data.tar.gz: 5669ec53c680bfe657ba9f1064102b43c5cd6efd
+  metadata.gz: bf48eeb6b1a64bc4d19de32c47c6c776387ec40d
+  data.tar.gz: f5ee75a59cd3f27fa135d4a623e47430594037d0
 SHA512:
-  metadata.gz: a301edaa82e5823d68d31c7e4dd547848fbac537ae1e30ff6db7de2fc45897d7a2b3171560a1a8f62f242e921d259f5e0ab1a682ff4e7393ba9f446c17745b6e
-  data.tar.gz: b034075731f730600bb4415a273e9ae2ed641615052275a91e6d15e52a77af64c15d55687a6922cab802e6cf64118fc365b0e00ab245aafbe0c5014611b2fc0c
+  metadata.gz: f7699b73766c7b747377e563f16049a02339cefb40cac5b2190795cb1045fce60a64f85d0c4571851fe36ca6ef7f53e16a566faca7711798627cbf15a9746f8e
+  data.tar.gz: b528b5192fc06718fecb1130b4d17b792a4e11b116a7a383091193632b62ccf0d29901004a599f2a4abbf7c9377ef98d8b6230bdc028569b8ccb73b2fe77ba48

data/README.md

@@ -63,7 +63,7 @@ The Samvera community is here to help. Please see our [support guide](./.github/
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v2.1.0.rc3__. If you are looking for instructions on installing a different
+v2.1.0.rc4__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -162,7 +162,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.1.0.rc3/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.1.0.rc4/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:
@@ -188,6 +188,13 @@ Notes:
 * This web server is purely for development purposes. You will want to use a more fully featured [web server](#web-server) for production-like environments.
 * You have the option to start each of these services individually.  More information on [solr_wrapper](https://github.com/cbeer/solr_wrapper) and [fcrepo_wrapper](https://github.com/cbeer/fcrepo_wrapper) will help you set this up.  Start rails with `rails s`.
 
+### Avoid Performance Issues with solr-suggest
+
+*Recommended for all Hyrax apps.*
+
+It is strongly suggested that you turn off solr-suggest.  Details on why and how to do this are in 
+[Fix performance issue caused by solr-suggest](https://github.com/samvera/hyrax/wiki/Troubleshooting-Migration-from-2.0.x-to-2.1.0#fix-performance-issue-caused-by-solr-suggest-after-200-objects-are-in-the-repository).
+
 ## Start background workers
 
 Many of the services performed by Hyrax are resource intensive, and therefore are well suited to running as background jobs that can be managed and executed by a message queuing system. Examples include:

data/app/assets/javascripts/hyrax/save_work/visibility_component.es6

@@ -8,7 +8,7 @@ export default class VisibilityComponent {
     this.element = element
     this.adminSetWidget = adminSetWidget
     this.form = element.closest('form')
-    $('.collapse').collapse({ toggle: false })
+      this.element.find('.collapse').collapse({ toggle: false })
     element.find("[type='radio']").on('change', () => { this.showForm() })
     // Ensure any disabled options are re-enabled when form submits
     this.form.on('submit', () => { this.enableAllOptions() })
@@ -22,7 +22,7 @@ export default class VisibilityComponent {
 
   // Collapse all Visibility sub-options
   collapseAll() {
-    $('.collapse').collapse('hide');
+      this.element.find('.collapse').collapse('hide');
   }
 
   // Open the selected Visibility's sub-options, collapsing all others
@@ -33,8 +33,8 @@ export default class VisibilityComponent {
 
     if(target) {
       // Show the target suboption and hide all others
-      $('.collapse' + target).collapse('show');
-      $('.collapse:not(' + target + ')').collapse('hide');
+        this.element.find('.collapse' + target).collapse('show');
+        this.element.find('.collapse:not(' + target + ')').collapse('hide');
     }
     else {
       this.collapseAll()

data/app/controllers/concerns/hyrax/controller.rb

@@ -6,6 +6,7 @@ module Hyrax::Controller
 
     # Adds Hydra behaviors into the application controller
     include Hydra::Controller::ControllerBehavior
+    helper_method :create_work_presenter
     before_action :set_locale
   end
 
@@ -14,6 +15,20 @@ module Hyrax::Controller
     hyrax.dashboard_path
   end
 
+  ##
+  # @deprecated this helper is no longer used by Hyrax; if you need access to
+  #   this presenter on every page, you may need to readd it manually.
+  #
+  # A presenter for selecting a work type to create this is needed here because
+  # the selector is in the header on every page.
+  def create_work_presenter
+    Deprecation.warn(self, "The `create_work_presenter` helper is deprecated " \
+                           "for removal in Hyrax 3.0. The work selector has " \
+                           "been removed the masthead in Hyrax 2.1.")
+
+    Hyrax::SelectTypeListPresenter.new(current_user)
+  end
+
   # Ensure that the locale choice is persistent across requests
   def default_url_options
     super.merge(locale: I18n.locale)

data/app/controllers/concerns/hyrax/works_controller_behavior.rb

@@ -192,7 +192,9 @@ module Hyrax
       end
 
       def curation_concern_from_search_results
-        search_result_document(params)
+        search_params = params
+        search_params.delete :page
+        search_result_document(search_params)
       end
 
       # Only returns unsuppressed documents the user has read access to

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -257,6 +257,14 @@ module Hyrax
       content_tag(:span, "", class: [Hyrax::ModelIcon.css_class_for(Collection), "collection-icon-search"])
     end
 
+    def collection_title_by_id(id)
+      solr_docs = controller.repository.find(id).docs
+      return nil if solr_docs.empty?
+      solr_field = solr_docs.first[Solrizer.solr_name("title", :stored_searchable)]
+      return nil if solr_field.nil?
+      solr_field.first
+    end
+
     private
 
       def user_agent

data/app/jobs/attach_files_to_work_job.rb

@@ -12,10 +12,10 @@ class AttachFilesToWorkJob < Hyrax::ApplicationJob
     metadata = visibility_attributes(work_attributes)
     uploaded_files.each do |uploaded_file|
       actor = Hyrax::Actors::FileSetActor.new(FileSet.create, user)
+      actor.file_set.permissions_attributes = work_permissions
       actor.create_metadata(metadata)
       actor.create_content(uploaded_file)
       actor.attach_to_work(work)
-      actor.file_set.permissions_attributes = work_permissions
       uploaded_file.update(file_set_uri: actor.file_set.uri)
     end
   end

data/app/presenters/hyrax/admin_set_presenter.rb

@@ -24,7 +24,7 @@ module Hyrax
     end
 
     def show_path
-      Hyrax::Engine.routes.url_helpers.admin_admin_set_path(id)
+      Hyrax::Engine.routes.url_helpers.admin_admin_set_path(id, locale: I18n.locale)
     end
 
     def available_parent_collections(*)

data/app/presenters/hyrax/collection_presenter.rb

@@ -104,7 +104,7 @@ module Hyrax
     end
 
     def show_path
-      Hyrax::Engine.routes.url_helpers.dashboard_collection_path(id)
+      Hyrax::Engine.routes.url_helpers.dashboard_collection_path(id, locale: I18n.locale)
     end
 
     def banner_file

data/app/presenters/hyrax/file_set_presenter.rb

@@ -82,12 +82,7 @@ module Hyrax
     end
 
     def parent
-      ids = ActiveFedora::SolrService.query("{!field f=member_ids_ssim}#{id}",
-                                            fl: ActiveFedora.id_field)
-                                     .map { |x| x.fetch(ActiveFedora.id_field) }
-      @parent_presenter ||= Hyrax::PresenterFactory.build_for(ids: ids,
-                                                              presenter_class: WorkShowPresenter,
-                                                              presenter_args: current_ability).first
+      @parent_presenter ||= fetch_parent_presenter
     end
 
     def user_can_perform_any_action?
@@ -99,5 +94,14 @@ module Hyrax
       def link_presenter_class
         SingleUseLinkPresenter
       end
+
+      def fetch_parent_presenter
+        ids = ActiveFedora::SolrService.query("{!field f=member_ids_ssim}#{id}",
+                                              fl: ActiveFedora.id_field)
+                                       .map { |x| x.fetch(ActiveFedora.id_field) }
+        Hyrax::PresenterFactory.build_for(ids: ids,
+                                          presenter_class: WorkShowPresenter,
+                                          presenter_args: current_ability).first
+      end
   end
 end

data/app/presenters/hyrax/member_presenter_factory.rb

@@ -36,17 +36,17 @@ module Hyrax
       @work_presenters ||= member_presenters(ordered_ids - file_set_ids, work_presenter_class)
     end
 
-    private
+    # TODO: Extract this to ActiveFedora::Aggregations::ListSource
+    def ordered_ids
+      @ordered_ids ||= begin
+                         ActiveFedora::SolrService.query("proxy_in_ssi:#{id}",
+                                                         rows: 10_000,
+                                                         fl: "ordered_targets_ssim")
+                                                  .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
+                       end
+    end
 
-      # TODO: Extract this to ActiveFedora::Aggregations::ListSource
-      def ordered_ids
-        @ordered_ids ||= begin
-                           ActiveFedora::SolrService.query("proxy_in_ssi:#{id}",
-                                                           rows: 10_000,
-                                                           fl: "ordered_targets_ssim")
-                                                    .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
-                         end
-      end
+    private
 
       # These are the file sets that belong to this work, but not necessarily
       # in order.

data/app/presenters/hyrax/work_show_presenter.rb

@@ -69,7 +69,7 @@ module Hyrax
       return nil if representative_id.blank?
       @representative_presenter ||=
         begin
-          result = member_presenters([representative_id]).first
+          result = member_presenters_for([representative_id]).first
           return nil if result.try(:id) == id
           if result.respond_to?(:representative_presenter)
             result.representative_presenter
@@ -153,10 +153,22 @@ module Hyrax
       solr_document.to_model
     end
 
-    delegate :member_presenters, :file_set_presenters, :work_presenters, to: :member_presenter_factory
+    delegate :member_presenters, :ordered_ids, :file_set_presenters, :work_presenters, to: :member_presenter_factory
 
-    def exclude_unauthorized_members
-      member_presenters.delete_if { |m| !current_ability.can?(:read, m.id) }
+    # @return [Array] list to display with Kaminari pagination
+    def list_of_item_ids_to_display
+      paginated_item_list(page_array: authorized_item_ids)
+    end
+
+    # @param [Array<String>] ids a list of ids to build presenters for
+    # @return [Array<presenter_class>] presenters for the array of ids (not filtered by class)
+    def member_presenters_for(an_array_of_ids)
+      member_presenters(an_array_of_ids)
+    end
+
+    # @return [Integer] total number of pages of viewable items
+    def total_pages
+      (total_items.to_f / rows_from_params.to_f).ceil
     end
 
     def manifest_url
@@ -194,6 +206,33 @@ module Hyrax
 
     private
 
+      # list of item ids to display is based on ordered_ids
+      def authorized_item_ids
+        @member_item_list_ids ||= begin
+          items = ordered_ids
+          items.delete_if { |m| !current_ability.can?(:read, m) } if Flipflop.hide_private_items?
+          items
+        end
+      end
+
+      # Uses kaminari to paginate an array to avoid need for solr documents for items here
+      def paginated_item_list(page_array:)
+        Kaminari.paginate_array(page_array, total_count: page_array.size).page(current_page).per(rows_from_params)
+      end
+
+      def total_items
+        authorized_item_ids.size
+      end
+
+      def rows_from_params
+        request.params[:rows].nil? ? Hyrax.config.show_work_item_rows : request.params[:rows].to_i
+      end
+
+      def current_page
+        page = request.params[:page].nil? ? 1 : request.params[:page].to_i
+        page > total_pages ? total_pages : page
+      end
+
       def manifest_helper
         @manifest_helper ||= ManifestHelper.new(request.base_url)
       end

data/app/renderers/hyrax/renderers/faceted_attribute_renderer.rb

@@ -8,7 +8,7 @@ module Hyrax
         end
 
         def search_path(value)
-          Rails.application.routes.url_helpers.search_catalog_path(:"f[#{search_field}][]" => value)
+          Rails.application.routes.url_helpers.search_catalog_path(:"f[#{search_field}][]" => value, locale: I18n.locale)
         end
 
         def search_field

data/app/renderers/hyrax/renderers/linked_attribute_renderer.rb

@@ -9,7 +9,7 @@ module Hyrax
 
         def search_path(value)
           Rails.application.routes.url_helpers.search_catalog_path(
-            search_field: search_field, q: ERB::Util.h(value)
+            search_field: search_field, q: ERB::Util.h(value), locale: I18n.locale
           )
         end
 

data/app/search_builders/hyrax/catalog_search_builder.rb

@@ -2,7 +2,8 @@ class Hyrax::CatalogSearchBuilder < Hyrax::SearchBuilder
   self.default_processor_chain += [
     :add_access_controls_to_solr_params,
     :show_works_or_works_that_contain_files,
-    :show_only_active_records
+    :show_only_active_records,
+    :filter_collection_facet_for_access
   ]
 
   # show both works that match the query and works that contain files that match the query
@@ -19,6 +20,18 @@ class Hyrax::CatalogSearchBuilder < Hyrax::SearchBuilder
     solr_parameters[:fq] << '-suppressed_bsi:true'
   end
 
+  # only return facet counts for collections that this user has access to see
+  def filter_collection_facet_for_access(solr_parameters)
+    return if current_ability.admin?
+
+    collection_ids = Hyrax::Collections::PermissionsService.collection_ids_for_view(ability: current_ability).map { |id| "^#{id}$" }
+    solr_parameters['f.member_of_collection_ids_ssim.facet.matches'] = if collection_ids.present?
+                                                                         collection_ids.join('|')
+                                                                       else
+                                                                         "^$"
+                                                                       end
+  end
+
   private
 
     # the {!lucene} gives us the OR syntax

data/app/services/hyrax/collections/permissions_service.rb

@@ -97,6 +97,19 @@ module Hyrax
         source_ids_for_deposit(ability: ability, source_type: 'collection')
       end
 
+      # @api public
+      #
+      # IDs of collections which the user can view.
+      #
+      # @param ability [Ability] the ability coming from cancan ability check
+      # @return [Array<String>] IDs of collections into which the user can view
+      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
+      def self.collection_ids_for_view(ability:)
+        collection_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE,
+                                                           Hyrax::PermissionTemplateAccess::DEPOSIT,
+                                                           Hyrax::PermissionTemplateAccess::VIEW])
+      end
+
       # @api public
       #
       # Determine if the given user has permissions to view the admin show page for at least one collection

data/app/views/hyrax/base/_items.html.erb

@@ -1,5 +1,6 @@
 <h2><%= t('.header') %></h2>
-<%  members = Flipflop.hide_private_items? ? presenter.exclude_unauthorized_members : presenter.member_presenters %>
+<%  array_of_ids = presenter.list_of_item_ids_to_display %>
+<%  members = presenter.member_presenters_for(array_of_ids) %>
 <% if members.present? %>
   <table class="table table-striped related-files">
     <thead>
@@ -15,6 +16,13 @@
       <%= render partial: 'member', collection: members %>
     </tbody>
   </table>
+  <div class="row">
+    <% if presenter.total_pages > 1 %>
+        <div class="row record-padding col-md-9">
+          <%= paginate array_of_ids, outer_window: 2, theme: 'blacklight', param_name: :page, route_set: main_app %>
+        </div><!-- /pager -->
+    <% end %>
+  </div>
 <% elsif can? :edit, presenter.id %>
     <div class="alert alert-warning" role="alert"><%= t('.empty', type: presenter.human_readable_type) %></div>
 <% else %>

data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb

@@ -33,11 +33,12 @@
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal"><%= t("hyrax.collection.select_form.close") %></button>
           <% if user_collections.blank? %>
-            <%= render 'hyrax/dashboard/collections/button_create_collection', label: t("hyrax.collection.select_form.create") %>
-
+              <% # TODO: Uncomment the following line when errors with adding works to a new collection are resolved.  See Issue hyrax#3088 %>
+              <% # = render 'hyrax/dashboard/collections/button_create_collection', label: t("hyrax.collection.select_form.create") %>
           <% else %>
             <%= render 'hyrax/dashboard/collections/button_for_update_collection', label: t("hyrax.collection.select_form.update"), collection_id: 'collection_replace_id' %>
-            <%= render 'hyrax/dashboard/collections/button_create_collection', label: t("hyrax.collection.select_form.create_new") %>
+            <% # TODO: Uncomment the following line when errors with adding works to a new collection are resolved.  See Issue hyrax#3088 %>
+            <% # = render 'hyrax/dashboard/collections/button_create_collection', label: t("hyrax.collection.select_form.create_new") %>
           <% end %>
         </div>
       </div><!-- /.modal-content -->

data/lib/generators/hyrax/templates/catalog_controller.rb

@@ -44,7 +44,7 @@ class CatalogController < ApplicationController
     config.add_facet_field solr_name("based_near_label", :facetable), limit: 5
     config.add_facet_field solr_name("publisher", :facetable), limit: 5
     config.add_facet_field solr_name("file_format", :facetable), limit: 5
-    config.add_facet_field solr_name('member_of_collections', :symbol), limit: 5, label: 'Collections'
+    config.add_facet_field solr_name('member_of_collection_ids', :symbol), limit: 5, label: 'Collections', helper_method: :collection_title_by_id
 
     # The generic_type isn't displayed on the facet list
     # It's used to give a label to the filter that comes from the user profile

data/lib/generators/hyrax/templates/config/initializers/hyrax.rb

@@ -116,6 +116,10 @@ Hyrax.config do |config|
   # The default is true.
   # config.work_requires_files = true
 
+  # How many rows of items should appear on the work show view?
+  # The default is 10
+  # config.show_work_item_rows = 10
+
   # Enable IIIF image service. This is required to use the
   # UniversalViewer-ified show page
   #

data/lib/hyrax/configuration.rb

@@ -340,6 +340,11 @@ module Hyrax
       @work_requires_files
     end
 
+    attr_writer :show_work_item_rows
+    def show_work_item_rows
+      @show_work_item_rows ||= 10 # rows on show view
+    end
+
     attr_writer :batch_user_key
     def batch_user_key
       @batch_user_key ||= 'batchuser@example.com'

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.1.0.rc3'.freeze
+  VERSION = '2.1.0.rc4'.freeze
 end

data/spec/features/catalog_search_spec.rb

@@ -28,4 +28,45 @@ RSpec.describe 'catalog searching', type: :feature do
       expect(page).to have_content(collection.title.first)
     end
   end
+
+  context 'with public works and private collections', clean_repo: true do
+    let!(:collection) { create(:private_collection) }
+
+    let!(:jills_work) do
+      create(:public_work, title: ["Jill's Research"], keyword: ['jills_keyword'], member_of_collections: [collection])
+    end
+
+    it "hides collection facet values the user doesn't have access to view when performing a search" do
+      within('#search-form-header') do
+        fill_in('search-field-header', with: 'jills_keyword')
+        click_button('Go')
+      end
+
+      expect(page).to have_content('Search Results')
+      expect(page).to have_content(jills_work.title.first)
+      expect(page).not_to have_content(collection.title.first)
+      expect(page).not_to have_css('.blacklight-member_of_collection_ids_ssim')
+    end
+
+    context 'as an admin' do
+      let(:admin_user) { create :admin }
+
+      before do
+        sign_in admin_user
+        visit '/'
+      end
+
+      it "shows collection facet values the user has access to view when performing a search" do
+        within('#search-form-header') do
+          fill_in('search-field-header', with: 'jills_keyword')
+          click_button('Go')
+        end
+
+        expect(page).to have_content('Search Results')
+        expect(page).to have_content(jills_work.title.first)
+        find('.blacklight-member_of_collection_ids_ssim').click
+        expect(page).to have_content(collection.title.first)
+      end
+    end
+  end
 end

data/spec/helpers/hyrax_helper_spec.rb

@@ -366,4 +366,34 @@ RSpec.describe HyraxHelper, type: :helper do
       expect(helper.banner_image).to eq(Hyrax.config.banner_image)
     end
   end
+
+  describe "#collection_title_by_id" do
+    let(:solr_doc) { double(id: "abcd12345") }
+    let(:bad_solr_doc) { double(id: "efgh67890") }
+    let(:solr_response) { double(docs: [solr_doc]) }
+    let(:bad_solr_response) { double(docs: [bad_solr_doc]) }
+    let(:empty_solr_response) { double(docs: []) }
+    let(:repository) { double }
+
+    before do
+      allow(controller).to receive(:repository).and_return(repository)
+      allow(solr_doc).to receive(:[]).with("title_tesim").and_return(["Collection of Awesomeness"])
+      allow(bad_solr_doc).to receive(:[]).with("title_tesim").and_return(nil)
+      allow(repository).to receive(:find).with("abcd12345").and_return(solr_response)
+      allow(repository).to receive(:find).with("efgh67890").and_return(bad_solr_response)
+      allow(repository).to receive(:find).with("bad-id").and_return(empty_solr_response)
+    end
+
+    it "returns the first title of the collection" do
+      expect(helper.collection_title_by_id("abcd12345")).to eq "Collection of Awesomeness"
+    end
+
+    it "returns nil if collection doesn't have title_tesim field" do
+      expect(helper.collection_title_by_id("efgh67890")).to eq nil
+    end
+
+    it "returns nil if collection not found" do
+      expect(helper.collection_title_by_id("bad-id")).to eq nil
+    end
+  end
 end

data/spec/lib/hyrax/configuration_spec.rb

@@ -72,6 +72,7 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:rights_statement_service_class=) }
   it { is_expected.to respond_to(:redis_namespace) }
   it { is_expected.to respond_to(:subject_prefix) }
+  it { is_expected.to respond_to(:show_work_item_rows) }
   it { is_expected.to respond_to(:translate_id_to_uri) }
   it { is_expected.to respond_to(:translate_uri_to_id) }
   it { is_expected.to respond_to(:upload_path) }

data/spec/presenters/hyrax/admin_set_presenter_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe Hyrax::AdminSetPresenter do
 
     subject { presenter.show_path }
 
-    it { is_expected.to eq "/admin/admin_sets/#{admin_set.id}" }
+    it { is_expected.to eq "/admin/admin_sets/#{admin_set.id}?locale=en" }
   end
 
   describe '#managed_access' do

data/spec/presenters/hyrax/collection_presenter_spec.rb

@@ -357,7 +357,7 @@ RSpec.describe Hyrax::CollectionPresenter do
   describe '#show_path' do
     subject { presenter.show_path }
 
-    it { is_expected.to eq "/dashboard/collections/#{solr_doc.id}" }
+    it { is_expected.to eq "/dashboard/collections/#{solr_doc.id}?locale=en" }
   end
 
   describe "banner_file" do

data/spec/presenters/hyrax/work_show_presenter_spec.rb

@@ -30,6 +30,8 @@ RSpec.describe Hyrax::WorkShowPresenter do
   it { is_expected.to delegate_method(:resource_type).to(:solr_document) }
   it { is_expected.to delegate_method(:keyword).to(:solr_document) }
   it { is_expected.to delegate_method(:itemtype).to(:solr_document) }
+  it { is_expected.to delegate_method(:member_presenters).to(:member_presenter_factory) }
+  it { is_expected.to delegate_method(:ordered_ids).to(:member_presenter_factory) }
 
   describe "#model_name" do
     subject { presenter.model_name }
@@ -224,13 +226,86 @@ RSpec.describe Hyrax::WorkShowPresenter do
     end
   end
 
-  describe "exclude_unauthorized_members" do
+  describe "#member_presenters_for" do
     let(:obj) { create(:work_with_file_and_work) }
     let(:attributes) { obj.to_solr }
-    let(:ability) { double Ability, can?: false }
+    let(:items) { presenter.ordered_ids }
+    let(:subject) { presenter.member_presenters_for(items) }
 
-    it 'filters out unauthorized members' do
-      expect(presenter.exclude_unauthorized_members.count).to eq 0
+    it "returns appropriate classes for each item" do
+      expect(subject.size).to eq 2
+      expect(subject.first).to be_instance_of(Hyrax::FileSetPresenter)
+      expect(subject.last).to be_instance_of(described_class)
+    end
+  end
+
+  describe "#list_of_item_ids_to_display" do
+    let(:subject) { presenter.list_of_item_ids_to_display }
+    let(:items_list) { ['item0', 'item1', 'item2', 'item3', 'item4', 'item5', 'item6', 'item7', 'item8', 'item9'] }
+    let(:rows) { 10 }
+    let(:page) { 1 }
+    let(:ability) { double "Ability" }
+    let(:current_ability) { ability }
+
+    before do
+      allow(presenter).to receive(:ordered_ids).and_return(items_list)
+      allow(current_ability).to receive(:can?).with(:read, 'item0').and_return true
+      allow(current_ability).to receive(:can?).with(:read, 'item1').and_return false
+      allow(current_ability).to receive(:can?).with(:read, 'item2').and_return true
+      allow(current_ability).to receive(:can?).with(:read, 'item3').and_return false
+      allow(current_ability).to receive(:can?).with(:read, 'item4').and_return true
+      allow(current_ability).to receive(:can?).with(:read, 'item5').and_return true
+      allow(current_ability).to receive(:can?).with(:read, 'item6').and_return false
+      allow(current_ability).to receive(:can?).with(:read, 'item7').and_return true
+      allow(current_ability).to receive(:can?).with(:read, 'item8').and_return false
+      allow(current_ability).to receive(:can?).with(:read, 'item9').and_return true
+      allow(presenter).to receive(:rows_from_params).and_return(rows)
+      allow(presenter).to receive(:current_page).and_return(page)
+      allow(Flipflop).to receive(:hide_private_items?).and_return(answer)
+    end
+
+    context 'when hiding private items' do
+      let(:answer) { true }
+
+      it "returns viewable items" do
+        expect(subject.size).to eq 6
+        expect(subject).to be_instance_of(Kaminari::PaginatableArray)
+        expect(subject).to include("item0", "item2", "item4", "item5", "item7", "item9")
+      end
+    end
+    context 'when including private items' do
+      let(:answer) { false }
+
+      it "returns appropriate items" do
+        expect(subject.size).to eq 10
+        expect(subject).to be_instance_of(Kaminari::PaginatableArray)
+        expect(subject).to eq(items_list)
+      end
+    end
+    context 'with pagination' do
+      let(:rows) { 3 }
+      let(:page) { 2 }
+
+      let(:answer) { true }
+      it 'partitions the item list and excluding hidden items' do
+        expect(subject).to eq(['item5', 'item7', 'item9'])
+      end
+    end
+  end
+
+  describe "#total_pages" do
+    let(:subject) { presenter.total_pages }
+    let(:items) { 17 }
+    let(:rows) { 4 }
+
+    before do
+      allow(Flipflop).to receive(:hide_private_items?).and_return(false)
+      allow(presenter).to receive(:total_items).and_return(items)
+      allow(presenter).to receive(:rows_from_params).and_return(rows)
+    end
+
+    it 'calculates number of pages from items and rows' do
+      expect(subject).to eq(5)
     end
   end
 

data/spec/renderers/hyrax/renderers/faceted_attribute_renderer_spec.rb

@@ -11,8 +11,8 @@ RSpec.describe Hyrax::Renderers::FacetedAttributeRenderer do
       %(
       <tr><th>Name</th>
       <td><ul class='tabular'>
-      <li class="attribute attribute-name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Bob">Bob</a></li>
-      <li class="attribute attribute-name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Jessica">Jessica</a></li>
+      <li class="attribute attribute-name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Bob&locale=en">Bob</a></li>
+      <li class="attribute attribute-name"><a href="/catalog?f%5Bname_sim%5D%5B%5D=Jessica&locale=en">Jessica</a></li>
       </ul></td></tr>
     )
     end
@@ -28,7 +28,7 @@ RSpec.describe Hyrax::Renderers::FacetedAttributeRenderer do
       let(:rendered_link_query) { URI.parse(rendered_link['href']).query }
 
       it "escapes content properly" do
-        expect(rendered_link_query).to eq "#{CGI.escape('f[name_sim][]')}=#{CGI.escape('John & Bob')}"
+        expect(rendered_link_query).to eq "#{CGI.escape('f[name_sim][]')}=#{CGI.escape('John & Bob')}&locale=en"
       end
     end
   end

data/spec/renderers/hyrax/renderers/linked_attribute_renderer_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe Hyrax::Renderers::LinkedAttributeRenderer do
     let(:tr_content) do
       "<tr><th>Name</th>\n" \
        "<td><ul class='tabular'>" \
-       "<li class=\"attribute attribute-name\"><a href=\"/catalog?q=Bob&amp;search_field=name\">Bob</a></li>\n" \
-       "<li class=\"attribute attribute-name\"><a href=\"/catalog?q=Jessica&amp;search_field=name\">Jessica</a></li>\n" \
+       "<li class=\"attribute attribute-name\"><a href=\"/catalog?locale=en&q=Bob&amp;search_field=name\">Bob</a></li>\n" \
+       "<li class=\"attribute attribute-name\"><a href=\"/catalog?locale=en&q=Jessica&amp;search_field=name\">Jessica</a></li>\n" \
        "</ul></td></tr>"
     end
 

data/spec/search_builders/hyrax/catalog_search_builder_spec.rb

@@ -48,4 +48,39 @@ RSpec.describe Hyrax::CatalogSearchBuilder do
       expect(solr_params[:fq]).to eq ["-suppressed_bsi:true"]
     end
   end
+
+  describe "#filter_collection_facet_for_access" do
+    let(:user) { build(:user) }
+    let(:ability) { Ability.new(user) }
+    let(:context) { double(current_ability: ability) }
+
+    subject { builder.filter_collection_facet_for_access(solr_params) }
+
+    context 'with an admin' do
+      let(:user) { build(:admin) }
+
+      it "does nothing if user is an admin" do
+        subject
+        expect(solr_params['f.member_of_collection_ids_ssim.facet.matches']).to be_blank
+      end
+    end
+
+    context 'when the user has view access to collections' do
+      let(:collection_ids) { ['abcd12345', 'efgh67890'] }
+
+      before do
+        allow(Hyrax::Collections::PermissionsService).to receive(:collection_ids_for_view).with(ability: ability).and_return(collection_ids)
+      end
+
+      it "includes a regex of the ids of collections" do
+        subject
+        expect(solr_params['f.member_of_collection_ids_ssim.facet.matches']).to eq '^abcd12345$|^efgh67890$'
+      end
+    end
+
+    it "includes an empty regex when user doesn't have access to view any collections" do
+      subject
+      expect(solr_params['f.member_of_collection_ids_ssim.facet.matches']).to eq '^$'
+    end
+  end
 end

data/spec/services/hyrax/collections/permissions_service_spec.rb

@@ -299,6 +299,20 @@ RSpec.describe Hyrax::Collections::PermissionsService do
       end
     end
 
+    describe '.collection_ids_for_view' do
+      it 'returns collection ids where user has view access' do
+        expect(described_class.collection_ids_for_view(ability: ability)).to match_array [col_du.id, col_dg.id, col_mu.id, col_mg.id, col_vu.id, col_vg.id]
+      end
+
+      context 'when user has no access' do
+        let(:ability) { Ability.new(user2) }
+
+        it 'returns empty array' do
+          expect(described_class.collection_ids_for_view(ability: ability)).to match_array []
+        end
+      end
+    end
+
     describe '.can_manage_any_collection?' do
       it 'returns true when user has manage access to at least one collection' do
         expect(described_class.can_manage_any_collection?(ability: ability)).to be true

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

@@ -1,11 +1,17 @@
 RSpec.describe 'hyrax/base/_items.html.erb', type: :view do
   let(:ability) { double }
-  let(:presenter) { double(:presenter, member_presenters: member_presenters, id: 'the-id', human_readable_type: 'Thing') }
+  let(:request) { double "request", params: params }
+  let(:params) { ActionController::Parameters.new(rows: 10) }
 
   context 'when children are not present' do
-    let(:member_presenters) { [] }
+    let(:member_list) { [] }
+    let(:presenter) { double(:presenter, list_of_items_to_display: member_list, member_presenters_for: member_list, id: 'the-id', human_readable_type: 'Thing') }
 
-    context 'and the current user edit the presenter' do
+    before do
+      expect(presenter).to receive(:list_of_item_ids_to_display).and_return(member_list)
+    end
+
+    context 'and the current user can edit the presenter' do
       it 'renders an alert' do
         expect(view).to receive(:can?).with(:edit, presenter.id).and_return(true)
         render 'hyrax/base/items', presenter: presenter
@@ -25,35 +31,23 @@ RSpec.describe 'hyrax/base/_items.html.erb', type: :view do
     let(:child1) { double('Thing1', id: 'Thing 1', title: 'Title 1') }
     let(:child2) { double('Thing2', id: 'Thing 2', title: 'Title 2') }
     let(:child3) { double('Thing3', id: 'Thing 3', title: 'Title 3') }
-    let(:member_presenters) { [child1, child2, child3] }
-    let(:authorized_presenters) { [child1, child3] }
+    let(:member_list) { [child1, child2, child3] }
     let(:solr_document) { double('Solr Doc', id: 'the-id') }
     let(:presenter) { Hyrax::WorkShowPresenter.new(solr_document, ability, request) }
 
     before do
       stub_template 'hyrax/base/_member.html.erb' => '<%= member %>'
       expect(Flipflop).to receive(:hide_private_items?).and_return(:flipflop)
-      expect(presenter).to receive(:member_presenters).and_return(member_presenters)
-      expect(ability).to receive(:can?).with(:read, child1.id).and_return true
-      expect(ability).to receive(:can?).with(:read, child2.id).and_return false
-      expect(ability).to receive(:can?).with(:read, child3.id).and_return true
-    end
-
-    context 'and hide_private_items is on' do
-      let(:flip_flop) { true }
-
-      it "displays only authorized children" do
-        render 'hyrax/base/items', presenter: presenter
-        expect(rendered).to have_css('tbody', text: authorized_presenters.join)
-      end
+      allow(presenter).to receive(:list_of_item_ids_to_display).and_return(member_list)
+      allow(presenter).to receive(:member_presenters_for).with(member_list).and_return(member_list)
+      allow(ability).to receive(:can?).with(:read, child1.id).and_return true
+      allow(ability).to receive(:can?).with(:read, child2.id).and_return false
+      allow(ability).to receive(:can?).with(:read, child3.id).and_return true
     end
-    context 'and hide_private_items is off' do
-      let(:flip_flop) { false }
 
-      it "displays all children" do
-        render 'hyrax/base/items', presenter: presenter
-        expect(rendered).to have_css('tbody', text: member_presenters.join)
-      end
+    it "displays children" do
+      render 'hyrax/base/items', presenter: presenter
+      expect(rendered).to have_css('tbody')
     end
   end
 end

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

@@ -45,7 +45,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
       expect(rendered).to have_selector("tr#document_#{id}")
       check_tr_data_attributes
       expect(rendered).to have_selector("tr[data-post-delete-url='/dashboard/collections/#{id}']")
-      expect(rendered).to have_link 'Collection Title', href: hyrax.dashboard_collection_path(id)
+      expect(rendered).to have_link 'Collection Title', href: hyrax.dashboard_collection_path(id, locale: I18n.locale)
       expect(rendered).to have_link 'Edit collection', href: hyrax.edit_dashboard_collection_path(id)
       expect(rendered).to have_link 'Delete collection'
       expect(rendered).to have_link 'Add to collection'

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.1.0.rc3'
+gem 'hyrax', '2.1.0.rc4'
 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.rc3
+  version: 2.1.0.rc4
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails