hyrax 4.0.0.beta2 → 4.0.0.rc2

data/app/forms/hyrax/forms/resource_form.rb

@@ -11,12 +11,16 @@ module Hyrax
     #     # other WorkForm-like configuration here
     #   end
     #
+    # @note The returned class will extend +Hyrax::Forms::PcdmObjectForm+, not
+    #   only +Hyrax::Forms::ResourceForm+. This is for backwards‐compatibility
+    #   with existing Hyrax instances and satisfies the expected general use
+    #   case (building forms for various PCDM object classes), but is *not*
+    #   necessarily suitable for other kinds of Hyrax resource, like
+    #   +Hyrax::FileSet+s.
     def self.ResourceForm(work_class)
-      Class.new(Hyrax::Forms::ResourceForm) do
+      Class.new(Hyrax::Forms::PcdmObjectForm) do
         self.model_class = work_class
 
-        include Hyrax::FormFields(:core_metadata)
-
         ##
         # @return [String]
         def self.inspect
@@ -29,11 +33,11 @@ module Hyrax
     ##
     # @api public
     #
-    # This form wraps `Hyrax::ChangeSet` in the `HydraEditor::Form` interface.
+    # This form wraps +Hyrax::ChangeSet+ in the +HydraEditor::Form+ interface.
     class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
       ##
       # @api private
-      InWorksPrepopulator = lambda do |_options|
+      InWorksPrepopulator = proc do |_options|
         self.in_works_ids =
           if persisted?
             Hyrax.query_service
@@ -52,7 +56,7 @@ module Hyrax
       #   with `etag`-driven, application-side lock checks. for non-wings adapters
       #   we want to move away from application side lock validation and rely
       #   on the adapter/database features instead.
-      LockKeyPrepopulator = lambda do |_options|
+      LockKeyPrepopulator = proc do |_options|
         if Hyrax.config.disable_wings || !Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
           Hyrax.logger.info "trying to prepopulate a lock token for " \
                             "#{self.class.inspect}, but optimistic locking isn't " \
@@ -69,45 +73,33 @@ module Hyrax
       property :human_readable_type, writable: false
 
       property :depositor
-      property :on_behalf_of
-      property :proxy_depositor
 
       property :visibility, default: VisibilityIntention::PRIVATE, populator: :visibility_populator
 
       property :date_modified, readable: false
       property :date_uploaded, readable: false
-      property :agreement_accepted, virtual: true, default: false, prepopulator: ->(_opts) { self.agreement_accepted = !model.new_record }
+      property :agreement_accepted, virtual: true, default: false, prepopulator: proc { |_opts| self.agreement_accepted = !model.new_record }
 
       collection(:permissions,
                  virtual: true,
                  default: [],
                  form: Hyrax::Forms::Permission,
                  populator: :permission_populator,
-                 prepopulator: ->(_opts) { self.permissions = Hyrax::AccessControl.for(resource: model).permissions })
+                 prepopulator: proc { |_opts| self.permissions = Hyrax::AccessControl.for(resource: model).permissions })
 
       property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator
       property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator
 
       # virtual properties for embargo/lease;
-      property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
-      property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
-      property :visibility_during_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
+      property :embargo_release_date, virtual: true, prepopulator: proc { |_opts| self.embargo_release_date = model.embargo&.embargo_release_date }
+      property :visibility_after_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
+      property :visibility_during_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
 
-      property :lease_expiration_date, virtual: true,  prepopulator: ->(_opts) { self.lease_expiration_date = model.lease&.lease_expiration_date }
-      property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
-      property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
+      property :lease_expiration_date, virtual: true,  prepopulator: proc { |_opts| self.lease_expiration_date = model.lease&.lease_expiration_date }
+      property :visibility_after_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_after_lease = model.lease&.visibility_after_lease }
+      property :visibility_during_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_during_lease = model.lease&.visibility_during_lease }
 
-      # pcdm relationships
-      property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s }
       property :in_works_ids, virtual: true, prepopulator: InWorksPrepopulator
-      property :member_ids, default: [], type: Valkyrie::Types::Array
-      property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
-      property :member_of_collections_attributes, virtual: true, populator: :in_collections_populator
-      validates_with CollectionMembershipValidator
-
-      property :representative_id, type: Valkyrie::Types::String
-      property :thumbnail_id, type: Valkyrie::Types::String
-      property :rendering_ids, default: [], type: Valkyrie::Types::Array
 
       # provide a lock token for optimistic locking; we name this `version` for
       # backwards compatibility
@@ -119,10 +111,6 @@ module Hyrax
       # @see https://github.com/samvera/valkyrie/wiki/Optimistic-Locking
       property :version, virtual: true, prepopulator: LockKeyPrepopulator
 
-      # backs the child work search element;
-      # @todo: look for a way for the view template not to depend on this
-      property :find_child_work, default: nil, virtual: true
-
       class << self
         ##
         # @api public
@@ -143,6 +131,7 @@ module Hyrax
           when Hyrax::PcdmCollection
             Hyrax::Forms::PcdmCollectionForm.new(resource)
           else
+            # NOTE: This will create a +Hyrax::Forms::PcdmObjectForm+.
             Hyrax::Forms::ResourceForm(resource.class).new(resource)
           end
         end
@@ -219,20 +208,6 @@ module Hyrax
         self.lease = Hyrax::LeaseManager.lease_for(resource: model)
       end
 
-      def in_collections_populator(fragment:, **_options)
-        adds = []
-        deletes = []
-        fragment.each do |_, h|
-          if h["_destroy"] == "true"
-            deletes << Valkyrie::ID.new(h["id"])
-          else
-            adds << Valkyrie::ID.new(h["id"])
-          end
-        end
-
-        self.member_of_collection_ids = ((member_of_collection_ids + adds) - deletes).uniq
-      end
-
       # https://trailblazer.to/2.1/docs/reform.html#reform-populators-populator-collections
       def permission_populator(collection:, index:, **)
         Hyrax::Forms::Permission.new(collection[index])

data/app/forms/hyrax/forms/work_embargo_form.rb

@@ -11,9 +11,9 @@ module Hyrax
     #   +EmbargoesControllerBehavior+.
     class WorkEmbargoForm < Hyrax::ChangeSet
       property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
-      property :embargo_release_date, virtual: true, prepopulator: ->(_opts) { self.embargo_release_date = model.embargo&.embargo_release_date }
-      property :visibility_after_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
-      property :visibility_during_embargo, virtual: true, prepopulator: ->(_opts) { self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
+      property :embargo_release_date, virtual: true, prepopulator: proc { |_opts| self.embargo_release_date = model.embargo&.embargo_release_date }
+      property :visibility_after_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_after_embargo = model.embargo&.visibility_after_embargo }
+      property :visibility_during_embargo, virtual: true, prepopulator: proc { |_opts| self.visibility_during_embargo = model.embargo&.visibility_during_embargo }
 
       def embargo_populator(**)
         self.embargo = Hyrax::EmbargoManager.embargo_for(resource: model)

data/app/forms/hyrax/forms/work_lease_form.rb

@@ -11,9 +11,9 @@ module Hyrax
     #   +LeasesControllerBehavior+.
     class WorkLeaseForm < Hyrax::ChangeSet
       property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator, prepopulator: :lease_populator
-      property :lease_expiration_date, virtual: true, prepopulator: ->(_opts) { self.lease_expiration_date = model.lease&.lease_expiration_date }
-      property :visibility_after_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_after_lease = model.lease&.visibility_after_lease }
-      property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
+      property :lease_expiration_date, virtual: true, prepopulator: proc { |_opts| self.lease_expiration_date = model.lease&.lease_expiration_date }
+      property :visibility_after_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_after_lease = model.lease&.visibility_after_lease }
+      property :visibility_during_lease, virtual: true, prepopulator: proc { |_opts| self.visibility_during_lease = model.lease&.visibility_during_lease }
 
       def lease_populator(**)
         self.lease = Hyrax::LeaseManager.lease_for(resource: model)

data/app/helpers/hyrax/content_block_helper_behavior.rb

@@ -3,7 +3,7 @@ module Hyrax
   module ContentBlockHelperBehavior
     def displayable_content_block(content_block, **options)
       return unless display_content_block? content_block
-      tag.div raw(content_block.value), options
+      tag.div(raw(content_block.value), **options)
     end
 
     def display_content_block?(content_block)

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -289,7 +289,7 @@ module Hyrax
     end
 
     def collection_title_by_id(id)
-      solr_docs = controller.repository.find(id).docs
+      solr_docs = controller.blacklight_config.repository.find(id).docs
       return nil if solr_docs.empty?
       solr_field = solr_docs.first["title_tesim"]
       return nil if solr_field.nil?

data/app/helpers/hyrax/iiif_helper.rb

@@ -3,7 +3,7 @@ module Hyrax
   module IiifHelper
     def iiif_viewer_display(work_presenter, locals = {})
       render iiif_viewer_display_partial(work_presenter),
-             locals.merge(presenter: work_presenter)
+             **locals.merge(presenter: work_presenter)
     end
 
     def iiif_viewer_display_partial(work_presenter)

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -9,7 +9,7 @@ module Hyrax
     include Hyrax::VisibilityIndexer
     include Hyrax::ThumbnailIndexer
     include Hyrax::Indexer(:core_metadata)
-    include Hyrax::Indexer(:basic_metadata)
+    include Hyrax::Indexer(:file_set_metadata)
 
     def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       super.tap do |solr_doc| # rubocop:disable Metrics/BlockLength

data/app/jobs/characterize_job.rb

@@ -65,8 +65,9 @@ class CharacterizeJob < Hyrax::ApplicationJob
     # mod time. This is done in the versioning code.
     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.force_encoding("UTF-8")] if reset_title
+    file_set.characterization_proxy.original_name.force_encoding("UTF-8")
+    # set title to label (i.e. file name, `original_name`) if that's how it was before this characterization
+    file_set.title = [file_set.characterization_proxy.original_name] if reset_title
     # always set the label to the original_name
     file_set.label = file_set.characterization_proxy.original_name
 

data/app/jobs/valkyrie_create_derivatives_job.rb

@@ -9,8 +9,6 @@ class ValkyrieCreateDerivativesJob < Hyrax::ApplicationJob
     # Call derivatives with the file_set.
     derivative_service = Hyrax::DerivativeService.for(file_metadata)
     derivative_service.create_derivatives(file.disk_path)
-    # Trigger a reindex to get the thumbnail path.
-    Hyrax.publisher.publish('file.metadata.updated', metadata: file_metadata, user: nil)
   end
 
   private

data/app/models/collection_branding_info.rb

@@ -1,18 +1,7 @@
 # frozen_string_literal: true
 class CollectionBrandingInfo < ApplicationRecord
-  def initialize(collection_id:,
-                 filename:,
-                 role:,
-                 alt_txt: "",
-                 target_url: "")
-
-    super()
-    self.collection_id = collection_id
-    self.role = role
-    self.alt_text = alt_txt
-    self.target_url = target_url
-    self.local_path = File.join(role, filename)
-  end
+  attr_accessor :filename, :alt_txt
+  after_initialize :set_collection_attributes
 
   def save(file_location, upload_file = true)
     filename = File.split(local_path).last
@@ -52,6 +41,11 @@ class CollectionBrandingInfo < ApplicationRecord
 
   private
 
+  def set_collection_attributes
+    self.alt_text ||= alt_txt || ''
+    self.local_path ||= File.join(role, filename)
+  end
+
   def storage
     Hyrax.config.branding_storage_adapter
   end

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

@@ -414,7 +414,7 @@ module Hyrax
     # @param document_id [String] the id of the document.
     def user_is_depositor?(document_id)
       doc = Hyrax::SolrService.search_by_id(document_id, fl: 'depositor_ssim')
-      current_user.user_key == doc.fetch('depositor_ssim').first
+      current_user.user_key == doc['depositor_ssim']&.first
     end
 
     def curation_concerns_models

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

@@ -52,25 +52,6 @@ module Hyrax
       self.collection_type_gid = new_collection_type.to_global_id
     end
 
-    # Add members using the members association.
-    def add_members(new_member_ids)
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                         "Instead, use Hyrax::Collections::CollectionMemberService.add_members_by_ids.")
-      Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: id,
-                                                                     new_member_ids: new_member_ids,
-                                                                     user: nil)
-    end
-
-    # Add member objects by adding this collection to the objects' member_of_collection association.
-    # @param [Enumerable<String>] the ids of the new child collections and works collection ids
-    def add_member_objects(new_member_ids)
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-                         "Instead, use Hyrax::Collections::CollectionMemberService.add_members_by_ids.")
-      Hyrax::Collections::CollectionMemberService.add_members_by_ids(collection_id: id,
-                                                                     new_member_ids: new_member_ids,
-                                                                     user: nil)
-    end
-
     # @return [Enumerable<ActiveFedora::Base>] an enumerable over the children of this collection
     def member_objects
       ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id}")
@@ -96,22 +77,6 @@ module Hyrax
           "hyrax/#{collection}/#{element}"
         end
       end
-
-      def collection_type_gid_document_field_name
-        Deprecation.warn('use Hyrax.config.collection_type_index_field instead')
-        Hyrax.config.collection_type_index_field
-      end
-    end
-
-    # @deprecated to be removed in 4.0.0; this feature was replaced with a
-    #   hard-coded null implementation
-    # @return [Fixnum] 0
-    def bytes
-      Deprecation.warn('#bytes has been deprecated for removal in Hyrax 4.0.0; ' \
-                       'The implementation of the indexed Collection size ' \
-                       'feature is extremely inefficient, so it has been removed. ' \
-                       'This method now returns a hard-coded `0` for compatibility.')
-      0
     end
 
     # @api public
@@ -122,18 +87,6 @@ module Hyrax
       Hyrax::PermissionTemplate.find_by!(source_id: id)
     end
 
-    ##
-    # @deprecated use PermissionTemplate#reset_access_controls_for instead
-    #
-    # Calculate and update who should have read/edit access to the collections based on who
-    # has access in PermissionTemplateAccess
-    def reset_access_controls!
-      Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
-
-      permission_template
-        .reset_access_controls_for(collection: self, interpret_visibility: true)
-    end
-
     private
 
     # Solr field name works use to index member ids

data/app/models/concerns/hyrax/solr_document/metadata.rb

@@ -69,6 +69,7 @@ module Hyrax
         attribute :date_created, Solr::Array, "date_created_tesim"
         attribute :rights_statement, Solr::Array, "rights_statement_tesim"
         attribute :rights_notes, Solr::Array, "rights_notes_tesim"
+        attribute :bibliographic_citation, Solr::Array, "bibliographic_citation_tesim"
         attribute :access_right, Solr::Array, "access_right_tesim"
         attribute :mime_type, Solr::String, "mime_type_ssi"
         attribute :workflow_state, Solr::String, "workflow_state_name_ssim"

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

@@ -22,13 +22,5 @@ module Hyrax
     def suppressed?
       Hyrax::ResourceStatus.new(resource: self).inactive?
     end
-
-    ##
-    # @deprecated Use `Sipity::Entity(entity)` instead.
-    def to_sipity_entity
-      Deprecation.warn "Use `Sipity::Entity(entity)` instead."
-      raise "Can't create an entity until the model has been persisted" unless persisted?
-      @sipity_entity ||= Sipity::Entity(to_global_id)
-    end
   end
 end

data/app/models/file_download_stat.rb

@@ -12,10 +12,10 @@ class FileDownloadStat < Hyrax::Statistic
         Hyrax.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
         return []
       end
-      profile.hyrax__analytics__google__download(sort: 'date',
-                                                 start_date: start_date,
-                                                 end_date: Date.yesterday,
-                                                 limit: 10_000)
+      profile.hyrax__download(sort: 'date',
+                              start_date: start_date,
+                              end_date: Date.yesterday,
+                              limit: 10_000)
              .for_file(file.id)
     end
 

data/app/models/hyrax/collection_type.rb

@@ -36,14 +36,6 @@ module Hyrax
       assign_machine_id
     end
 
-    # this class attribute is deprecated in favor of {.settings_attributes}
-    # these need to carefully align with boolean flag attributes/table columns,
-    # so making it settable is a liability. deprecating is challenging because
-    # +class_attribute+ calls +singleton_class.class_eval { redefine_method }+
-    # as the +name=+ implementation. there should be few callers outside hyrax.
-    class_attribute :collection_type_settings_methods, instance_writer: false
-    self.collection_type_settings_methods = SETTINGS_ATTRIBUTES
-
     # These are provided as a convenience method based on prior design discussions.
     alias_attribute :discovery, :discoverable
     alias_attribute :sharing, :sharable
@@ -123,14 +115,6 @@ module Hyrax
       ActiveFedora::Base.where(Hyrax.config.collection_type_index_field.to_sym => to_global_id.to_s)
     end
 
-    ##
-    # @deprecated Use #collections.any? instead
-    #
-    # @return [Boolean] True if there is at least one collection of this type
-    def collections?
-      Deprecation.warn('Use #collections.any? instead.') && collections.any?
-    end
-
     # @return [Boolean] True if this is the Admin Set type
     def admin_set?
       machine_id == ADMIN_SET_MACHINE_ID

data/app/models/hyrax/file_metadata.rb

@@ -13,11 +13,13 @@ module Hyrax
       file.is_a?(Valkyrie::Resource)
 
     Hyrax.custom_queries.find_file_metadata_by(id: file.id)
-  rescue Hyrax::ObjectNotFoundError, Ldp::BadRequest
+  rescue Hyrax::ObjectNotFoundError, Ldp::BadRequest, Valkyrie::Persistence::ObjectNotFoundError
     Hyrax.logger.debug('Could not find an existing metadata node for file ' \
                        "with id #{file.id}. Initializing a new one")
 
-    FileMetadata.new(file_identifier: file.id, alternative_ids: [file.id])
+    FileMetadata.new(file_identifier: file.id,
+                     alternative_ids: [file.id],
+                     original_filename: File.basename(file.io))
   end
 
   class FileMetadata < Valkyrie::Resource
@@ -65,7 +67,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].freeze)
+    attribute :type, ::Valkyrie::Types::Set.default([Use::ORIGINAL_FILE].freeze) # Use += to add types, not <<
 
     # attributes set by fits
     attribute :format_label, ::Valkyrie::Types::Set
@@ -125,15 +127,6 @@ module Hyrax
     # attributes set by fits for video
     attribute :aspect_ratio, ::Valkyrie::Types::Set
 
-    # @param [ActionDispatch::Http::UploadedFile] file
-    # @deprecated Use #new instead; for removal in 4.0.0
-    def self.for(file:)
-      Deprecation.warn "#{self.class}##{__method__} is deprecated; use #new instead."
-      new(label: file.original_filename,
-          original_filename: file.original_filename,
-          mime_type: file.content_type)
-    end
-
     ##
     # @return [Boolean]
     def original_file?

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(:basic_metadata)
+    include Hyrax::Schema(:file_set_metadata)
 
     def self.model_name(name_class: Hyrax::Name)
       @_model_name ||= name_class.new(self, nil, 'FileSet')
@@ -51,14 +51,6 @@ module Hyrax
       id
     end
 
-    ##
-    # @return [Valkyrie::ID]
-    # If one is set then return it, otherwise use self as the ID to allow for
-    # derivative generators to find the on-disk path for the thumbnail.
-    def thumbnail_id
-      self.[](:thumbnail_id) || id
-    end
-
     ##
     # @return [Boolean] true
     def pcdm_object?

data/app/models/hyrax/permission_template.rb

@@ -204,7 +204,7 @@ module Hyrax
       interpreted_read_groups = read_groups
 
       if interpret_visibility
-        visibilities = Hyrax::VisibilityMap.instance
+        visibilities = Hyrax.config.visibility_map
         interpreted_read_groups -= visibilities.deletions_for(visibility: collection.visibility)
         interpreted_read_groups += visibilities.additions_for(visibility: collection.visibility)
       end

data/app/models/hyrax/statistic.rb

@@ -34,10 +34,10 @@ module Hyrax
           Hyrax.logger.error("Google Analytics profile has not been established. Unable to fetch statistics.")
           return []
         end
-        profile.hyrax__analytics__google__pageviews(sort: 'date',
-                                                    start_date: start_date,
-                                                    end_date: Date.yesterday,
-                                                    limit: 10_000)
+        profile.hyrax__pageview(sort: 'date',
+                                start_date: start_date,
+                                end_date: Date.yesterday,
+                                limit: 10_000)
                .for_path(path)
       end
 

data/app/models/sipity.rb

@@ -104,10 +104,33 @@ module Sipity
   end
   module_function :Role
 
+  ##
+  # Cast an object to a Workflow id
+  # rubocop:disable Metrics/MethodLength
+  def WorkflowId(input, &block) # rubocop:disable Naming/MethodName
+    result = case input
+             when Sipity::Workflow
+               input.id
+             when Integer
+               input
+             when String
+               input.to_i
+             else
+               if input.respond_to?(workflow_id)
+                 input.workflow_id
+               else
+                 WorkflowId(Entity(input))
+               end
+             end
+    handle_conversion(input, result, :to_workflow_id, &block)
+  end
+  module_function :WorkflowId
+  # rubocop:enable Metrics/MethodLength
+
   ##
   # Cast an object to a WorkflowAction in a given workflow
   def WorkflowAction(input, workflow, &block) # rubocop:disable Naming/MethodName
-    workflow_id = PowerConverter.convert_to_sipity_workflow_id(workflow)
+    workflow_id = WorkflowId(workflow)
 
     result = case input
              when WorkflowAction
@@ -138,11 +161,9 @@ module Sipity
   # A parent error class for all workflow errors caused by bad state
   class StateError < RuntimeError; end
 
-  class ConversionError < PowerConverter::ConversionError
-    def initialize(value, **options)
-      options[:scope] ||= nil
-      options[:to]    ||= nil
-      super(value, options)
+  class ConversionError < RuntimeError
+    def initialize(value)
+      super("Unable to convert #{value.inspect}")
     end
   end
 

data/app/presenters/hyrax/collection_presenter.rb

@@ -43,7 +43,7 @@ module Hyrax
     # Terms is the list of fields displayed by
     # app/views/collections/_show_descriptions.html.erb
     def self.terms
-      [:total_items, :size, :resource_type, :creator, :contributor, :keyword, :license, :publisher, :date_created, :subject,
+      [:total_items, :alternative_title, :size, :resource_type, :creator, :contributor, :keyword, :license, :publisher, :date_created, :subject,
        :language, :identifier, :based_near, :related_url]
     end
 

data/app/presenters/hyrax/iiif_manifest_presenter.rb

@@ -47,6 +47,12 @@ module Hyrax
       Array(super).first || ''
     end
 
+    ##
+    # @return [String]
+    def hostname
+      @hostname || 'localhost'
+    end
+
     ##
     # @return [Boolean]
     def file_set?
@@ -71,7 +77,7 @@ module Hyrax
       metadata_fields.map do |field_name|
         {
           'label' => I18n.t("simple_form.labels.defaults.#{field_name}"),
-          'value' => Array(self[field_name]).map { |value| scrub(value.to_s) }
+          'value' => Array(send(field_name)).map { |value| scrub(value.to_s) }
         }
       end
     end
@@ -209,6 +215,14 @@ module Hyrax
                iiif_endpoint: iiif_endpoint(latest_file_id, base_url: hostname))
       end
 
+      ##
+      # @return [#can?]
+      def ability
+        @ability ||= NullAbility.new
+      end
+
+      ##
+      # @return [String]
       def hostname
         @hostname || 'localhost'
       end
@@ -222,10 +236,6 @@ module Hyrax
 
     private
 
-    def hostname
-      @hostname || 'localhost'
-    end
-
     def metadata_fields
       Hyrax.config.iiif_metadata_fields
     end

data/app/presenters/hyrax/presenter_factory.rb

@@ -44,8 +44,8 @@ module Hyrax
     end
 
     # Query solr using POST so that the query doesn't get too large for a URI
-    def query(query, args = {})
-      result = Hyrax::SolrService.post(query, args)
+    def query(query, **opts)
+      result = Hyrax::SolrService.post(query, **opts)
       result.fetch('response').fetch('docs')
     end
   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)

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