hyrax 3.6.0 → 4.0.0.beta1

data/app/jobs/characterize_job.rb

@@ -29,13 +29,10 @@ class CharacterizeJob < Hyrax::ApplicationJob
   # @param [String, NilClass] filepath the cached file within the Hyrax.config.working_path
   def perform(file_set, file_id, filepath = nil)
     raise "#{file_set.class.characterization_proxy} was not found for FileSet #{file_set.id}" unless file_set.characterization_proxy?
-    filepath = Hyrax::WorkingDirectory.find_or_retrieve(file_id, file_set.id) unless filepath && File.exist?(filepath)
+    # Ensure a fresh copy of the repo file's latest version is being worked on, if no filepath is directly provided
+    filepath = Hyrax::WorkingDirectory.copy_repository_resource_to_working_directory(Hydra::PCDM::File.find(file_id), file_set.id) unless filepath && File.exist?(filepath)
     characterize(file_set, file_id, filepath)
-
-    Hyrax.publisher.publish('file.characterized',
-                            file_set: file_set,
-                            file_id: file_id,
-                            path_hint: filepath)
+    CreateDerivativesJob.perform_later(file_set, file_id, filepath)
   end
 
   private
@@ -65,7 +62,7 @@ class CharacterizeJob < Hyrax::ApplicationJob
     file_set.date_modified = Hyrax::TimeService.time_in_utc if file_set.characterization_proxy.original_checksum.first != previous_checksum
 
     # set title to label if that's how it was before this characterization
-    file_set.title = [file_set.characterization_proxy.original_name] if reset_title
+    file_set.title = [file_set.characterization_proxy.original_name.force_encoding("UTF-8")] if reset_title
     # always set the label to the original_name
     file_set.label = file_set.characterization_proxy.original_name
 

data/app/jobs/content_event_job.rb

@@ -18,6 +18,6 @@ class ContentEventJob < EventJob
 
   # log the event to the users profile stream
   def log_user_event(depositor)
-    depositor&.log_profile_event(event)
+    depositor.log_profile_event(event)
   end
 end

data/app/jobs/create_derivatives_job.rb

@@ -7,9 +7,11 @@ class CreateDerivativesJob < Hyrax::ApplicationJob
   # @param [String, NilClass] filepath the cached file within the Hyrax.config.working_path
   def perform(file_set, file_id, filepath = nil)
     return if file_set.video? && !Hyrax.config.enable_ffmpeg
-    filename = Hyrax::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
 
-    file_set.create_derivatives(filename)
+    # Ensure a fresh copy of the repo file's latest version is being worked on, if no filepath is directly provided
+    filepath = Hyrax::WorkingDirectory.copy_repository_resource_to_working_directory(Hydra::PCDM::File.find(file_id), file_set.id) unless filepath && File.exist?(filepath)
+
+    file_set.create_derivatives(filepath)
 
     # Reload from Fedora and reindex for thumbnail and extracted text
     file_set.reload

data/app/jobs/ingest_local_file_job.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+##
+# Ingest a local file using ActiveFedora & FileSetActor.
 class IngestLocalFileJob < Hyrax::ApplicationJob
   queue_as Hyrax.config.ingest_queue_name
 
@@ -6,25 +8,15 @@ class IngestLocalFileJob < Hyrax::ApplicationJob
   # @param [String] path
   # @param [User] user
   def perform(file_set, path, user)
-    case file_set
-    when ActiveFedora::Base
-      __perform(file_set, path, user, use_valkyrie: false)
-    else
-      __perform(file_set, path, user, use_valkyrie: true)
-    end
+    __perform(file_set, path, user)
   end
 
   private
 
-  # @note Based on the present implementation (see SHA a8597884e) of
-  # the Hyrax::Actors::FileSetActor, we wouldn't need to pass the
-  # `use_valkyrie` parameter.  However, I want to include this logic
-  # to demonstrate that "Yes, the IngestLocalFileJob has been tested
-  # for Valkyrie usage"
-  def __perform(file_set, path, user, use_valkyrie:)
+  def __perform(file_set, path, user)
     file_set.label ||= File.basename(path)
 
-    actor = Hyrax::Actors::FileSetActor.new(file_set, user, use_valkyrie: use_valkyrie)
+    actor = Hyrax::Actors::FileSetActor.new(file_set, user)
 
     if actor.create_content(File.open(path))
       Hyrax.config.callback.run(:after_import_local_file_success, file_set, user, path, warn: false)

data/app/jobs/inherit_permissions_job.rb

@@ -5,11 +5,7 @@ class InheritPermissionsJob < Hyrax::ApplicationJob
   # Perform the copy from the work to the contained filesets
   #
   # @param work containing access level and filesets
-  # @param use_valkyrie [Boolean] whether to use valkyrie support (deprecated)
-  def perform(work, use_valkyrie: :DEFAULT)
-    Deprecation.warn("use_valkyrie argument is deprecated, behavior depends on deserialized resource") unless
-      use_valkyrie == :DEFAULT
-
+  def perform(work)
     case work
     when ActiveFedora::Base
       af_perform(work)

data/app/models/admin_set.rb

@@ -97,14 +97,6 @@ class AdminSet < ActiveFedora::Base
     permission_template.reset_access_controls_for(collection: self)
   end
 
-  # @api public
-  #
-  # return an id for the AdminSet.
-  # defaults to calling Hyrax::Noid, but needs a fall back if noid is off
-  def assign_id
-    super || SecureRandom.uuid
-  end
-
   private
 
   def destroy_permission_template

data/app/models/concerns/hyrax/collection_behavior.rb

@@ -10,8 +10,7 @@ module Hyrax
     include Hyrax::HumanReadableType
     include Hyrax::HasRepresentative
     include Hyrax::Permissions
-    include(Hyrax::CollectionNesting) unless
-      Hyrax.config.use_solr_graph_for_collection_nesting
+    include Hyrax::CollectionNesting
 
     included do
       validates_with HasOneTitleValidator
@@ -19,7 +18,7 @@ module Hyrax
 
       self.indexer = Hyrax::CollectionIndexer
 
-      class_attribute :index_collection_type_gid_as, writer: false
+      class_attribute :index_collection_type_gid_as, instance_writer: false
       self.index_collection_type_gid_as = [:symbol]
 
       property :collection_type_gid, predicate: ::RDF::Vocab::SCHEMA.additionalType, multiple: false do |index|

data/app/models/concerns/hyrax/collection_nesting.rb

@@ -3,20 +3,11 @@ module Hyrax
   # Responsible for adding the necessary callbacks for updating the nested collection information
   # This is part of the after update index because it is a potentially very expensive process.
   #
-  # @deprecation deprecated for removal in 4.0.0; nested reindexing is replaced by solr
-  #   graph query. if you want to drop this behavior now, you can set
-  #   +HYRAX_USE_SOLR_GRAPH_NESTING+ to +true+ in the environment.
+  # @todo Consider extracting the update_index callback to ActiveFedora::Base
   module CollectionNesting
     extend ActiveSupport::Concern
 
     included do
-      Deprecation.warn "Hyrax::CollectionNesting is deprecated for removal in " \
-                       "4.0.0. Nested reindexing behavior can be replaced " \
-                       "by a Solr graph traversal query. Legacy nested " \
-                       "indexing behavior is retained by default, but can be " \
-                       "replaced with the 4.0.0 default by setting " \
-                       "HYRAX_USE_SOLR_GRAPH_NESTING to `true` in the environment."
-
       extend ActiveModel::Callbacks
       include ActiveModel::Validations::Callbacks
 

data/app/models/concerns/hyrax/file_set_behavior.rb

@@ -35,8 +35,7 @@ module Hyrax
 
     # Cast to a SolrDocument by querying from Solr
     def to_presenter
-      Deprecation.warn "Method #to_presenter will be removed in Hyrax 5.0. Use Hyrax::FileSetsController#presenter.solr_document or `@presenter.solr_document` from a view instead."
-      CatalogController.new.fetch(id).last
+      Blacklight::SearchService.new(config: CatalogController.blacklight_config).fetch(id).last
     end
   end
 end

data/app/models/concerns/hyrax/in_admin_set.rb

@@ -6,12 +6,5 @@ module Hyrax
     included do
       belongs_to :admin_set, predicate: Hyrax.config.admin_set_predicate
     end
-
-    ##
-    # @deprecated Use `Sipity::Workflow.find_active_workflow_for` instead.
-    def active_workflow
-      Deprecation.warn 'Use `Sipity::Workflow.find_active_workflow_for` instead.'
-      Sipity::Workflow.find_active_workflow_for(admin_set_id: admin_set_id)
-    end
   end
 end

data/app/models/concerns/hyrax/user.rb

@@ -34,12 +34,12 @@ module Hyrax::User
     scope :without_system_accounts, -> { where("#{::User.user_key_field} not in (?)", [::User.batch_user_key, ::User.audit_user_key, ::User.system_user_key]) }
 
     # Validate and normalize ORCIDs
-    validates_with OrcidValidator
+    validates_with Hyrax::OrcidValidator
     after_validation :normalize_orcid
 
     # Set up user profile avatars
-    mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
-    validates_with AvatarValidator
+    mount_uploader :avatar, Hyrax::AvatarUploader, mount_on: :avatar_file_name
+    validates_with Hyrax::AvatarValidator
 
     # Add token to authenticate Arkivo API calls
     after_initialize :set_arkivo_token, unless: :persisted? if Hyrax.config.arkivo_api?

data/app/models/concerns/hyrax/work_behavior.rb

@@ -10,7 +10,6 @@ module Hyrax
     include Hydra::WithDepositor
     include HasRepresentative
     include HasRendering
-    include WithFileSets
     include Naming
     include CoreMetadata
     include InAdminSet
@@ -21,8 +20,7 @@ module Hyrax
     include ProxyDeposit
     include Works::Metadata
     include WithEvents
-    include(Hyrax::CollectionNesting) unless
-      Hyrax.config.use_solr_graph_for_collection_nesting
+    include Hyrax::CollectionNesting
 
     included do
       property :owner, predicate: RDF::URI.new('http://opaquenamespace.org/ns/hydra/owner'), multiple: false

data/app/models/content_block.rb

@@ -24,12 +24,6 @@ class ContentBlock < ActiveRecord::Base
   end
 
   class << self
-    # @deprecated
-    def whitelisted?(key)
-      Deprecation.warn(self, "Samvera is deprecating '#{self}.whitelisted?' in Hyrax 3.0. Use #{self}.registered? instead.")
-      registered?(key)
-    end
-
     def registered?(key)
       NAME_REGISTRY.include?(key)
     end

data/app/models/hyrax/embargo.rb

@@ -15,7 +15,7 @@ module Hyrax
     attribute :embargo_history,           Valkyrie::Types::Array
 
     def active?
-      (embargo_release_date.present? && Hyrax::TimeService.time_in_utc < embargo_release_date)
+      (embargo_release_date.present? && Time.zone.today < embargo_release_date)
     end
   end
 end

data/app/models/hyrax/file_metadata.rb

@@ -65,7 +65,7 @@ module Hyrax
     attribute :label, ::Valkyrie::Types::Set
     attribute :original_filename, ::Valkyrie::Types::String
     attribute :mime_type, ::Valkyrie::Types::String.default(GENERIC_MIME_TYPE)
-    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE])
+    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE].freeze)
 
     # attributes set by fits
     attribute :format_label, ::Valkyrie::Types::Set

data/app/models/hyrax/file_set.rb

@@ -31,7 +31,7 @@ module Hyrax
   # @see https://wiki.duraspace.org/display/samvera/Hydra%3A%3AWorks+Shared+Modeling
   class FileSet < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
-    include Hyrax::Schema(:file_set_metadata)
+    include Hyrax::Schema(:basic_metadata)
 
     def self.model_name(name_class: Hyrax::Name)
       @_model_name ||= name_class.new(self, nil, 'FileSet')
@@ -42,8 +42,8 @@ module Hyrax
 
     attribute :file_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID) # id for FileMetadata resources
     attribute :thumbnail_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
-    attribute :original_file_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
-    attribute :extracted_text_id, Valkyrie::Types::ID.optional # id for FileMetadata resource
+    attribute :original_file_id, Valkyrie::Types::ID # id for FileMetadata resource
+    attribute :extracted_text_id, Valkyrie::Types::ID # id for FileMetadata resource
 
     ##
     # @return [Valkyrie::ID]

data/app/models/hyrax/lease.rb

@@ -15,7 +15,7 @@ module Hyrax
     attribute :lease_history,           Valkyrie::Types::Array
 
     def active?
-      (lease_expiration_date.present? && Hyrax::TimeService.time_in_utc < lease_expiration_date)
+      (lease_expiration_date.present? && Time.zone.today < lease_expiration_date)
     end
   end
 end

data/app/models/hyrax/permission_template.rb

@@ -91,30 +91,6 @@ module Hyrax
       raise Hyrax::ObjectNotFoundError
     end
 
-    # A bit of an analogue for a `belongs_to :admin_set` as it crosses from Fedora to the DB
-    # @deprecated Use #source instead
-    # @return [AdminSet]
-    # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the AdminSet
-    def admin_set
-      Deprecation.warn("#admin_set is deprecated; use #source instead.")
-      return AdminSet.find(source_id) if AdminSet.exists?(source_id)
-      raise Hyrax::ObjectNotFoundError
-    rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
-      raise Hyrax::ObjectNotFoundError
-    end
-
-    # A bit of an analogue for a `belongs_to :collection` as it crosses from Fedora to the DB
-    # @deprecated Use #source instead
-    # @return [Collection]
-    # @raise [Hyrax::ObjectNotFoundError] when the we cannot find the Collection
-    def collection
-      Deprecation.warn("#collection is deprecated; use #source instead.")
-      return ::Collection.find(source_id) if ::Collection.exists?(source_id)
-      raise Hyrax::ObjectNotFoundError
-    rescue ActiveFedora::ActiveFedoraError # TODO: remove the rescue when active_fedora issue #1276 is fixed
-      raise Hyrax::ObjectNotFoundError
-    end
-
     # Valid Release Period values
     RELEASE_TEXT_VALUE_FIXED = 'fixed'
     RELEASE_TEXT_VALUE_NO_DELAY = 'now'
@@ -219,17 +195,6 @@ module Hyrax
         [::Ability.registered_group_name, ::Ability.public_group_name]
     end
 
-    ##
-    # @deprecated Use #reset_access_controls_for instead
-    # @param interpret_visibility [Boolean] whether to retain the existing
-    #   visibility when applying permission template ACLs
-    # @return [Boolean]
-    def reset_access_controls(interpret_visibility: false)
-      Deprecation.warn("#reset_access_controls is deprecated; use #reset_access_controls_for instead.")
-      reset_access_controls_for(collection: source_model,
-                                interpret_visibility: interpret_visibility)
-    end
-
     ##
     # @param collection [::Collection, Hyrax::Resource]
     # @param interpret_visibility [Boolean] whether to retain the existing

data/app/models/proxy_deposit_request.rb

@@ -7,7 +7,7 @@ class ProxyDepositRequest < ActiveRecord::Base
   include ActionView::Helpers::UrlHelper
 
   class_attribute :work_query_service_class
-  self.work_query_service_class = Hyrax.config.use_valkyrie? ? Hyrax::WorkResourceQueryService : Hyrax::WorkQueryService
+  self.work_query_service_class = Hyrax::WorkQueryService
 
   delegate :deleted_work?, :work, :to_s, to: :work_query_service
 

data/app/presenters/hyrax/admin/repository_object_presenter.rb

@@ -2,8 +2,6 @@
 module Hyrax
   module Admin
     class RepositoryObjectPresenter
-      include Blacklight::SearchHelper
-
       def as_json(*)
         counts.map do |k, v|
           { label: I18n.translate(k, scope: 'hyrax.admin.stats.repository_objects.series'),

data/app/presenters/hyrax/collapsable_section_presenter.rb

@@ -21,7 +21,7 @@ module Hyrax
 
     def button_tag
       tag.a(role: 'button',
-            class: "#{button_class}collapse-toggle",
+            class: "#{button_class}collapse-toggle nav-link",
             data: { toggle: 'collapse' },
             href: "##{id}",
             onclick: "toggleCollapse(this)",
@@ -44,7 +44,7 @@ module Hyrax
     end
 
     def workflows_class
-      'in ' if open
+      'show ' if open
     end
   end
 end

data/app/presenters/hyrax/collection_presenter.rb

@@ -111,7 +111,7 @@ module Hyrax
     end
 
     def collection_type_badge
-      tag.span(collection_type.title, class: "label", style: "background-color: " + collection_type.badge_color + ";")
+      tag.span(collection_type.title, class: "badge", style: "background-color: " + collection_type.badge_color + ";")
     end
 
     # The total number of parents that this collection belongs to, visible or not.

data/app/presenters/hyrax/fixity_status_presenter.rb

@@ -25,9 +25,9 @@ module Hyrax
         if relevant_log_records.empty?
           "Fixity checks have not yet been run on this object"
         elsif failing_checks.empty?
-          tag.span("passed", class: "label label-success") + ' ' + render_existing_check_summary
+          tag.span("passed", class: "badge badge-success") + ' ' + render_existing_check_summary
         else
-          tag.span("FAIL", class: "label label-danger") + ' ' + render_existing_check_summary + render_failed_compact
+          tag.span("FAIL", class: "badge badge-danger") + ' ' + render_existing_check_summary + render_failed_compact
         end
     end
 

data/app/presenters/hyrax/menu_presenter.rb

@@ -22,7 +22,7 @@ module Hyrax
     # @param also_active_for [Hash, String] a hash or string with alternative paths that should be 'active'
     def nav_link(options, also_active_for: nil, **link_html_options)
       active_urls = [options, also_active_for].compact
-      list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active' } : {}
+      list_options = active_urls.any? { |url| current_page?(url) } ? { class: 'active nav-item' } : { class: 'nav-item' }
       tag.li(list_options) do
         link_to(options, link_html_options) do
           yield

data/app/presenters/hyrax/permission_badge.rb

@@ -4,11 +4,11 @@ module Hyrax
     include ActionView::Helpers::TagHelper
 
     VISIBILITY_LABEL_CLASS = {
-      authenticated: "label-info",
-      embargo: "label-warning",
-      lease: "label-warning",
-      open: "label-success",
-      restricted: "label-danger"
+      authenticated: "badge-info",
+      embargo: "badge-warning",
+      lease: "badge-warning",
+      open: "badge-success",
+      restricted: "badge-danger"
     }.freeze
 
     # @param visibility [String] the current visibility
@@ -18,21 +18,20 @@ module Hyrax
 
     # Draws a span tag with styles for a bootstrap label
     def render
-      tag.span(text, class: "label #{dom_label_class}")
+      tag.span(text, class: "badge #{dom_label_class}")
     end
 
     private
 
     def dom_label_class
-      VISIBILITY_LABEL_CLASS.fetch(@visibility&.to_sym, 'label-info')
+      VISIBILITY_LABEL_CLASS.fetch(@visibility.to_sym, 'badge-info')
     end
 
     def text
       if registered?
         Institution.name
       else
-        visibility_key = @visibility || 'unknown'
-        I18n.t("hyrax.visibility.#{visibility_key}.text")
+        I18n.t("hyrax.visibility.#{@visibility}.text")
       end
     end
 

data/app/presenters/hyrax/version_list_presenter.rb

@@ -19,12 +19,7 @@ module Hyrax
     #
     # @raise [ArgumentError] if we can't build an enu
     def self.for(file_set:)
-      original_file = if file_set.respond_to?(:original_file)
-                        file_set.original_file
-                      else
-                        Hyrax::FileSetFileService.new(file_set: file_set).original_file
-                      end
-      new(Hyrax::VersioningService.new(resource: original_file).versions)
+      new(file_set.original_file&.versions&.all.to_a)
     rescue NoMethodError
       raise ArgumentError
     end

data/app/presenters/hyrax/workflow_presenter.rb

@@ -33,7 +33,7 @@ module Hyrax
 
     def badge
       return unless state
-      tag.span(state_label, class: "state state-#{state} label label-primary")
+      tag.span(state_label, class: "state state-#{state} badge badge-primary")
     end
 
     private

data/app/renderers/hyrax/renderers/external_link_attribute_renderer.rb

@@ -6,7 +6,7 @@ module Hyrax
 
       def li_value(value)
         auto_link(value) do |link|
-          "<span class='glyphicon glyphicon-new-window'></span>&nbsp;#{link}"
+          "<span class='fa fa-external-link'></span>&nbsp;#{link}"
         end
       end
     end

data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb

@@ -26,19 +26,11 @@ module Hyrax
 
       def show_only_other_collections_of_the_same_collection_type(solr_parameters)
         solr_parameters[:fq] ||= []
-        if Hyrax.config.use_solr_graph_for_collection_nesting
-          solr_parameters[:fq] += [
-            Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid),
-            "-{!graph from=id to=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_parent}}id:#{@collection.id}",
-            "-{!graph to=id from=member_of_collection_ids_ssim#{' maxDepth=1' if @nest_direction == :as_child}}id:#{@collection.id}"
-          ]
-        else
-          solr_parameters[:fq] += [
-            "-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([limit_ids]),
-            Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid)
-          ]
-          solr_parameters[:fq] += limit_clause if limit_clause # add limits to prevent illegal nesting arrangements
-        end
+        solr_parameters[:fq] += [
+          "-" + Hyrax::SolrQueryBuilderService.construct_query_for_ids([limit_ids]),
+          Hyrax::SolrQueryBuilderService.construct_query(Hyrax.config.collection_type_index_field => @collection.collection_type_gid)
+        ]
+        solr_parameters[:fq] += limit_clause if limit_clause # add limits to prevent illegal nesting arrangements
       end
 
       private

data/app/search_builders/hyrax/deposit_search_builder.rb

@@ -6,7 +6,7 @@ module Hyrax
     # zero to just get the facet information
     # @param solr_parameters the current solr parameters
     def include_depositor_facet(solr_parameters)
-      solr_parameters[:"facet.field"].concat([DepositSearchBuilder.depositor_field])
+      solr_parameters.append_facet_fields(DepositSearchBuilder.depositor_field)
 
       # default facet limit is 10, which will only show the top 10 users.
       # As we want to show all user deposits, so set the facet.limit to the

data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb

@@ -22,7 +22,7 @@ module Hyrax
     # @return [void]
     def parent_collections_only(solr_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] += [Hyrax::SolrQueryBuilderService.construct_query_for_ids(child.member_of_collection_ids)]
+      solr_parameters[:fq] += [process_fq]
     end
     self.default_processor_chain += [:parent_collections_only]
 
@@ -34,5 +34,14 @@ module Hyrax
       solr_parameters[:page] = page
     end
     self.default_processor_chain += [:with_pagination]
+
+    private
+
+    def process_fq
+      ids = child.member_of_collection_ids.reject(&:blank?)
+
+      return "id:NEVER_USE_THIS_ID" if ids.empty?
+      Hyrax::SolrQueryService.new.with_ids(ids: child.member_of_collection_ids).build
+    end
   end
 end

data/app/search_builders/hyrax/single_result.rb

@@ -8,7 +8,7 @@ module Hyrax
     end
 
     def find_one(solr_parameters)
-      solr_parameters[:fq] << "{!raw f=id}#{blacklight_params.fetch(:id)}"
+      solr_parameters.append_filter_query("{!raw f=id}#{blacklight_params.fetch(:id)}")
     end
   end
 end

data/app/search_builders/hyrax/stats/work_status_search_builder.rb

@@ -9,7 +9,7 @@ module Hyrax
       # zero to just get the facet information
       # @param solr_parameters the current solr parameters
       def include_suppressed_facet(solr_parameters)
-        solr_parameters[:"facet.field"].concat([IndexesWorkflow.suppressed_field])
+        solr_parameters.append_facet_fields(IndexesWorkflow.suppressed_field)
         solr_parameters[:'facet.missing'] = true
 
         # we only want the facet counts not the actual data

data/app/services/hyrax/adapters/nesting_index_adapter.rb

@@ -147,7 +147,7 @@ module Hyrax
       ##
       # @api private
       def self.find_solr_document_by(id:)
-        query = Hyrax::SolrQueryBuilderService.construct_query_for_ids([id])
+        query = Hyrax::SolrQueryService.new.with_ids(ids: [id]).build
         document = Hyrax::SolrService.query(query, rows: 1).first
         document = ActiveFedora::Base.find(id).to_solr if document.nil?
         raise "Unable to find SolrDocument with ID=#{id}" if document.nil?