curation_concerns 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85c8841cf6394c4589e461e3b59671377f44678
-  data.tar.gz: 575d68375d4f97744189ac4ab8183648b5483735
+  metadata.gz: 9e77165da47c309d90805ddb6981da218c262545
+  data.tar.gz: 5b4967ede0c3c0a0eafc7bb60d4db47950519044
 SHA512:
-  metadata.gz: 0e737b868fcec75f9ed65e2c4361a786b28fdf4516062c04293c47b35c91f954797e5f68a3b0a2fa64ba1ecbf742f7987b3dd1dff3f6fc2e546fb53a4ed7740d
-  data.tar.gz: 29ed236e0bebabe08927012b07c83b960b3522285571fd4e42b06d2151f8de98c3e3ada3e61b58a51b2256e7d36fdf4db19fb7075c3c1e6dc13a0075ac2d06b7
+  metadata.gz: 295594240997309f48717675eca0bd6e4104e2e13c468fb9f9cdb67496853a6b2380456281e913a453e0d341fa86407d4769eb6366462ee7795b52f7cbbef048
+  data.tar.gz: 0a874acf3320fca7cac2ebd597baa353ff0fbfdc5211b32afa24eab97662297713bad2ef749253426f959a16170865292c4b4e59f7fe04771388e99b93710fe2

data/.rubocop.yml

@@ -1,7 +1,6 @@
 require: rubocop-rspec
 
 AllCops:
-  RunRailsCops: true
   DisplayCopNames: true
   Include:
     - '**/Rakefile'
@@ -13,6 +12,15 @@ AllCops:
     - '.internal_test_app/**/*'
     - 'curation_concerns-models/app/models/concerns/curation_concerns/file_set/export.rb'
 
+Rails:
+  Enabled: true
+
+Performance/RedundantBlockCall:
+  # We can remove this exclusion when this commit is released:
+  # https://github.com/bbatsov/rubocop/commit/7df382531db4f66cd9872a4f478bd486d6ce6712
+  Exclude:
+    - 'curation_concerns-models/lib/curation_concerns/null_logger.rb'
+
 Lint/AssignmentInCondition:
   Exclude:
     - 'curation_concerns-models/app/services/curation_concerns/persist_derivatives.rb'

data/Gemfile

@@ -31,6 +31,7 @@ if File.exists?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+
   if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/app/controllers/concerns/curation_concerns/application_controller_behavior.rb

@@ -14,16 +14,20 @@ module CurationConcerns
           # neccesarily know about, seems to be consistent with what Rails4 does
           # by default with uncaught ActiveRecord::RecordNotFound in production
           wants.any do
-            # use standard, possibly locally overridden, 404.html file. Even for
-            # possibly non-html formats, this is consistent with what Rails does
-            # on raising an ActiveRecord::RecordNotFound. Rails.root IS needed
-            # for it to work under testing, without worrying about CWD.
-            render file: "#{Rails.root}/public/404.html", status: :not_found, layout: false
+            render_404
           end
         end
       end
     end
 
+    def render_404
+      # use standard, possibly locally overridden, 404.html file. Even for
+      # possibly non-html formats, this is consistent with what Rails does
+      # on raising an ActiveRecord::RecordNotFound. Rails.root IS needed
+      # for it to work under testing, without worrying about CWD.
+      render file: "#{Rails.root}/public/404.html", status: :not_found, layout: false
+    end
+
     # Called by Hydra::Controller::ControllerBehavior when CanCan::AccessDenied is caught
     # @param [CanCan::AccessDenied] exception error to handle
     def deny_access(exception)

data/app/controllers/concerns/curation_concerns/catalog_controller.rb

@@ -11,9 +11,6 @@ module CurationConcerns::CatalogController
     helper CurationConcerns::CatalogHelper
     # These before_filters apply the hydra access controls
     before_action :enforce_show_permissions, only: :show
-    # This applies appropriate access controls to all solr queries
-    CatalogController.search_params_logic += [:add_access_controls_to_solr_params]
-    self.search_params_logic += [:filter_models]
   end
 
   module ClassMethods
@@ -34,21 +31,4 @@ module CurationConcerns::CatalogController
       { 'qf' => %w(title_tesim name_tesim), 'qt' => 'search', 'rows' => 10 }
     end
   end
-
-  protected
-
-    # Overriding Blacklight so that the search results can be displayed in a way compatible with
-    # tokenInput javascript library.  This is used for suggesting "Related Works" to attach.
-    def render_search_results_as_json
-      { 'docs' => @response['response']['docs'].map { |solr_doc| serialize_work_from_solr(solr_doc) } }
-    end
-
-    def serialize_work_from_solr(solr_doc)
-      title = solr_doc['title_tesim'].first
-      title << " (#{solr_doc['human_readable_type_tesim'].first})" if solr_doc['human_readable_type_tesim'].present?
-      {
-        pid: solr_doc['id'],
-        title: title
-      }
-    end
 end

data/app/controllers/concerns/curation_concerns/collections_controller_behavior.rb

@@ -2,11 +2,10 @@ module CurationConcerns
   module CollectionsControllerBehavior
     extend ActiveSupport::Concern
     include Hydra::CollectionsControllerBehavior
-    include Hydra::Controller::SearchBuilder
+    include Blacklight::AccessControls::Catalog
 
     included do
       before_action :filter_docs_with_read_access!, except: :show
-      self.search_params_logic += [:add_access_controls_to_solr_params, :add_advanced_parse_q_to_solr]
       layout 'curation_concerns/1_column'
       skip_load_and_authorize_resource only: :show
     end
@@ -26,6 +25,17 @@ module CurationConcerns
       super
     end
 
+    def after_create_error
+      form
+      super
+    end
+
+    def after_update_error
+      form
+      query_collection_members
+      super
+    end
+
     # overriding the method in Hydra::Collections so the search builder can find the collection
     def collection
       action_name == 'show' ? @presenter : @collection
@@ -40,19 +50,31 @@ module CurationConcerns
 
       def presenter
         @presenter ||= begin
-          _, document_list = search_results(params, self.class.search_params_logic + [:find_one])
-          curation_concern = document_list.first
+          # Query Solr for the collection.
+          # run the solr query to find the collection members
+          response = repository.search(collection_search_builder.query)
+          curation_concern = response.documents.first
           raise CanCan::AccessDenied unless curation_concern
           presenter_class.new(curation_concern, current_ability)
         end
       end
 
+      def collection_search_builder
+        collection_search_builder_class.new(self).with(params).tap do |builder|
+          builder.current_ability = current_ability
+        end
+      end
+
       def presenter_class
         CurationConcerns::CollectionPresenter
       end
 
+      def collection_search_builder_class
+        CurationConcerns::WorkSearchBuilder
+      end
+
       def collection_member_search_builder_class
-        CurationConcerns::SearchBuilder
+        CurationConcerns::CollectionMemberSearchBuilder
       end
 
       def collection_params

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -1,7 +1,7 @@
 module CurationConcerns::CurationConcernController
   extend ActiveSupport::Concern
   include Blacklight::Base
-  include Hydra::Controller::SearchBuilder
+  include Blacklight::AccessControls::Catalog
 
   included do
     copy_blacklight_config_from(CatalogController)
@@ -145,7 +145,7 @@ module CurationConcerns::CurationConcernController
     def after_destroy_response(title)
       flash[:notice] = "Deleted #{title}"
       respond_to do |wants|
-        wants.html { redirect_to main_app.catalog_index_path }
+        wants.html { redirect_to main_app.search_catalog_path }
         wants.json { render_json_response(response_type: :deleted, message: "Deleted #{curation_concern.id}") }
       end
     end
@@ -164,10 +164,14 @@ module CurationConcerns::CurationConcernController
       # nop
     end
 
+    def search_builder_class
+      CurationConcerns::WorkSearchBuilder
+    end
+
   private
 
     def curation_concern_from_search_results
-      _, document_list = search_results(params, CatalogController.search_params_logic + [:find_one])
+      _, document_list = search_results(params)
       raise CanCan::AccessDenied.new(nil, :show) if document_list.empty?
       document_list.first
     end

data/app/controllers/concerns/curation_concerns/download_behavior.rb

@@ -50,11 +50,11 @@ module CurationConcerns
       end
 
       def default_file
-        if asset.class.respond_to?(:default_file_path)
-          default_file_reference = asset.class.default_file_path
-        else
-          default_file_reference = DownloadsController.default_content_path
-        end
+        default_file_reference = if asset.class.respond_to?(:default_file_path)
+                                   asset.class.default_file_path
+                                 else
+                                   DownloadsController.default_content_path
+                                 end
         association = dereference_file(default_file_reference)
         association.reader if association
       end

data/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb

@@ -1,6 +1,8 @@
 module CurationConcerns
   module FileSetsControllerBehavior
     extend ActiveSupport::Concern
+    include Blacklight::Base
+    include Blacklight::AccessControls::Catalog
 
     included do
       include CurationConcerns::ThemedLayoutController
@@ -8,8 +10,6 @@ module CurationConcerns
       load_and_authorize_resource class: ::FileSet, except: :show
       helper_method :curation_concern
       include CurationConcerns::ParentContainer
-      include Blacklight::Base
-      include Hydra::Controller::SearchBuilder
       copy_blacklight_config_from(::CatalogController)
     end
 
@@ -95,12 +95,7 @@ module CurationConcerns
                   end
                 end
       if success
-        respond_to do |wants|
-          wants.html do
-            redirect_to [main_app, @file_set], notice: "The file #{view_context.link_to(@file_set, [main_app, @file_set])} has been updated."
-          end
-          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, @file_set]) }
-        end
+        after_update_response
       else
         respond_to do |wants|
           wants.html do
@@ -116,6 +111,15 @@ module CurationConcerns
       render action: 'edit'
     end
 
+    def after_update_response
+      respond_to do |wants|
+        wants.html do
+          redirect_to [main_app, @file_set], notice: "The file #{view_context.link_to(@file_set, [main_app, @file_set])} has been updated."
+        end
+        wants.json { render :show, status: :ok, location: polymorphic_path([main_app, @file_set]) }
+      end
+    end
+
     def versions
       @version_list = version_list
     end
@@ -130,13 +134,17 @@ module CurationConcerns
 
       def presenter
         @presenter ||= begin
-          _, document_list = search_results(params, [:add_access_controls_to_solr_params, :find_one, :only_file_sets])
+          _, document_list = search_results(params)
           curation_concern = document_list.first
           raise CanCan::AccessDenied unless curation_concern
           show_presenter.new(curation_concern, current_ability)
         end
       end
 
+      def search_builder_class
+        CurationConcerns::FileSetSearchBuilder
+      end
+
       def initialize_edit_form
         @groups = current_user.groups
       end

data/app/controllers/concerns/curation_concerns/parent_container.rb

@@ -15,15 +15,10 @@ module CurationConcerns::ParentContainer
   end
 
   def lookup_parent_from_child
-    if curation_concern
-      # in_objects method is inherited from Hydra::PCDM::ObjectBehavior
-      curation_concern.in_objects.first
-    elsif @presenter
-
-      CurationConcerns::ParentService.parent_for(@presenter.id)
-    else
-      raise "no child"
-    end
+    # in_objects method is inherited from Hydra::PCDM::ObjectBehavior
+    return curation_concern.in_objects.first if curation_concern
+    return CurationConcerns::ParentService.parent_for(@presenter.id) if @presenter
+    raise "no child"
   end
 
   def parent_id

data/app/controllers/concerns/curation_concerns/single_use_links_viewer_controller_behavior.rb

@@ -3,7 +3,7 @@ module CurationConcerns
     extend ActiveSupport::Concern
     include CurationConcerns::DownloadBehavior
     include Blacklight::Base
-    include Hydra::Controller::SearchBuilder
+    include Blacklight::AccessControls::Catalog
 
     included do
       include ActionDispatch::Routing::PolymorphicRoutes
@@ -23,7 +23,7 @@ module CurationConcerns
     end
 
     def show
-      _, document_list = search_results({ id: single_use_link.itemId }, [:find_one])
+      _, document_list = search_results(id: single_use_link.itemId)
       curation_concern = document_list.first
 
       # Authorize using SingleUseLinksViewerController::Ability
@@ -41,6 +41,10 @@ module CurationConcerns
 
     protected
 
+      def search_builder_class
+        CurationConcerns::SingleUseLinkSearchBuilder
+      end
+
       def content_options
         super.tap do |options|
           options[:disposition] = 'attachment' if action_name == 'download'

data/app/helpers/curation_concerns/catalog_helper.rb

@@ -5,7 +5,7 @@ module CurationConcerns::CatalogHelper
     else
       # TODO: Unused variable. Not sure why this is here.
       # facet_solr_field = facet_configuration_for_field(type_field)
-      path = search_action_path(add_facet_params_and_redirect(type_field, key))
+      path = search_action_path(search_state.add_facet_params_and_redirect(type_field, key))
       # local_params = params.dup
       # local_facet_params = local_params[:f] || {}.with_indifferent_access
       # local_params[:f] = local_facet_params.select{|k,_| k != type_field }
@@ -17,9 +17,7 @@ module CurationConcerns::CatalogHelper
 
   def all_type_tab(label = t('curation_concerns.catalog.index.type_tabs.all'))
     if params[:f] && params[:f][type_field]
-      # TODO: Unused variable. Not sure why this is here.
-      # facet_solr_field = facet_configuration_for_field(type_field)
-      new_params = remove_facet_params(type_field, params[:f][type_field].first)
+      new_params = search_state.remove_facet_params(type_field, params[:f][type_field].first)
 
       # Delete any request params from facet-specific action, needed
       # to redir to index action properly.

data/app/helpers/curation_concerns/collections_helper.rb

@@ -4,7 +4,7 @@ module CurationConcerns::CollectionsHelper
   end
 
   def collection_modal_id(collectible)
-    "#{collectible.to_param.gsub(/:/, '-')}-modal"
+    "#{collectible.to_param.tr(':', '-')}-modal"
   end
 
   def link_to_select_collection(collectible, opts = {})

data/app/helpers/curation_concerns/permissions_helper.rb

@@ -1,8 +1,9 @@
 module CurationConcerns
   module PermissionsHelper
     def help_link(file, title, aria_label)
-      link_to help_icon, '#', 'data-toggle': 'popover', 'data-content': capture_content(file),
-                              'data-original-title': title, 'aria-label': aria_label
+      link_to help_icon, '#',
+              data: { toggle: 'popover', content: capture_content(file), 'original-title' => title },
+              'aria-label' => aria_label
     end
 
     private
@@ -14,7 +15,7 @@ module CurationConcerns
       end
 
       def help_icon
-        content_tag 'i', '', 'aria-hidden': true, class: 'help-icon'
+        content_tag 'i', '', 'aria-hidden' => true, class: 'help-icon'
       end
   end
 end

data/app/helpers/curation_concerns/search_paths_helper.rb

@@ -1,11 +1,11 @@
 module CurationConcerns::SearchPathsHelper
   def search_path_for_my_works(opts = {})
     params_for_my_works = { 'f[generic_type_sim][]' => 'Work', works: 'mine' }
-    main_app.catalog_index_path(params_for_my_works.merge(opts))
+    main_app.search_catalog_path(params_for_my_works.merge(opts))
   end
 
   def search_path_for_my_collections(opts = {})
     params_for_my_collections = { 'f[generic_type_sim][]' => 'Collection', works: 'mine' }
-    main_app.catalog_index_path(params_for_my_collections.merge(opts))
+    main_app.search_catalog_path(params_for_my_collections.merge(opts))
   end
 end

data/app/inputs/multifile_input.rb

@@ -2,7 +2,7 @@ class MultifileInput < SimpleForm::Inputs::CollectionInput
   def input(wrapper_options = nil)
     merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
 
-    merged_input_options.merge!(name: "#{@builder.object_name}[#{attribute_name}][]")
+    merged_input_options[:name] = "#{@builder.object_name}[#{attribute_name}][]"
     @builder.file_field(attribute_name, merged_input_options)
   end
 end

data/app/inputs/select_with_modal_help_input.rb

@@ -1,7 +1,7 @@
 class SelectWithModalHelpInput < MultiValueWithHelpInput
   def link_to_help
     template.link_to "##{attribute_name}Modal", id: "#{input_class}_help_modal", rel: 'button',
-                                                data: { toggle: 'modal' }, 'aria-label': aria_label do
+                                                data: { toggle: 'modal' }, 'aria-label' => aria_label do
       help_icon
     end
   end

data/app/inputs/with_help_icon.rb

@@ -9,14 +9,14 @@ module WithHelpIcon
       template.link_to '#', id: "#{input_class}_help",
                             data: { toggle: 'popover'.freeze,
                                     content: metadata_help,
-                                    'original-title': raw_label_text },
-                            'aria-label': aria_label do
+                                    'original-title' => raw_label_text },
+                            'aria-label' => aria_label do
         help_icon
       end
     end
 
     def help_icon
-      template.content_tag 'i', nil, "aria-hidden": true, class: "help-icon"
+      template.content_tag 'i', nil, 'aria-hidden' => true, class: "help-icon"
     end
 
     def metadata_help

data/app/presenters/curation_concerns/presenter_factory.rb

@@ -36,7 +36,8 @@ module CurationConcerns
 
       # Query solr using POST so that the query doesn't get too large for a URI
       def query(query, args = {})
-        args.merge!(q: query, qt: 'standard')
+        args[:q] = query
+        args[:qt] = 'standard'
         conn = ActiveFedora::SolrService.instance.conn
         result = conn.post('select', data: args)
         result.fetch('response').fetch('docs')

data/app/presenters/curation_concerns/version_list_presenter.rb

@@ -10,9 +10,9 @@ module CurationConcerns
 
       def wrapped_list
         @wrapped_list ||=
-            @raw_list.map { |v| CurationConcerns::VersionPresenter.new(v) } # wrap each item in a presenter
-            .sort { |a, b| b.version.created <=> a.version.created } # sort list of versions based on creation date
-            .tap { |l| l.first.try(:current!) } # set the first version to the current version
+          @raw_list.map { |v| CurationConcerns::VersionPresenter.new(v) } # wrap each item in a presenter
+                   .sort { |a, b| b.version.created <=> a.version.created } # sort list of versions based on creation date
+                   .tap { |l| l.first.try(:current!) } # set the first version to the current version
       end
   end
 end

data/app/presenters/curation_concerns/version_presenter.rb

@@ -8,7 +8,7 @@ module CurationConcerns
     end
 
     delegate :label, :uri, to: :version
-    alias_method :current?, :current
+    alias current? current
 
     def current!
       @current = true

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -35,7 +35,7 @@ module CurationConcerns
       # TODO: Extract this to ActiveFedora::Aggregations::ListSource
       def ordered_ids
         ActiveFedora::SolrService.query("proxy_in_ssi:#{id}", fl: "ordered_targets_ssim")
-          .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
+                                 .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
       end
 
       # Override this method if you want to use an alternate presenter class for the files

data/app/renderers/curation_concerns/attribute_renderer.rb

@@ -32,13 +32,16 @@ module CurationConcerns
       markup.html_safe
     end
 
-    private
+    # @return The human-readable label for this field.
+    # @note This is a central location for determining the label of a field
+    #   name. Can be overridden if more complicated logic is needed.
+    def label
+      translate(
+        :"blacklight.search.fields.show.#{field}",
+        default: [:"blacklight.search.fields.#{field}", options.fetch(:label, field.to_s.humanize)])
+    end
 
-      def label
-        translate(
-          :"blacklight.search.fields.show.#{field}",
-          default: [:"blacklight.search.fields.#{field}", options.fetch(:label, field.to_s.humanize)])
-      end
+    private
 
       def attribute_value_to_html(value)
         if field == :rights
@@ -72,7 +75,7 @@ module CurationConcerns
       end
 
       def search_path(value)
-        Rails.application.routes.url_helpers.catalog_index_path(
+        Rails.application.routes.url_helpers.search_catalog_path(
           search_field: search_field, q: ERB::Util.h(value))
       end
 

data/app/search_builders/curation_concerns/collection_member_search_builder.rb

@@ -0,0 +1,5 @@
+module CurationConcerns
+  class CollectionMemberSearchBuilder < Hydra::Collections::MemberSearchBuilder
+    include CurationConcerns::FilterByType
+  end
+end

data/app/search_builders/curation_concerns/embargo_search_builder.rb

@@ -2,9 +2,6 @@ module CurationConcerns
   # Finds embargoed objects
   class EmbargoSearchBuilder < Blacklight::SearchBuilder
     self.default_processor_chain = [:with_pagination, :with_sorting, :only_active_embargoes]
-    def initialize(scope)
-      super(true, scope)
-    end
 
     # TODO: add more complex pagination
     def with_pagination(solr_params)

data/app/search_builders/curation_concerns/file_set_search_builder.rb

@@ -0,0 +1,10 @@
+module CurationConcerns
+  class FileSetSearchBuilder < Hydra::SearchBuilder
+    include CurationConcerns::SingleResult
+    self.default_processor_chain += [:only_file_sets]
+
+    def only_file_sets(solr_parameters)
+      solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::FileSet.to_class_uri)
+    end
+  end
+end

data/app/search_builders/curation_concerns/filter_by_type.rb

@@ -0,0 +1,29 @@
+module CurationConcerns
+  module FilterByType
+    extend ActiveSupport::Concern
+
+    included do
+      self.default_processor_chain += [:filter_models]
+    end
+
+    # Add queries that excludes everything except for works and collections
+    def filter_models(solr_parameters)
+      solr_parameters[:fq] ||= []
+      solr_parameters[:fq] << '(' + (work_clauses + collection_clauses).join(' OR ') + ')'
+    end
+
+    private
+
+      def work_clauses
+        return [] if blacklight_params.key?(:f) && Array(blacklight_params[:f][:generic_type_sim]).include?('Collection')
+        CurationConcerns.config.registered_curation_concern_types.map(&:constantize).map do |klass|
+          ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: klass.to_class_uri)
+        end
+      end
+
+      def collection_clauses
+        return [] if blacklight_params.key?(:f) && Array(blacklight_params[:f][:generic_type_sim]).include?('Work')
+        [ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)]
+      end
+  end
+end

data/app/search_builders/curation_concerns/lease_search_builder.rb

@@ -2,9 +2,6 @@ module CurationConcerns
   # Finds objects under lease
   class LeaseSearchBuilder < Blacklight::SearchBuilder
     self.default_processor_chain = [:with_pagination, :with_sorting, :only_active_leases]
-    def initialize(scope)
-      super(true, scope)
-    end
 
     # TODO: add more complex pagination
     def with_pagination(solr_params)

data/app/search_builders/curation_concerns/search_builder.rb

@@ -1,14 +1,6 @@
 class CurationConcerns::SearchBuilder < Hydra::SearchBuilder
   include BlacklightAdvancedSearch::AdvancedSearchBuilder
-  include Hydra::Collections::SearchBehaviors
-
-  def only_file_sets(solr_parameters)
-    solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: FileSet.to_class_uri)
-  end
-
-  def find_one(solr_parameters)
-    solr_parameters[:fq] << "_query_:\"{!raw f=id}#{blacklight_params.fetch(:id)}\""
-  end
+  include CurationConcerns::FilterByType
 
   # Override Hydra::AccessControlsEnforcement (or Hydra::PolicyAwareAccessControlsEnforcement)
   # Allows admin users to see everything (don't apply any gated_discovery_filters for those users)
@@ -22,22 +14,4 @@ class CurationConcerns::SearchBuilder < Hydra::SearchBuilder
     return ['edit'] if blacklight_params[:works] == 'mine'
     super
   end
-
-  # This is included as part of blacklight search solr params logic
-  def filter_models(solr_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << '(' + (work_clauses + collection_clauses).join(' OR ') + ')'
-  end
-
-  def work_clauses
-    return [] if blacklight_params.key?(:f) && Array(blacklight_params[:f][:generic_type_sim]).include?('Collection')
-    CurationConcerns.config.registered_curation_concern_types.map(&:constantize).map do |klass|
-      ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: klass.to_class_uri)
-    end
-  end
-
-  def collection_clauses
-    return [] if blacklight_params.key?(:f) && Array(blacklight_params[:f][:generic_type_sim]).include?('Work')
-    [ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)]
-  end
 end

data/app/search_builders/curation_concerns/single_result.rb

@@ -0,0 +1,13 @@
+module CurationConcerns
+  module SingleResult
+    extend ActiveSupport::Concern
+
+    included do
+      self.default_processor_chain += [:find_one]
+    end
+
+    def find_one(solr_parameters)
+      solr_parameters[:fq] << "_query_:\"{!raw f=id}#{blacklight_params.fetch(:id)}\""
+    end
+  end
+end