hyrax 3.2.0 → 3.4.1

data/app/controllers/hyrax/batch_edits_controller.rb

@@ -39,8 +39,11 @@ module Hyrax
 
     def destroy_collection
       batch.each do |doc_id|
-        obj = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: doc_id, use_valkyrie: false)
-        obj.destroy
+        resource = Hyrax.query_service.find_by(id: Valkyrie::ID.new(doc_id))
+        transactions['collection_resource.destroy']
+          .with_step_args('collection_resource.delete' => { user: current_user })
+          .call(resource)
+          .value!
       end
       flash[:notice] = "Batch delete complete"
       after_destroy_collection
@@ -83,7 +86,13 @@ module Hyrax
     end
 
     def destroy_batch
-      batch.each { |id| Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: id, use_valkyrie: false).destroy }
+      batch.each do |id|
+        resource = Hyrax.query_service.find_by(id: Valkyrie::ID.new(id))
+        transactions['work_resource.destroy']
+          .with_step_args('work_resource.delete' => { user: current_user })
+          .call(resource)
+          .value!
+      end
       after_update
     end
 

data/app/controllers/hyrax/batch_uploads_controller.rb

@@ -44,6 +44,10 @@ module Hyrax
     end
 
     def build_form
+      add_breadcrumb t('hyrax.controls.home'), root_path
+      add_breadcrumb t('hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+      add_breadcrumb t('hyrax.admin.sidebar.works'), hyrax.my_works_path
+      add_breadcrumb t('hyrax.batch_uploads.new.breadcrumb'), request.path
       super
       @form.payload_concern = params[:payload_concern]
     end

data/app/controllers/hyrax/citations_controller.rb

@@ -2,8 +2,8 @@
 module Hyrax
   class CitationsController < ApplicationController
     include WorksControllerBehavior
+    include DenyAccessOverrideBehavior
     include Breadcrumbs
-    include SingularSubresourceController
 
     # Overrides decide_layout from WorksControllerBehavior
     with_themed_layout '1_column'

data/app/controllers/hyrax/collections_controller.rb

@@ -4,10 +4,13 @@ module Hyrax
     include CollectionsControllerBehavior
     include BreadcrumbsForCollections
     with_themed_layout :decide_layout
-    load_and_authorize_resource except: [:index, :create],
+    load_and_authorize_resource except: [:index],
                                 instance_name: :collection,
                                 class: Hyrax.config.collection_model
 
+    skip_load_resource only: :create if
+      Hyrax.config.collection_class < ActiveFedora::Base
+
     # Renders a JSON response with a list of files in this collection
     # This is used by the edit form to populate the thumbnail_id dropdown
     def files

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -43,13 +43,10 @@ module Hyrax
       # The search builder to find the collections' members
       self.membership_service_class = Collections::CollectionMemberSearchService
 
-      load_and_authorize_resource except: [:index],
+      load_and_authorize_resource except: [:index, :create],
                                   instance_name: :collection,
                                   class: Hyrax.config.collection_model
 
-      skip_load_resource only: :create if
-        Hyrax.config.collection_class < ActiveFedora::Base
-
       def deny_collection_access(exception)
         if exception.action == :edit
           redirect_to(url_for(action: 'show'), alert: 'You do not have sufficient privileges to edit this document')
@@ -83,14 +80,17 @@ module Hyrax
 
       def edit
         form
+        collection_type
       end
 
       def after_create
-        form
-        set_default_permissions
-        # if we are creating the new collection as a subcollection (via the nested collections controller),
-        # we pass the parent_id through a hidden field in the form and link the two after the create.
-        link_parent_collection(params[:parent_id]) unless params[:parent_id].nil?
+        if @collection.is_a?(ActiveFedora::Base)
+          form
+          set_default_permissions
+          # if we are creating the new collection as a subcollection (via the nested collections controller),
+          # we pass the parent_id through a hidden field in the form and link the two after the create.
+          link_parent_collection(params[:parent_id]) unless params[:parent_id].nil?
+        end
         respond_to do |format|
           Hyrax::SolrService.commit
           format.html { redirect_to edit_dashboard_collection_path(@collection), notice: t('hyrax.dashboard.my.action.collection_create_success') }
@@ -107,12 +107,13 @@ module Hyrax
       end
 
       def create
-        return valkyrie_create if @collection.is_a?(Valkyrie::Resource)
         # Manual load and authorize necessary because Cancan will pass in all
         # form attributes. When `permissions_attributes` are present the
         # collection is saved without a value for `has_model.`
         @collection = Hyrax.config.collection_class.new
         authorize! :create, @collection
+        return valkyrie_create if @collection.is_a?(Valkyrie::Resource)
+
         # Coming from the UI, a collection type gid should always be present.  Coming from the API, if a collection type gid is not specified,
         # use the default collection type (provides backward compatibility with versions < Hyrax 2.1.0)
         @collection.collection_type_gid = params[:collection_type_gid].presence || default_collection_type.to_global_id
@@ -166,10 +167,10 @@ module Hyrax
         # leaving id to avoid changing the method's parameters prior to release
         respond_to do |format|
           format.html do
-            redirect_to my_collections_path,
+            redirect_to hyrax.my_collections_path,
                         notice: t('hyrax.dashboard.my.action.collection_delete_success')
           end
-          format.json { head :no_content, location: my_collections_path }
+          format.json { head :no_content, location: hyrax.my_collections_path }
         end
       end
 
@@ -186,8 +187,7 @@ module Hyrax
       def destroy
         case @collection
         when Valkyrie::Resource
-          Hyrax.persister.delete(resource: @collection)
-          after_destroy(params[:id])
+          valkyrie_destroy
         else
           if @collection.destroy
             after_destroy(params[:id])
@@ -220,11 +220,13 @@ module Hyrax
           @collection = transactions['change_set.create_collection']
                         .with_step_args(
                           'change_set.set_user_as_depositor' => { user: current_user },
+                          'change_set.add_to_collections' => { collection_ids: Array(params[:parent_id]) },
                           'collection_resource.apply_collection_type_permissions' => { user: current_user }
                         )
                         .call(form)
                         .value_or { return after_create_error }
 
+        after_create
         add_members_to_collection unless batch.empty?
         @collection
       end
@@ -237,10 +239,22 @@ module Hyrax
         after_update
       end
 
+      def valkyrie_destroy
+        if transactions['collection_resource.destroy'].call(@collection).success?
+          after_destroy(params[:id])
+        else
+          after_destroy_error(params[:id])
+        end
+      end
+
       def default_collection_type
         Hyrax::CollectionType.find_or_create_default_collection_type
       end
 
+      def default_collection_type_gid
+        default_collection_type.to_global_id.to_s
+      end
+
       def collection_type
         @collection_type ||= CollectionType.find_by_gid!(collection.collection_type_gid)
       end
@@ -324,7 +338,10 @@ module Hyrax
       def process_logo_records(uploaded_file_ids)
         public_files = []
         uploaded_file_ids.each_with_index do |ufi, i|
-          if ufi.include?('public')
+          # If the user has chosen a new logo, the ufi will be an integer
+          # If the logo was previously chosen, the ufi will be a path
+          # If it is a path, update the rec, else create a new rec
+          if !ufi.match(/\D/).nil?
             update_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
             public_files << ufi
           else # brand new one, insert in the database
@@ -390,7 +407,8 @@ module Hyrax
           form_class.model_attributes(params[:collection])
         else
           params.permit(collection: {})[:collection]
-                .merge(params.permit(:collection_type_gid))
+                .merge(params.permit(:collection_type_gid)
+                             .with_defaults(collection_type_gid: default_collection_type_gid))
                 .merge(member_of_collection_ids: Array(params[:parent_id]))
         end
       end

data/app/controllers/hyrax/dashboard_controller.rb

@@ -6,6 +6,7 @@ module Hyrax
     with_themed_layout 'dashboard'
     before_action :authenticate_user!
     before_action :build_breadcrumbs, only: [:show]
+    before_action :set_date_range
 
     ##
     # @!attribute [rw] sidebar_partials
@@ -26,5 +27,12 @@ module Hyrax
         render 'show_user'
       end
     end
+
+    private
+
+    def set_date_range
+      @start_date = params[:start_date] || Time.zone.today - 1.month
+      @end_date = params[:end_date] || Time.zone.today + 1.day
+    end
   end
 end

data/app/controllers/hyrax/stats_controller.rb

@@ -7,7 +7,9 @@ module Hyrax
     before_action :build_breadcrumbs, only: [:work, :file]
 
     def work
-      @stats = Hyrax::WorkUsage.new(params[:id])
+      @document = ::SolrDocument.find(params[:id])
+      @pageviews = Hyrax::Analytics.daily_events_for_id(@document.id, 'work-view')
+      @downloads = Hyrax::Analytics.daily_events_for_id(@document.id, 'file-set-in-work-download')
     end
 
     def file

data/app/forms/hyrax/forms/administrative_set_form.rb

@@ -6,6 +6,20 @@ module Hyrax
     # @api public
     # @see https://github.com/samvera/valkyrie/wiki/ChangeSets-and-Dirty-Tracking
     class AdministrativeSetForm < Valkyrie::ChangeSet
+      ##
+      # @api private
+      AdminSetMembersPopulator = lambda do |_options|
+        self.member_ids =
+          if model.new_record
+            []
+          else
+            Hyrax
+              .query_service
+              .find_inverse_references_by(property: :admin_set_id, resource: model)
+              .map(&:id)
+          end
+      end
+
       property :title, required: true, primary: true
       property :description, primary: true
 
@@ -13,7 +27,11 @@ module Hyrax
       property :date_modified, readable: false
       property :date_uploaded, readable: false
 
-      property :depositor
+      property :creator
+
+      validates :title, presence: true
+
+      property :member_ids, virtual: true, default: [], prepopulator: AdminSetMembersPopulator
 
       class << self
         def model_class

data/app/forms/hyrax/forms/batch_edit_form.rb

@@ -65,7 +65,7 @@ module Hyrax
       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 = ActiveFedora::Base.find(doc_id)
+          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

data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb

@@ -26,11 +26,11 @@ module Hyrax
                        context:,
                        query_service: default_query_service,
                        persistence_service: default_persistence_service)
-          self.parent = parent || (parent_id.present? && Hyrax.config.collection_class.find(parent_id))
-          self.child = child || (child_id.present? && Hyrax.config.collection_class.find(child_id))
           self.context = context
           self.query_service = query_service
           self.persistence_service = persistence_service
+          self.parent = parent || (parent_id.present? && find_parent(parent_id))
+          self.child = child || (child_id.present? && find_child(child_id))
         end # rubocop:enable Metrics/ParameterLists
 
         attr_accessor :parent, :child
@@ -83,7 +83,7 @@ module Hyrax
         # rerouting to new_dashboard_collection_path to add the new collection as
         # a child. Since we don't yet have a child collection, the valid? option can't be used here.
         def validate_add
-          if parent.try(:nestable?)
+          if nestable?(parent)
             nesting_within_maximum_depth
           else
             errors.add(:parent, :cannot_have_child_nested)
@@ -116,15 +116,30 @@ module Hyrax
         end
 
         def parent_and_child_can_be_nested
-          if parent.try(:nestable?) && child.try(:nestable?)
+          if nestable?(parent) && nestable?(child)
             return true if query_service.parent_and_child_can_nest?(parent: parent, child: child, scope: context)
             errors.add(:parent, :cannot_have_child_nested)
             errors.add(:child, :cannot_nest_in_parent)
           else
-            errors.add(:parent, :is_not_nestable) unless parent.try(:nestable?)
-            errors.add(:child, :is_not_nestable) unless child.try(:nestable?)
+            errors.add(:parent, :is_not_nestable) unless nestable?(parent)
+            errors.add(:child, :is_not_nestable) unless nestable?(child)
           end
         end
+
+        def find_parent(parent_id)
+          Hyrax.query_service.find_by(id: parent_id)
+        end
+
+        def find_child(child_id)
+          Hyrax.query_service.find_by(id: child_id)
+        end
+
+        def 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?
+        end
       end
     end
   end

data/app/forms/hyrax/forms/pcdm_collection_form.rb

@@ -14,9 +14,13 @@ module Hyrax
 
       property :depositor, required: true
       property :collection_type_gid, required: true
+      property :visibility, default: VisibilityIntention::PRIVATE
 
       property :member_of_collection_ids, default: [], type: Valkyrie::Types::Array
 
+      validates :title, presence: true
+      validates :collection_type_gid, presence: true
+
       class << self
         def model_class
           Hyrax::PcdmCollection

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

@@ -7,16 +7,12 @@ module Hyrax
       self.model_class = PermissionTemplate
       self.terms = []
       delegate :access_grants, :access_grants_attributes=, :release_date, :release_period, :visibility, to: :model
-      delegate :available_workflows, :active_workflow, :source_model, to: :model
-
-      # @return [#to_s] the primary key of the associated admin_set or collection
-      # def source_id (because you might come looking for this method)
-      delegate :id, to: :source_model, prefix: :source
+      delegate :available_workflows, :active_workflow, :source, :source_id, to: :model
 
       ##
-      # @deprecated  use PermissionTemplate#reset_access_controls instead.
+      # @deprecated  use PermissionTemplate#reset_access_controls_for instead.
       def reset_access_controls!
-        Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls instead.")
+        Deprecation.warn("reset_access_controls! is deprecated; use PermissionTemplate#reset_access_controls_for instead.")
         source_model.reset_access_controls!
       end
 
@@ -73,8 +69,8 @@ module Hyrax
       # Copy this access to the permissions of the Admin Set or Collection and to
       # the WorkflowResponsibilities of the active workflow if this is an Admin Set
       def update_access(remove_agent: false)
-        source_model.reset_access_controls!
-        update_workflow_responsibilities(remove_agent: remove_agent) if source_model.is_a?(AdminSet)
+        model.reset_access_controls_for(collection: source)
+        update_workflow_responsibilities(remove_agent: remove_agent) if source.is_a?(Hyrax::AdministrativeSet)
       end
 
       # This method is used to revoke access to a Collection or Admin Set and its workflows
@@ -85,6 +81,18 @@ module Hyrax
         update_access(remove_agent: true)
       end
 
+      ##
+      # A bit of an analogue for a `belongs_to :source_model` as it crosses from Fedora to the DB
+      # @return [AdminSet, ::Collection]
+      # @raise [Hyrax::ObjectNotFoundError] when neither an AdminSet or Collection is found
+      # @note This method will eventually be replaced by #source which returns a Hyrax::Resource
+      #   object.  Many methods are equally able to process both Hyrax::Resource and
+      #   ActiveFedora::Base.  Only call this method if you need the ActiveFedora::Base object.
+      # @see #source
+      def source_model # rubocop:disable Rails/Delegate
+        model.source_model
+      end
+
       private
 
       # @return [String]

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

@@ -33,7 +33,7 @@ module Hyrax
     class ResourceForm < Hyrax::ChangeSet # rubocop:disable Metrics/ClassLength
       ##
       # @api private
-      InWorksPopulator = lambda do |_options|
+      InWorksPrepopulator = lambda do |_options|
         self.in_works_ids =
           if persisted?
             Hyrax.query_service
@@ -52,7 +52,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.
-      LockKeyPopulator = lambda do |_options|
+      LockKeyPrepopulator = lambda 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 " \
@@ -95,10 +95,12 @@ module Hyrax
       property :visibility_during_lease, virtual: true, prepopulator: ->(_opts) { self.visibility_during_lease = model.lease&.visibility_during_lease }
 
       # pcdm relationships
-      property :admin_set_id, prepopulator: ->(_opts) { self.admin_set_id = AdminSet::DEFAULT_ID }
-      property :in_works_ids, virtual: true, prepopulator: InWorksPopulator
+      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
+      validates_with CollectionMembershipValidator
 
       property :representative_id, type: Valkyrie::Types::String
       property :thumbnail_id, type: Valkyrie::Types::String
@@ -112,7 +114,7 @@ module Hyrax
       # the model is disabled
       #
       # @see https://github.com/samvera/valkyrie/wiki/Optimistic-Locking
-      property :version, virtual: true, prepopulator: LockKeyPopulator
+      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
@@ -131,6 +133,8 @@ module Hyrax
           "#{resource.class.name}Form".constantize.new(resource)
         rescue NameError => _err
           case resource
+          when Hyrax::AdministrativeSet
+            Hyrax::Forms::AdministrativeSetForm.new(resource)
           when Hyrax::FileSet
             Hyrax::Forms::FileSetForm.new(resource)
           when Hyrax::PcdmCollection

data/app/helpers/hyrax/collections_helper.rb

@@ -191,6 +191,20 @@ module Hyrax
       CollectionType.find_or_create_default_collection_type.title
     end
 
+    ##
+    # @param collection [Object]
+    #
+    # @return [PermissionTemplateForm]
+    def collection_permission_template_form_for(form:)
+      case form
+      when Valkyrie::ChangeSet
+        template_model = Hyrax::PermissionTemplate.find_or_create_by(source_id: form.id.to_s)
+        Hyrax::Forms::PermissionTemplateForm.new(template_model)
+      else
+        form.permission_template
+      end
+    end
+
     private
 
     # add hidden fields to a form for performing an action on a single document on a collection

data/app/helpers/hyrax/membership_helper.rb

@@ -41,7 +41,7 @@ module Hyrax
       Hyrax.custom_queries.find_child_works(resource: resource).map do |member|
         { id: member.id.to_s,
           label: member.title.first,
-          path: url_for(member) }
+          path: main_app.url_for([member, { only_path: true }]) }
       end.to_json
     end
   end

data/app/helpers/hyrax/trophy_helper.rb

@@ -15,7 +15,7 @@ module Hyrax
       args[:data]['remove-text'] = args[:remove_text]
 
       args[:data][:url] = hyrax.trophy_work_path(id)
-      link_to '#', class: args[:class], data: args[:data] do
+      link_to '#', id: 'action-highlight-work', class: args[:class], data: args[:data] do
         yield(text)
       end
     end

data/app/helpers/hyrax/url_helper.rb

@@ -3,7 +3,7 @@ module Hyrax
   module UrlHelper
     # generated models get registered as curation concerns and need a
     # track_model_path to render Blacklight-related views
-    (['FileSet', 'Collection'] + Hyrax.config.registered_curation_concern_types).each do |concern|
+    (['FileSet', 'Collection', 'Hyrax::AdministrativeSet'] + Hyrax.config.registered_curation_concern_types).each do |concern|
       model = concern.safe_constantize
       model_name = model.respond_to?(:model_name) && model.model_name
       next unless model_name

data/app/indexers/hyrax/administrative_set_indexer.rb

@@ -4,14 +4,20 @@ module Hyrax
   ##
   # Indexes Hyrax::AdministrativeSet objects
   class AdministrativeSetIndexer < Hyrax::ValkyrieIndexer
+    include Hyrax::ResourceIndexer
+    include Hyrax::PermissionIndexer
+    include Hyrax::VisibilityIndexer
     include Hyrax::Indexer(:core_metadata)
 
     def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
       super.tap do |solr_doc|
-        solr_doc[:generic_type_si]         = 'Admin Set'
+        solr_doc[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
         solr_doc[:alternative_title_tesim] = resource.alternative_title
-        solr_doc[:creator_ssim]            = resource.creator
+        solr_doc[:creator_ssim]            = [resource.creator]
+        solr_doc[:creator_tesim]           = [resource.creator]
         solr_doc[:description_tesim]       = resource.description
+        solr_doc[:generic_type_sim]        = ['Admin Set']
+        solr_doc[:thumbnail_path_ss]       = Hyrax::CollectionThumbnailPathService.call(resource)
       end
     end
   end

data/app/indexers/hyrax/deep_indexing_service.rb

@@ -41,7 +41,7 @@ module Hyrax
 
     def fetch_with_persistence(resource)
       old_label = resource.rdf_label.first
-      return unless old_label == resource.rdf_subject.to_s || old_label.nil?
+      return unless old_label == resource.rdf_subject.to_s
       fetch_value(resource)
       return if old_label == resource.rdf_label.first || resource.rdf_label.first == resource.rdf_subject.to_s
       resource.persist! # Stores the fetched values into our marmotta triplestore

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['generic_type_si'] = 'FileSet'
       end
     end
 

data/app/indexers/hyrax/pcdm_collection_indexer.rb

@@ -7,14 +7,16 @@ module Hyrax
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
+    include Hyrax::ThumbnailIndexer
     include Hyrax::Indexer(:core_metadata)
     include Hyrax::Indexer(:basic_metadata)
 
+    self.thumbnail_path_service = CollectionThumbnailPathService
+
     def to_solr
       super.tap do |index_document|
         index_document[Hyrax.config.collection_type_index_field.to_sym] = Array(resource.try(:collection_type_gid)&.to_s)
         index_document[:generic_type_sim] = ['Collection']
-        index_document[:thumbnail_path_ss] = Hyrax::CollectionThumbnailPathService.call(resource)
         index_document[:depositor_ssim] = [resource.depositor]
         index_document[:depositor_tesim] = [resource.depositor]
       end

data/app/indexers/hyrax/thumbnail_indexer.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Hyrax
+  module ThumbnailIndexer
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :thumbnail_path_service
+      self.thumbnail_path_service = ThumbnailPathService
+      class_attribute :thumbnail_field
+      self.thumbnail_field = :thumbnail_path_ss
+    end
+
+    # Adds thumbnail indexing to the solr document of a valkyrie resource
+    def to_solr
+      super.tap do |solr_doc|
+        index_thumbnails(solr_doc)
+      end
+    end
+
+    # Write the thumbnail paths into the solr_document
+    # @param [Hash] solr_document the solr document to add the field to
+    def index_thumbnails(solr_document)
+      solr_document[thumbnail_field] = thumbnail_path.to_s
+    end
+
+    # Returns the value for the thumbnail path to put into the solr document
+    def thumbnail_path
+      self.class.thumbnail_path_service.call(resource)
+    end
+  end
+end

data/app/indexers/hyrax/valkyrie_file_set_indexer.rb

@@ -7,20 +7,20 @@ module Hyrax
     include Hyrax::ResourceIndexer
     include Hyrax::PermissionIndexer
     include Hyrax::VisibilityIndexer
+    include Hyrax::ThumbnailIndexer
     include Hyrax::Indexer(:core_metadata)
     include Hyrax::Indexer(:basic_metadata)
 
-    # include Hyrax::IndexesThumbnails # TODO: Is there a Valkyrie version of a thumbnail indexer?
-
     def to_solr # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       super.tap do |solr_doc| # rubocop:disable Metrics/BlockLength
         solr_doc['generic_type_si'] = 'FileSet'
 
         # Metadata from the FileSet
-        solr_doc['file_ids_ssim']         = resource.file_ids&.map(&:to_s)
-        solr_doc['original_file_id_ssi']  = resource.original_file_id.to_s
-        solr_doc['thumbnail_id_ssi']      = resource.thumbnail_id.to_s
-        solr_doc['extracted_text_id_ssi'] = resource.extracted_text_id.to_s
+        solr_doc['file_ids_ssim']                = resource.file_ids&.map(&:to_s)
+        solr_doc['original_file_id_ssi']         = resource.original_file_id.to_s
+        solr_doc['extracted_text_id_ssi']        = resource.extracted_text_id.to_s
+        solr_doc['hasRelatedMediaFragment_ssim'] = resource.representative_id.to_s
+        solr_doc['hasRelatedImage_ssim']         = resource.thumbnail_id.to_s
 
         # Add in metadata from the original file.
         file_metadata = original_file
@@ -37,7 +37,7 @@ module Hyrax
         solr_doc['file_format_tesim']       = file_format(file_metadata)
         solr_doc['file_format_sim']         = file_format(file_metadata)
         solr_doc['file_size_lts']           = file_metadata.size[0]
-        solr_doc['type_tesim']              = file_metadata.type if file_metadata.type.present?
+        solr_doc['type_tesim']              = file_metadata.type.map(&:to_s) if file_metadata.type.present?
 
         # attributes set by fits
         solr_doc['format_label_tesim']      = file_metadata.format_label if file_metadata.format_label.present?

data/app/indexers/hyrax/valkyrie_indexer.rb

@@ -64,14 +64,16 @@ module Hyrax
 
     ##
     # @api public
-    # @return [Hash<Symbol, Object>]
+    # @return [HashWithIndifferentAccess<Symbol, Object>]
     def to_solr
       {
         "id": resource.id.to_s,
         "date_uploaded_dtsi": resource.created_at,
         "date_modified_dtsi": resource.updated_at,
+        "system_create_dtsi": resource.created_at,
+        "system_modified_dtsi": resource.updated_at,
         "has_model_ssim": resource.internal_resource
-      }
+      }.with_indifferent_access
     end
 
     ##