hyrax 4.0.0.rc3 → 5.0.0.rc1

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

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+module Hyrax
+  module ValkyrieDownloadsControllerBehavior
+    def show_valkyrie
+      file_set_id = params.require(:id)
+      file_set = Hyrax.query_service.find_by(id: file_set_id)
+      send_file_contents_valkyrie(file_set)
+    end
+
+    private
+
+    def send_file_contents_valkyrie(file_set)
+      response.headers["Accept-Ranges"] = "bytes"
+      self.status = 200
+      use = params.fetch(:file, :original_file).to_sym
+      file_metadata = find_file_metadata(file_set: file_set, use: use)
+      return unless stale?(last_modified: file_metadata.updated_at, template: false)
+
+      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+      prepare_file_headers_valkyrie(metadata: file_metadata, file: file)
+
+      # Warning - using the range header will load the range selection in to memory
+      # this can cause memory bloat
+      if request.headers['Range']
+        file.rewind
+        send_data send_range_valkyrie(file: file), data_options(file_metadata)
+      else
+        send_file file.disk_path
+      end
+    end
+
+    def data_options(file_metadata)
+      {
+        type: file_metadata.mime_type,
+        filename: file_metadata.original_filename,
+        disposition: "inline",
+        status: status
+      }
+    end
+
+    def send_range_valkyrie(file:)
+      _, range = request.headers['Range'].split('bytes=')
+      from, to = range.split('-').map(&:to_i)
+      to = file.size - 1 unless to
+      length = to - from + 1
+      response.headers['Content-Range'] = "bytes #{from}-#{to}/#{file.size}"
+      response.headers['Content-Length'] = length.to_s
+      self.status = 206
+      file.read from # Seek to start of requested range
+      file.read length
+    end
+
+    def prepare_file_headers_valkyrie(metadata:, file:, inline: false)
+      inline_display = ActiveRecord::Type::Boolean.new.cast(params.fetch(:inline, inline))
+      response.headers["Content-Disposition"] = "#{inline_display ? 'inline' : 'attachment'}; filename=#{metadata.original_filename}"
+      response.headers["Content-Type"] = metadata.mime_type
+      response.headers["Content-Length"] ||= (file.try(:size) || metadata.size.first).to_s
+      # Prevent Rack::ETag from calculating a digest over body
+      response.headers["Last-Modified"] = metadata.updated_at.utc.strftime("%a, %d %b %Y %T GMT")
+      self.content_type = metadata.mime_type
+    end
+
+    def find_file_metadata(file_set:, use: :original_file)
+      use = :thumbnail_file if use == :thumbnail
+      begin
+        use = Hyrax::FileMetadata::Use.uri_for(use: use)
+      rescue ArgumentError
+        raise Hyrax::ObjectNotFoundError
+      end
+      results = Hyrax.custom_queries.find_many_file_metadata_by_use(resource: file_set, use: use)
+      results.first || raise(Hyrax::ObjectNotFoundError)
+    end
+  end
+end

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

@@ -125,7 +125,7 @@ module Hyrax
     end
 
     def file_manager
-      @form = Forms::FileManagerForm.new(curation_concern, current_ability)
+      @form = presenter
     end
 
     def inspect_work
@@ -180,15 +180,18 @@ module Hyrax
 
     ##
     # @return [#errors]
+    # rubocop:disable Metrics/MethodLength
     def create_valkyrie_work
       form = build_form
-      return after_create_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
+      # fallback to an empty hash to avoid: # NoMethodError: undefined method `has_key?` for nil:NilClass
+      original_input_params_for_form = params[hash_key_for_curation_concern] ? params[hash_key_for_curation_concern] : {}
+      return after_create_error(form_err_msg(form), original_input_params_for_form) unless form.validate(original_input_params_for_form)
 
       result =
         transactions['change_set.create_work']
         .with_step_args(
           'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
-          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: original_input_params_for_form[:file_set] },
           'change_set.set_user_as_depositor' => { user: current_user },
           'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) },
           'work_resource.save_acl' => { permissions_params: form.input_params["permissions"] }
@@ -197,6 +200,7 @@ module Hyrax
       @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
       after_create_response
     end
+    # rubocop:enable Metrics/MethodLength
 
     def update_valkyrie_work
       form = build_form
@@ -370,10 +374,15 @@ module Hyrax
       end
     end
 
+    def format_error_messages(errors)
+      # the error may already be a string
+      errors.respond_to?(:messages) ? errors.messages.values.flatten.join("\n") : errors
+    end
+
     def after_create_error(errors, original_input_params_for_form = nil)
       respond_to do |wants|
         wants.html do
-          flash[:error] = errors.to_s
+          flash[:error] = format_error_messages(errors)
           rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
           render 'new', status: :unprocessable_entity
         end
@@ -402,7 +411,7 @@ module Hyrax
     def after_update_error(errors)
       respond_to do |wants|
         wants.html do
-          flash[:error] = errors.to_s
+          flash[:error] = format_error_messages(errors)
           build_form unless @form.is_a? Hyrax::ChangeSet
           render 'edit', status: :unprocessable_entity
         end

data/app/controllers/hyrax/admin/workflows_controller.rb

@@ -15,9 +15,8 @@ module Hyrax
       add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
       add_breadcrumb t(:'hyrax.admin.sidebar.tasks'), '#'
       add_breadcrumb t(:'hyrax.admin.sidebar.workflow_review'), request.path
-
-      @status_list = actionable_objects.reject(&:published?)
-      @published_list = actionable_objects.select(&:published?)
+      assign_action_objects_params
+      @response = WorkflowResponse.new(actionable_objects.to_a, actionable_objects.total_count, current_page, per_page, under_review?)
     end
 
     private
@@ -30,5 +29,51 @@ module Hyrax
       @actionable_objects ||=
         Hyrax::Workflow::ActionableObjects.new(user: current_user)
     end
+
+    def current_page
+      @page ||= params.fetch('page', 1).to_i
+    end
+
+    def per_page
+      @per_page ||= params.fetch('per_page', 10).to_i
+    end
+
+    def assign_action_objects_params
+      actionable_objects.page = current_page
+      actionable_objects.per_page = per_page
+      actionable_objects.workflow_state_filter = (under_review? ? '!' : '') + deposited_workflow_state_name
+    end
+
+    def under_review?
+      @under_review = params['state'] != 'published'
+    end
+
+    class WorkflowResponse
+      attr_reader :total_count
+      attr_reader :current_page
+      attr_reader :per_page
+      attr_reader :docs
+      attr_reader :under_review
+
+      def initialize(docs, total_count, page, per_page, under_review)
+        @docs = docs
+        @total_count = total_count
+        @per_page = per_page.to_i
+        @current_page = page.to_i
+        @under_review = under_review
+      end
+
+      def total_pages
+        (total_count.to_f / per_page).ceil
+      end
+
+      def limit_value
+        docs.length
+      end
+
+      def viewing_under_review?
+        under_review
+      end
+    end
   end
 end

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -52,7 +52,7 @@ module Hyrax
     def update_document(obj)
       interpret_visiblity_params(obj)
       obj.attributes = work_params(admin_set_id: obj.admin_set_id).except(*visibility_params)
-      obj.date_modified = Time.current.ctime
+      obj.date_modified = TimeService.time_in_utc
 
       InheritPermissionsJob.perform_now(obj)
       VisibilityCopyJob.perform_now(obj)
@@ -60,11 +60,30 @@ module Hyrax
       obj.save
     end
 
+    def valkyrie_update_document(obj)
+      form = form_class.new(obj, current_ability, nil)
+      return unless form.validate(params[form_class.model_class.model_name.param_key])
+
+      cleanup_form_fields form
+
+      result = transactions['change_set.update_work']
+               .with_step_args('work_resource.save_acl' => { permissions_params: form.input_params["permissions"] })
+               .call(form)
+      obj = result.value!
+
+      InheritPermissionsJob.perform_now(obj)
+      VisibilityCopyJob.perform_now(obj)
+    end
+
     def update
       case params["update_type"]
       when "update"
         batch.each do |doc_id|
-          update_document(Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false))
+          if Hyrax.config.use_valkyrie?
+            valkyrie_update_document(Hyrax.query_service.find_by(id: doc_id))
+          else
+            update_document(Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false))
+          end
         end
         flash[:notice] = "Batch update complete"
         after_update
@@ -97,7 +116,7 @@ module Hyrax
     end
 
     def form_class
-      Forms::BatchEditForm
+      Hyrax.config.use_valkyrie? ? Forms::ResourceBatchEditForm : Forms::BatchEditForm
     end
 
     def terms
@@ -105,7 +124,7 @@ module Hyrax
     end
 
     def work_params(extra_params = {})
-      work_params = params[form_class.model_name.param_key] || ActionController::Parameters.new
+      work_params = params[form_class.model_class.model_name.param_key] || ActionController::Parameters.new
       form_class.model_attributes(work_params.merge(extra_params))
     end
 
@@ -135,5 +154,15 @@ module Hyrax
         redirect_to hyrax.dashboard_path
       end
     end
+
+    # Clean up form fields
+    # @param form Hyrax::Froms::ResourceBatchEditForm
+    def cleanup_form_fields(form)
+      form.lease = nil if form.lease && form.lease.fields['lease_expiration_date'].nil?
+      form.embargo = nil if form.embargo && form.embargo.fields['embargo_release_date'].nil?
+      form.fields.keys.each do |k|
+        form.fields[k] = nil if form.fields[k].is_a?(Array) && form.fields[k].blank?
+      end
+    end
   end
 end

data/app/controllers/hyrax/downloads_controller.rb

@@ -3,6 +3,7 @@ module Hyrax
   class DownloadsController < ApplicationController
     include Hydra::Controller::DownloadBehavior
     include Hyrax::LocalFileDownloadsControllerBehavior
+    include Hyrax::ValkyrieDownloadsControllerBehavior
     include Hyrax::WorkflowsHelper # Provides #workflow_restriction?
 
     def self.default_content_path
@@ -12,6 +13,8 @@ module Hyrax
     # Render the 404 page if the file doesn't exist.
     # Otherwise renders the file.
     def show
+      return show_valkyrie if Hyrax.config.use_valkyrie?
+
       case file
       when ActiveFedora::File
         # For original files that are stored in fedora
@@ -39,7 +42,11 @@ module Hyrax
     end
 
     def file_set_parent(file_set_id)
-      file_set = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: file_set_id, use_valkyrie: Hyrax.config.use_valkyrie?)
+      file_set = if defined?(Wings) && Hyrax.metadata_adapter.is_a?(Wings::Valkyrie::MetadataAdapter)
+                   Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: file_set_id, use_valkyrie: Hyrax.config.use_valkyrie?)
+                 else
+                   Hyrax.query_service.find_by(id: file_set_id)
+                 end
       @parent ||=
         case file_set
         when Hyrax::Resource

data/app/controllers/hyrax/file_sets_controller.rb

@@ -171,6 +171,7 @@ module Hyrax
       respond_to do |wants|
         wants.html do
           initialize_edit_form
+          # TODO: return a valuable error message
           flash[:error] = "There was a problem processing your request."
           render 'edit', status: :unprocessable_entity
         end

data/app/forms/hyrax/forms/file_set_edit_form.rb

@@ -6,7 +6,7 @@ module Hyrax::Forms
 
     delegate :depositor, :permissions, :human_readable_type, to: :model
 
-    self.required_fields = [:title, :creator, :license]
+    self.required_fields = [:title, :creator]
 
     self.model_class = ::FileSet
 

data/app/forms/hyrax/forms/permission_template_form.rb

@@ -266,6 +266,8 @@ module Hyrax
       # rubocop:disable Metrics/CyclomaticComplexity
       # rubocop:disable Metrics/PerceivedComplexity
       def permission_template_update_params
+        return attributes unless attributes.key?(:release_varies) || attributes.key?(:release_embargo)
+
         filtered_attributes = attributes.except(:release_varies, :release_embargo)
         # If 'varies' before date option selected, then set release_period='before' and save release_date as-is
         if attributes[:release_varies] == Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_BEFORE_DATE

data/app/forms/hyrax/forms/resource_batch_edit_form.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+module Hyrax
+  module Forms
+    class ResourceBatchEditForm < Hyrax::Forms::ResourceForm
+      include Hyrax::FormFields(:basic_metadata)
+
+      self.required_fields = []
+      self.model_class = Hyrax.primary_work_type
+
+      # Contains a list of titles of all the works in the batch
+      attr_accessor :names
+
+      # @param [Hyrax::Work] model the model backing the form
+      # @param [Ability] current_ability the user authorization model
+      # @param [Array<String>] batch_document_ids a list of document ids in the batch
+      def initialize(model, _current_ability, batch_document_ids)
+        @names = []
+        @batch_document_ids = batch_document_ids
+        if @batch_document_ids.present?
+          super(model.class.new(initialize_combined_fields))
+        else
+          super(model)
+        end
+      end
+
+      def terms
+        [:creator, :contributor, :description,
+         :keyword, :resource_type, :license, :publisher, :date_created,
+         :subject, :language, :identifier, :based_near,
+         :related_url]
+      end
+
+      attr_reader :batch_document_ids
+
+      # Returns a list of parameters we accept from the form
+      # rubocop:disable Metrics/MethodLength
+      def self.build_permitted_params
+        [{ creator: [] },
+         { contributor: [] },
+         { description: [] },
+         { keyword: [] },
+         { resource_type: [] },
+         { license: [] },
+         { publisher: [] },
+         { date_created: [] },
+         { subject: [] },
+         { language: [] },
+         { identifier: [] },
+         { based_near: [] },
+         { related_url: [] },
+         { permissions_attributes: [:type, :name, :access, :id, :_destroy] },
+         :on_behalf_of,
+         :version,
+         :add_works_to_collection,
+         :visibility_during_embargo,
+         :embargo_release_date,
+         :visibility_after_embargo,
+         :visibility_during_lease,
+         :lease_expiration_date,
+         :visibility_after_lease,
+         :visibility,
+         { based_near_attributes: [:id, :_destroy] }]
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      # @param name [Symbol]
+      # @return [Symbol]
+      # @note Added for ActiveModel compatibility.
+      def column_for_attribute(name)
+        name
+      end
+
+      private
+
+      # override this method if you need to initialize more complex RDF assertions (b-nodes)
+      # @return [Hash<String, Array>] the list of unique values per field
+      def initialize_combined_fields
+        # For each of the files in the batch, set the attributes to be the concatenation of all the attributes
+        batch_document_ids.each_with_object({}) do |doc_id, combined_attributes|
+          work = Hyrax.query_service.find_by(id: doc_id)
+          terms.each do |field|
+            combined_attributes[field] ||= []
+            combined_attributes[field] = (combined_attributes[field] + work[field].to_a).uniq
+          end
+          names << work.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Hyrax
     #   +EmbargoesControllerBehavior+.
     class WorkEmbargoForm < Hyrax::ChangeSet
       property :embargo, form: Hyrax::Forms::Embargo, populator: :embargo_populator, prepopulator: :embargo_populator
+      property :embargo_history, virtual: true, prepopulator: proc { |_opts| self.embargo_history = model.embargo&.embargo_history }
       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 }

data/app/forms/hyrax/forms/work_form.rb

@@ -158,7 +158,7 @@ module Hyrax
       # In particular we are discarding any access grant parameters for works that
       # are going into a mediated deposit workflow.
       def self.sanitize_params(form_params)
-        admin_set_id = form_params[:admin_set_id]
+        admin_set_id = Array(form_params[:admin_set_id]).first
         return super if admin_set_id && workflow_for(admin_set_id: admin_set_id).allows_access_grant?
         params_without_permissions = permitted_params.reject { |arg| arg.respond_to?(:key?) && arg.key?(:permissions_attributes) }
         form_params.permit(*params_without_permissions)

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

@@ -11,6 +11,7 @@ module Hyrax
     #   +LeasesControllerBehavior+.
     class WorkLeaseForm < Hyrax::ChangeSet
       property :lease, form: Hyrax::Forms::Lease, populator: :lease_populator, prepopulator: :lease_populator
+      property :lease_history, virtual: true, prepopulator: proc { |_opts| self.lease_history = model.lease&.lease_history }
       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 }

data/app/helpers/hyrax/dashboard_helper_behavior.rb

@@ -6,13 +6,13 @@ module Hyrax
     end
 
     # @param user [User]
-    # @param where [Hash] applied as the where clause when querying the Hyrax::WorkRelation
-    # @return [Integer] number of works matching the where that the user deposited
-    # @see Hyrax::WorkRelation
-    def number_of_works(user = current_user, where: { generic_type_sim: "Work" })
-      field_pairs = field_pairs(user)
-      field_pairs.merge!(where)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs).count
+    # @return [Integer] number of works that the user deposited
+    def number_of_works(user = current_user)
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'Work')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end
@@ -20,7 +20,11 @@ module Hyrax
     # @param user [User]
     # @return [Integer] number of FileSets the user deposited
     def number_of_files(user = current_user)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs(user)).count
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'FileSet')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end
@@ -28,7 +32,11 @@ module Hyrax
     # @param user [User]
     # @return [Integer] number of Collections the user created
     def number_of_collections(user = current_user)
-      Hyrax::SolrQueryService.new.with_field_pairs(field_pairs: field_pairs(user)).count
+      Hyrax::SolrQueryService
+        .new
+        .with_field_pairs(field_pairs: field_pairs(user))
+        .with_generic_type(generic_type: 'Collection')
+        .count
     rescue RSolr::Error::ConnectionRefused
       'n/a'
     end

data/app/helpers/hyrax/membership_helper.rb

@@ -14,18 +14,30 @@ module Hyrax
     #
     # @see app/assets/javascripts/hyrax/relationships.js
     def member_of_collections_json(resource)
+      # this is where we return for dassie
       return resource.member_of_collections_json if
         resource.respond_to?(:member_of_collections_json)
 
       resource = resource.model if resource.respond_to?(:model)
 
-      Hyrax.custom_queries.find_collections_for(resource: resource).map do |collection|
+      existing_collections_array = Hyrax.custom_queries.find_collections_for(resource: resource) + add_collection_from_params
+      existing_collections_array.map do |collection|
         { id: collection.id.to_s,
           label: collection.title.first,
           path: url_for(collection) }
       end.to_json
     end
 
+    def add_collection_from_params
+      # avoid errors when creating Valkyrie resources from Dashboard >> Works
+      return [] if controller.params[:add_works_to_collection].blank?
+
+      # new valkyrie works need the collection from params when depositing directly into an existing collection
+      return [Hyrax.metadata_adapter.query_service.find_by(id: Valkyrie::ID.new(controller.params[:add_works_to_collection]))] if Hyrax.config.use_valkyrie?
+
+      [::Collection.find(@controller.params[:add_works_to_collection])]
+    end
+
     ##
     # @param resource [#work_members_json]
     #

data/app/helpers/hyrax/work_form_helper.rb

@@ -97,112 +97,5 @@ module Hyrax
         hash[presenter.title_or_label] = presenter.id
       end
     end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def in_works_ids_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:in_works_ids]
-      else
-        form.model.errors[:in_works_ids]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def ordered_member_ids_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:ordered_member_ids]
-      else
-        form.model.errors[:ordered_member_ids]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility]
-      else
-        form.model.errors[:visibility]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def embargo_release_date_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:embargo_release_date]
-      else
-        form.model.errors[:embargo_release_date]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_after_embargo_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility_after_embargo]
-      else
-        form.model.errors[:visibility_after_embargo]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def lease_expiration_date_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:lease_expiration_date_errors]
-      else
-        form.model.errors[:lease_expiration_date_errors]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def visibility_after_lease_errors_for(form:)
-      case form
-      when Hyrax::ChangeSet
-        form.errors[:visibility_after_lease]
-      else
-        form.model.errors[:visibility_after_lease]
-      end
-    end
-
-    ##
-    # This helper retrieves errors based on form type.
-    #
-    # @param form [Hyrax::Forms::WorkForm] or Hyrax::ChangeSet
-    # @return [String] specific error message
-    def full_collections_errors(form:)
-      form.full_error(:collections) || form.full_error(:member_of_collection_ids)
-    end
   end
 end

data/app/indexers/hyrax/file_set_indexer.rb

@@ -30,6 +30,7 @@ module Hyrax
         solr_doc['original_checksum_tesim'] = object.original_checksum
         solr_doc['alpha_channels_ssi']      = object.alpha_channels
         solr_doc['original_file_id_ssi']    = original_file_id
+        solr_doc['extracted_text_id_ssi']   = extracted_text_id
         solr_doc['generic_type_si'] = 'FileSet'
       end
     end
@@ -46,6 +47,11 @@ module Hyrax
       Hyrax::VersioningService.versioned_file_id object.original_file
     end
 
+    def extracted_text_id
+      return unless object.extracted_text
+      Hyrax::VersioningService.versioned_file_id object.extracted_text
+    end
+
     def file_format
       if object.mime_type.present? && object.format_label.present?
         "#{object.mime_type.split('/').last} (#{object.format_label.join(', ')})"