hyrax 4.0.0.beta1 → 4.0.0.rc1

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -61,7 +61,7 @@ module Hyrax
       ids.each do |id|
         id = id.to_s
         indx = results.index { |doc| id == doc['id'] }
-        raise(ArgumentError, "Could not find an indexed document for id: #{id}") if
+        raise(Hyrax::ObjectNotFoundError, "Could not find an indexed document for id: #{id}") if
           indx.nil?
         hash = results.delete_at(indx)
         yield presenter_for(document: ::SolrDocument.new(hash), ability: ability)

data/app/presenters/hyrax/permission_badge.rb

@@ -24,14 +24,15 @@ module Hyrax
     private
 
     def dom_label_class
-      VISIBILITY_LABEL_CLASS.fetch(@visibility.to_sym, 'badge-info')
+      VISIBILITY_LABEL_CLASS.fetch(@visibility&.to_sym, 'badge-info')
     end
 
     def text
       if registered?
         Institution.name
       else
-        I18n.t("hyrax.visibility.#{@visibility}.text")
+        visibility_key = @visibility || 'unknown'
+        I18n.t("hyrax.visibility.#{visibility_key}.text")
       end
     end
 

data/app/presenters/hyrax/presenter_renderer.rb

@@ -39,7 +39,7 @@ module Hyrax
     def find_field_partial(field_name)
       ["#{collection_path}/show_fields/_#{field_name}", "records/show_fields/_#{field_name}",
        "#{collection_path}/show_fields/_default", "records/show_fields/_default"].find do |partial|
-        Rails.logger.debug "Looking for show field partial #{partial}"
+        Hyrax.logger.debug "Looking for show field partial #{partial}"
         return partial.sub(/\/_/, '/') if partial_exists?(partial)
       end
     end

data/app/presenters/hyrax/presents_attributes.rb

@@ -15,7 +15,7 @@ module Hyrax
     # @option options [String] :work_type name of work type class (e.g., "GenericWork")
     def attribute_to_html(field, options = {})
       unless respond_to?(field)
-        Rails.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
+        Hyrax.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
         return
       end
 

data/app/presenters/hyrax/version_list_presenter.rb

@@ -19,7 +19,12 @@ module Hyrax
     #
     # @raise [ArgumentError] if we can't build an enu
     def self.for(file_set:)
-      new(file_set.original_file&.versions&.all.to_a)
+      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)
     rescue NoMethodError
       raise ArgumentError
     end

data/app/presenters/hyrax/work_show_presenter.rb

@@ -45,7 +45,7 @@ module Hyrax
     delegate :title, :date_created, :description,
              :creator, :contributor, :subject, :publisher, :language, :embargo_release_date,
              :lease_expiration_date, :license, :source, :rights_statement, :thumbnail_id, :representative_id,
-             :rendering_ids, :member_of_collection_ids, :alternative_title, to: :solr_document
+             :rendering_ids, :member_of_collection_ids, :alternative_title, :bibliographic_citation, to: :solr_document
 
     def workflow
       @workflow ||= WorkflowPresenter.new(solr_document, current_ability)
@@ -98,6 +98,9 @@ module Hyrax
           result = member_presenters([representative_id]).first
           return nil if result.try(:id) == id
           result.try(:representative_presenter) || result
+        rescue Hyrax::ObjectNotFoundError
+          Hyrax.logger.warn "Unable to find representative_id #{representative_id} for work #{id}"
+          return nil
         end
     end
 

data/app/presenters/hyrax/workflow_presenter.rb

@@ -44,7 +44,7 @@ module Hyrax
 
     def sipity_entity
       Sipity::Entity(solr_document)
-    rescue PowerConverter::ConversionError
+    rescue Sipity::ConversionError
       nil
     end
   end

data/app/search_builders/hyrax/collection_search_builder.rb

@@ -37,6 +37,7 @@ module Hyrax
     # This overrides the default 'relevance' sort.
     def add_sorting_to_solr(solr_parameters)
       return if solr_parameters[:q]
+      solr_parameters[:sort] ||= sort
       solr_parameters[:sort] ||= "#{sort_field} asc"
     end
 

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

@@ -6,13 +6,11 @@ module Hyrax
       # @param access [Symbol] :edit, :read, :discover - With the given :access what all can
       # @param collection [::Collection]
       # @param scope [Object] Typically a controller that responds to #current_ability, #blackligh_config
-      # @param nesting_attributes [NestingAttributes] an object encapsulating nesting attributes of the collection
       # @param nest_direction [Symbol] (:as_parent or :as_child) the direction we are adding nesting to this collection
-      def initialize(access:, collection:, scope:, nesting_attributes:, nest_direction:)
+      def initialize(access:, collection:, scope:, nest_direction:)
         super(scope)
         @collection = collection
         @discovery_permissions = extract_discovery_permissions(access)
-        @nesting_attributes = nesting_attributes
         @nest_direction = nest_direction
       end
 
@@ -24,74 +22,16 @@ module Hyrax
         solr_parameters[:rows] = 1000
       end
 
+      # Solr can do graph traversal without the need of special indexing with the Graph query parser so
+      # use this to compute both the parents and children of the current collection then exclude them
+      # See https://solr.apache.org/guide/solr/latest/query-guide/other-parsers.html#graph-query-parser
       def show_only_other_collections_of_the_same_collection_type(solr_parameters)
         solr_parameters[:fq] ||= []
         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)
+          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}"
         ]
-        solr_parameters[:fq] += limit_clause if limit_clause # add limits to prevent illegal nesting arrangements
-      end
-
-      private
-
-      def limit_ids
-        # exclude current collection from returned list
-        limit_ids = [@collection.id.to_s]
-        # cannot add a parent that is already a parent
-        limit_ids += @nesting_attributes.parents if @nesting_attributes.parents && @nest_direction == :as_parent
-        limit_ids
-      end
-
-      # remove collections from list in order to to prevent illegal nesting arrangements
-      def limit_clause
-        case @nest_direction
-        when :as_parent
-          eligible_to_be_a_parent
-        when :as_child
-          eligible_to_be_a_child
-        end
-      end
-
-      # To be eligible to be a parent collection of child "Collection G":
-      # 1) cannot have any pathnames containing Collection G's ID
-      # 2) cannot already be Collection G's direct parent
-      # => this is handled through limit_ids method
-      def eligible_to_be_a_parent
-        # Using a !lucene query allows us to get items using a wildcard query, a feature not supported via AF query builder.
-        ["-_query_:\"{!lucene df=#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}}*#{@collection.id}*\""]
-      end
-
-      # To be eligible to be a child collection of parent "Collection F":
-      # 1) Cannot have any pathnames containing any of Collection F's pathname or ancestors
-      # 2) cannot already be Collection F's direct child
-      def eligible_to_be_a_child
-        exclude_path = []
-        exclude_path << exclude_if_paths_contain_collection
-        exclude_path << exclude_if_already_parent
-      end
-
-      def exclude_if_paths_contain_collection
-        # 1) Exclude any pathnames containing any of Collection F's pathname or ancestors
-        array_to_exclude = [] + @nesting_attributes.pathnames unless @nesting_attributes.pathnames.nil?
-        array_to_exclude += @nesting_attributes.ancestors unless @nesting_attributes.ancestors.nil?
-        # build a unique string containing all of Collection F's pathnames and ancestors
-        exclude_list = ""
-        array_to_exclude&.uniq&.each do |element|
-          exclude_list += ' ' unless exclude_list.empty?
-          exclude_list += element.to_s
-        end
-        # Using a !lucene query allows us to get items which match any individual element
-        # from the list. Building the query via the AF builder created a !field query which
-        # only searches the field for an exact string and doesn't allow an "OR" connection
-        # between the elements.
-        return "-_query_:\"{!lucene q.op=OR df=#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}}#{exclude_list}\"" unless exclude_list.empty?
-        ""
-      end
-
-      def exclude_if_already_parent
-        # 2) Exclude any of Collection F's direct children
-        "-" + ActiveFedora::SolrQueryBuilder.construct_query(Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids => @collection.id.to_s)
       end
     end
   end

data/app/search_builders/hyrax/filter_suppressed_with_roles.rb

@@ -32,7 +32,7 @@ module Hyrax
 
     def user_has_active_workflow_role?(current_work:)
       Hyrax::Workflow::PermissionQuery.scope_permitted_workflow_actions_available_for_current_state(user: current_ability.current_user, entity: current_work).any?
-    rescue PowerConverter::ConversionError
+    rescue Sipity::ConversionError
       # The current_work doesn't have a sipity workflow entity
       false
     end

data/app/services/hyrax/admin_set_create_service.rb

@@ -242,10 +242,10 @@ module Hyrax
 
     def workflow_agents
       [
-        Hyrax::Group.new(admin_group_name)
+        Sipity::Agent(Hyrax::Group.new(admin_group_name))
       ].tap do |agent_list|
         # The default admin set does not have a creating user
-        agent_list << creating_user if creating_user
+        agent_list << Sipity::Agent(creating_user) if creating_user
       end
     end
 

data/app/services/hyrax/admin_set_service.rb

@@ -15,7 +15,7 @@ module Hyrax
 
     # @param [Symbol] access :deposit, :read or :edit
     def search_results(access)
-      response = context.repository.search(builder(access))
+      response = context.blacklight_config.repository.search(builder(access))
       response.documents
     end
 

data/app/services/hyrax/analytics/google.rb

@@ -27,7 +27,7 @@ module Hyrax
             filename = Rails.root.join('config', 'analytics.yml')
             yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
             unless yaml
-              Rails.logger.error("Unable to fetch any keys from #{filename}.")
+              Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
               return new({})
             end
             config = yaml.fetch('analytics')&.fetch('google', nil)

data/app/services/hyrax/analytics/matomo.rb

@@ -24,7 +24,7 @@ module Hyrax
             filename = Rails.root.join('config', 'analytics.yml')
             yaml = YAML.safe_load(ERB.new(File.read(filename)).result)
             unless yaml
-              Rails.logger.error("Unable to fetch any keys from #{filename}.")
+              Hyrax.logger.error("Unable to fetch any keys from #{filename}.")
               return new({})
             end
             new yaml.fetch('analytics')&.fetch('matomo')

data/app/services/hyrax/collection_member_service.rb

@@ -31,5 +31,7 @@ module Hyrax
     def collection_search_builder
       @collection_search_builder ||= ParentCollectionSearchBuilder.new([:include_item_ids, :add_paging_to_solr, :add_access_controls_to_solr_params], self)
     end
+
+    def search_state_class; end
   end
 end

data/app/services/hyrax/collection_types/create_service.rb

@@ -147,7 +147,7 @@ module Hyrax
           Hyrax::CollectionTypeParticipant.create!(hyrax_collection_type_id: collection_type_id, agent_type: p.fetch(:agent_type), agent_id: p.fetch(:agent_id), access: p.fetch(:access))
         end
       rescue InvalidParticipantError => error
-        Rails.logger.error "Participants not created for collection type " \
+        Hyrax.logger.error "Participants not created for collection type " \
                            " #{collection_type_id}: #{error.message}"
         raise error
       end

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

@@ -13,17 +13,17 @@ module Hyrax
       def self.migrate_all_collections
         Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
 
-        Rails.logger.info "*** Migrating #{::Collection.count} collections"
+        Hyrax.logger.info "*** Migrating #{::Collection.count} collections"
         ::Collection.all.each do |col|
           migrate_collection(col)
-          Rails.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
+          Hyrax.logger.info "  migrating collection - id: #{col.id}, title: #{col.title}"
         end
 
         AdminSet.all.each do |adminset|
           migrate_adminset(adminset)
-          Rails.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
+          Hyrax.logger.info "  migrating adminset - id: #{adminset.id}, title: #{adminset.title}"
         end
-        Rails.logger.info "--- Migration Complete"
+        Hyrax.logger.info "--- Migration Complete"
       end
 
       # @api private
@@ -64,16 +64,16 @@ module Hyrax
       def self.repair_migrated_collections
         Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
 
-        Rails.logger.info "*** Repairing migrated collections"
+        Hyrax.logger.info "*** Repairing migrated collections"
         ::Collection.all.each do |col|
           repair_migrated_collection(col)
-          Rails.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
+          Hyrax.logger.info "  repairing collection - id: #{col.id}, title: #{col.title}"
         end
         AdminSet.all.each do |adminset|
           migrate_adminset(adminset)
-          Rails.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
+          Hyrax.logger.info "  repairing adminset - id: #{adminset.id}, title: #{adminset.title}"
         end
-        Rails.logger.info "--- Repairing Complete"
+        Hyrax.logger.info "--- Repairing Complete"
       end
 
       # @api private

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

@@ -4,26 +4,6 @@ module Hyrax
     ##
     # A query service handling nested collection queries.
     module NestedCollectionQueryService
-      ##
-      # @api private
-      #
-      # an encapsulation of a collection's nesting index attributes
-      class NestingAttributes
-        attr_accessor :parents, :pathnames, :ancestors, :depth, :id
-
-        def initialize(id:, scope:)
-          query_builder = Hyrax::CollectionSearchBuilder.new(scope).where(id: id.to_s)
-          query = Hyrax::Collections::NestedCollectionQueryService.clean_lucene_error(builder: query_builder)
-          response = scope.repository.search(query)
-          collection_doc = response.documents.first
-          @id = id.to_s
-          @parents = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_parent_ids]
-          @pathnames = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames]
-          @ancestors = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_storing_ancestors]
-          @depth = collection_doc[Samvera::NestingIndexer.configuration.solr_field_name_for_deepest_nested_depth]
-        end
-      end
-
       ##
       # @api public
       #
@@ -71,8 +51,7 @@ module Hyrax
       def self.parent_collections(child:, scope:, page: 1)
         return [] unless nestable?(collection: child)
         query_builder = Hyrax::NestedCollectionsParentSearchBuilder.new(scope: scope, child: child, page: page)
-        query = clean_lucene_error(builder: query_builder)
-        scope.repository.search(query)
+        scope.blacklight_config.repository.search(query_builder.query)
       end
 
       ##
@@ -86,39 +65,18 @@ module Hyrax
       #   id is in the response. Useful for validation.
       # @param nest_direction [Symbol] :as_child or :as_parent
       def self.query_solr(collection:, access:, scope:, limit_to_id:, nest_direction:)
-        nesting_attributes = NestingAttributes.new(id: collection.id.to_s, scope: scope)
         query_builder = Hyrax::Dashboard::NestedCollectionsSearchBuilder.new(
           access: access,
           collection: collection,
           scope: scope,
-          nesting_attributes: nesting_attributes,
           nest_direction: nest_direction
         )
 
         query_builder.where(id: limit_to_id.to_s) if limit_to_id
-        query = clean_lucene_error(builder: query_builder)
-        scope.repository.search(query)
+        scope.blacklight_config.repository.search(query_builder.query)
       end
       private_class_method :query_solr
 
-      ##
-      # @api private
-      #
-      # clean query for +{!lucene}+ error
-      #
-      # @param builder [SearchBuilder]
-      # @return [Blacklight::Solr::Request] cleaned and functional query
-      def self.clean_lucene_error(builder:)
-        # TODO: Need to investigate further to understand why these particular queries
-        # using the where cause fail when others in the app apparently work
-        #
-        # Perhaps see <https://github.com/projectblacklight/blacklight/blob/064302f73eee4baae4d2abf863c68317d3efb5b7/lib/blacklight/solr/search_builder_behavior.rb#L84-L102>.
-        # This can be averted by using #with in at least some cases?
-        query = builder.query.to_hash
-        query['q'] = query['q'].gsub('{!lucene}', '') if query.key?('q')
-        query
-      end
-
       ##
       # @api public
       #
@@ -144,73 +102,6 @@ module Hyrax
         true
       end
 
-      # @api public
-      #
-      # Does the nesting depth fall within defined limit?
-      #
-      # @param parent [::Collection]
-      # @param child [nil, ::Collection] will be nil if we are nesting a new
-      #   collection under the parent
-      # @param scope [Object] Typically a controller object that responds
-      #   to +repository+, +can?+, +blacklight_config+, +current_ability+
-      #
-      # @return [Boolean] true if the parent can nest the child; false otherwise
-      def self.valid_combined_nesting_depth?(parent:, child: nil, scope:)
-        # We limit the total depth of collections to the size specified in the samvera-nesting_indexer configuration.
-        child_depth = child_nesting_depth(child: child, scope: scope)
-        parent_depth = parent_nesting_depth(parent: parent, scope: scope)
-        return false if parent_depth + child_depth > Samvera::NestingIndexer.configuration.maximum_nesting_depth
-        true
-      end
-
-      # @api private
-      #
-      # Get the child collection's nesting depth
-      #
-      # @param child [::Collection]
-      # @return [Fixnum] the largest number of collections in a path nested
-      #   under this collection (including this collection)
-      def self.child_nesting_depth(child:, scope:)
-        return 1 unless child
-        # The nesting depth of a child collection is found by finding the largest nesting depth
-        # among all collections and works which have the child collection in the paths, and
-        # subtracting the nesting depth of the child collection itself.
-        # => 1) First we find all the collections with this child in the path, sort the results in descending order, and take the first result.
-        # note: We need to include works in this search. They are included in the depth validations in
-        # the indexer, so we do NOT use collection search builder here.
-        builder = Hyrax::SearchBuilder.new(scope).with({
-                                                         q: "#{Samvera::NestingIndexer.configuration.solr_field_name_for_storing_pathnames}:/.*#{child.id}.*/",
-                                                         sort: "#{Samvera::NestingIndexer.configuration.solr_field_name_for_deepest_nested_depth} desc"
-                                                       })
-        builder.rows = 1
-        query = clean_lucene_error(builder: builder)
-        response = scope.repository.search(query).documents.first
-
-        # Now we have the largest nesting depth for all paths containing this collection
-        descendant_depth = response[Samvera::NestingIndexer.configuration.solr_field_name_for_deepest_nested_depth]
-
-        # => 2) Then we get the stored depth of the child collection itself to eliminate the collections above this one from our count, and add 1 to add back in this collection itself
-        child_depth = NestingAttributes.new(id: child.id.to_s, scope: scope).depth
-        nesting_depth = descendant_depth - child_depth + 1
-
-        # this should always be positive, but just being safe
-        nesting_depth.positive? ? nesting_depth : 1
-      end
-      private_class_method :child_nesting_depth
-
-      # @api private
-      #
-      # Get the parent collection's nesting depth
-      #
-      # @param parent [::Collection]
-      # @return [Fixnum] the largest number of collections above
-      #   this collection (includes this collection)
-      def self.parent_nesting_depth(parent:, scope:)
-        return 1 if parent.nil?
-        NestingAttributes.new(id: parent.id.to_s, scope: scope).depth
-      end
-      private_class_method :parent_nesting_depth
-
       # @api private
       #
       # @param collection [Hyrax::PcdmCollection,::Collection]
@@ -218,8 +109,7 @@ module Hyrax
       def self.nestable?(collection:)
         return false if collection.blank?
         return collection.nestable? if collection.respond_to? :nestable?
-        collection_type = Hyrax::CollectionType.find_by_gid!(collection.collection_type_gid)
-        collection_type.nestable?
+        Hyrax::CollectionType.for(collection: collection).nestable?
       end
       private_class_method :nestable?
     end

data/app/services/hyrax/database_migrator.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'rails/generators/actions'
+require 'rails/generators'
 require 'rails/generators/active_record'
 
 module Hyrax

data/app/services/hyrax/derivative_service.rb

@@ -1,26 +1,59 @@
 # frozen_string_literal: true
+
+# @api public
+#
+# A factory class _and_ interface defining class that finds the **first** valid registered service for the given object.
+#
+# The .for method is the factory.  The instance_methods of this class defines the interface.
+#
+# @see https://github.com/samvera-labs/newspaper_works/blob/d0c0c0595ad318178896fb7f2abd93c5139fe5b7/lib/newspaper_works/engine.rb#L15-L35 for an example extending the service.
+# @see ValkyrieCreateDerivativesJob for example of this object's usage within Hyrax
+# @see Hyrax::FileSet::Derivatives for example of this object's usage within Hyrax
+# @see Hyrax::FileSetDerivativesService for a class that implements the Hyrax::DerivativeService interface
 class Hyrax::DerivativeService
-  class_attribute :services
-  self.services = [Hyrax::FileSetDerivativesService]
-  def self.for(file_set)
+  # @deprecated favor Hyrax.config.derivative_services=
+  def self.services=(services)
+    Deprecation.warn("Hyrax::DerivativeService.services= is deprecated; favor Hyrax.config.derivative_servies=")
+    Hyrax.config.derivative_services = Array(services)
+  end
+
+  # @deprecated favor Hyrax.config.derivative_services
+  def self.services
+    Deprecation.warn("Hyrax::DerivativeService.services is deprecated; favor Hyrax.config.derivative_servies")
+    Hyrax.config.derivative_services
+  end
+
+  # @api public
+  #
+  # Get the first valid registered service for the given file_set.
+  #
+  # @param file_set [#uri, #file_set]
+  # @return [#cleanup_derivatives, #create_derivatives, #derivative_url]
+  def self.for(file_set, services: Hyrax.config.derivative_services)
     services.map { |service| service.new(file_set) }.find(&:valid?) ||
       new(file_set)
   end
   attr_reader :file_set
   delegate :mime_type, :uri, to: :file_set
+
+  # @api private
   def initialize(file_set)
     @file_set = file_set
   end
 
+  # @api public
   def cleanup_derivatives; end
 
+  # @api public
   def create_derivatives(_file_path); end
 
-  # What should this return?
+  # @api public
+  # @note What should this return?
   def derivative_url(_destination_name)
     ""
   end
 
+  # @api public
   def valid?
     true
   end

data/app/services/hyrax/edit_permissions_service.rb

@@ -20,17 +20,35 @@ module Hyrax
     # @note
     #   +form object.class = SimpleForm::FormBuilder+
     #    For works (i.e. GenericWork):
-    #    * form object.object = Hyrax::GenericWorkForm
-    #    * form object.object.model = GenericWork
+    #    * form_object.object = Hyrax::GenericWorkForm
+    #    * form_object.object.model = GenericWork
     #    * use the work itself
     #    For file_sets:
-    #    * form object.object.class = FileSet
+    #    * form_object.object.class = FileSet
+    #    * use work the file_set is in
+    #    For file set forms:
+    #    * form_object.object.class = Hyrax::Forms::FileSetForm OR
+    #      Hyrax::Forms::FileSetEditForm
+    #    * form_object.object.model = FileSet
     #    * use work the file_set is in
     #    No other object types are supported by this view.
     def self.build_service_object_from(form:, ability:)
       if form.object.respond_to?(:model) && form.object.model.work?
+        # The provided form object is a work form.
         new(object: form.object, ability: ability)
+      elsif form.object.respond_to?(:model) && form.object.model.file_set?
+        # The provided form object is a FileSet form. For Valkyrie forms
+        # (+Hyrax::Forms::FileSetForm+), +:in_works_ids+ is prepopulated onto
+        # the form object itself. For +Hyrax::Forms::FileSetEditForm+, the
+        # +:in_works+ method is present on the wrapped +:model+.
+        if form.object.is_a?(Hyrax::Forms::FileSetForm)
+          object_id = form.object.in_works_ids.first
+          new(object: Hyrax.query_service.find_by(id: object_id), ability: ability)
+        else
+          new(object: form.object.model.in_works.first, ability: ability)
+        end
       elsif form.object.file_set?
+        # The provided form object is a FileSet.
         new(object: form.object.in_works.first, ability: ability)
       end
     end
@@ -202,20 +220,7 @@ module Hyrax
         # Hyrax::AdministrativeSet, we need to test both cases.
         true
       else
-        if resource.respond_to?(:share_applies_to_new_works?)
-          # The Collection model has traditionally delegated #share_applies_to_new_works? to
-          # the underlying collection_type
-          # (see https://github.com/samvera/hyrax/blob/696da5db/spec/models/collection_spec.rb#L189)
-          resource.share_applies_to_new_works?
-        elsif resource.respond_to?(:collection_type_gid)
-          # This is likely a Hyrax::PcdmCollection object, which means we don't have the delegation
-          # behavior.  Instead we'll query the collection type directly.
-          collection_type = CollectionType.find_by_gid(resource.collection_type_gid)
-          collection_type&.share_applies_to_new_works?
-        else
-          # How might we get here?
-          false
-        end
+        Hyrax::CollectionType.for(collection: resource).share_applies_to_new_works?
       end
     end
 

data/app/services/hyrax/embargo_manager.rb

@@ -161,6 +161,15 @@ module Hyrax
       resource.embargo || Embargo.new
     end
 
+    ##
+    # Drop the embargo by setting its release date to `nil`.
+    #
+    # @return [void]
+    def nullify
+      return unless under_embargo?
+      embargo.embargo_release_date = nil
+    end
+
     ##
     # Sets the visibility of the resource to the embargo's visibility condition.
     # no-op if the embargo period is current.

data/app/services/hyrax/embargo_service.rb

@@ -26,6 +26,10 @@ module Hyrax
         presenters(builder)
       end
 
+      def search_state_class
+        nil
+      end
+
       private
 
       def presenter_class