hyrax 3.4.1 → 3.4.2

data/app/models/hyrax/file_metadata.rb

@@ -1,6 +1,25 @@
 # frozen_string_literal: true
 
 module Hyrax
+  ##
+  # Casts a resource to an associated FileMetadata
+  #
+  # @param [Valkyrie::StorageAdapter::File] file
+  #
+  # @return [Hyrax::FileMetadata]
+  # @raise [ArgumentError]
+  def self.FileMetadata(file)
+    raise(ArgumentError, "Expected a Valkyrie::StorageAdapter::File; got #{file.class}: #{file}") if
+      file.is_a?(Valkyrie::Resource)
+
+    Hyrax.custom_queries.find_file_metadata_by(id: file.id)
+  rescue Hyrax::ObjectNotFoundError, Ldp::BadRequest
+    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])
+  end
+
   class FileMetadata < Valkyrie::Resource
     # Include mime-types for Hydra Derivatives mime-type checking. We may want
     # to move this logic someday.
@@ -39,7 +58,7 @@ module Hyrax
     end
 
     attribute :file_identifier, Valkyrie::Types::ID # id of the file stored by the storage adapter
-    attribute :alternate_ids, Valkyrie::Types::Set.of(Valkyrie::Types::ID) # id of the Hydra::PCDM::File which holds metadata and the file in ActiveFedora
+    attribute :alternate_ids, Valkyrie::Types::Set.of(Valkyrie::Types::ID) # id of the file, populated for queryability
     attribute :file_set_id, ::Valkyrie::Types::ID # id of parent file set resource
 
     # all remaining attributes are on AF::File metadata_node unless otherwise noted
@@ -107,7 +126,9 @@ module Hyrax
     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)
@@ -155,8 +176,17 @@ module Hyrax
       ''
     end
 
+    ##
+    # @return [Valkyrie::StorageAdapter::File]
+    #
+    # @raise [Valkyrie::StorageAdapter::AdapterNotFoundError] if no adapter
+    #   could be found matching the file_identifier's scheme
+    # @raise [Valkyrie::StorageAdapter::FileNotFound] when the file can't
+    #   be found in the registered adapter
     def file
-      Hyrax.storage_adapter.find_by(id: file_identifier)
+      Valkyrie::StorageAdapter
+        .adapter_for(id: file_identifier)
+        .find_by(id: file_identifier)
     end
   end
 end

data/app/models/hyrax/file_set.rb

@@ -34,9 +34,7 @@ module Hyrax
     include Hyrax::Schema(:basic_metadata)
 
     def self.model_name(name_class: Hyrax::Name)
-      @_model_name ||= begin
-        name_class.new(self, nil, 'FileSet')
-      end
+      @_model_name ||= name_class.new(self, nil, 'FileSet')
     end
 
     class_attribute :characterization_proxy

data/app/models/hyrax/group.rb

@@ -7,12 +7,31 @@ module Hyrax
       DEFAULT_NAME_PREFIX
     end
 
+    ##
+    # @return [Hyrax::Group]
+    def self.from_agent_key(key)
+      new(key.delete_prefix(name_prefix))
+    end
+
     def initialize(name)
       @name = name
     end
 
     attr_reader :name
 
+    ##
+    # @return [Boolean]
+    def ==(other)
+      other.class == self.class && other.name == name
+    end
+
+    ##
+    # @return [String] a local identifier for this group; for use (e.g.) in ACL
+    #   data
+    def agent_key
+      self.class.name_prefix + name
+    end
+
     def to_sipity_agent
       sipity_agent || create_sipity_agent!
     end

data/app/models/hyrax/pcdm_collection.rb

@@ -41,7 +41,6 @@ module Hyrax
   #
   class PcdmCollection < Hyrax::Resource
     include Hyrax::Schema(:core_metadata)
-    include Hyrax::Schema(:basic_metadata)
 
     attribute :collection_type_gid, Valkyrie::Types::String
     attribute :member_ids, Valkyrie::Types::Array.of(Valkyrie::Types::ID).meta(ordered: true)

data/app/models/job_io_wrapper.rb

@@ -94,7 +94,7 @@ class JobIoWrapper < ApplicationRecord
 
   def extracted_original_name
     eon = uploaded_file.uploader.filename if uploaded_file
-    eon ||= File.basename(path) if path.present? # note: uploader.filename is `nil` with uncached remote files (e.g. AWSFile)
+    eon ||= File.basename(path) if path.present? # NOTE: uploader.filename is `nil` with uncached remote files (e.g. AWSFile)
     eon
   end
 

data/app/presenters/hyrax/member_presenter_factory.rb

@@ -47,13 +47,11 @@ module Hyrax
     # in order.
     # Arbitrarily maxed at 10 thousand; had to specify rows due to solr's default of 10
     def file_set_ids
-      @file_set_ids ||= begin
-                          Hyrax::SolrService.query("{!field f=has_model_ssim}FileSet",
+      @file_set_ids ||= Hyrax::SolrService.query("{!field f=has_model_ssim}FileSet",
                                                    rows: 10_000,
                                                    fl: Hyrax.config.id_field,
                                                    fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
-                                            .flat_map { |x| x.fetch(Hyrax.config.id_field, []) }
-                        end
+                                          .flat_map { |x| x.fetch(Hyrax.config.id_field, []) }
     end
 
     def presenter_factory_arguments

data/app/presenters/hyrax/work_show_presenter.rb

@@ -154,9 +154,9 @@ module Hyrax
     def grouped_presenters(filtered_by: nil, except: nil)
       # TODO: we probably need to retain collection_presenters (as parent_presenters)
       #       and join this with member_of_collection_presenters
-      grouped = member_of_collection_presenters.group_by(&:model_name).transform_keys { |key| key.to_s.underscore }
-      grouped.select! { |obj| obj.downcase == filtered_by } unless filtered_by.nil?
-      grouped.except!(*except) unless except.nil?
+      grouped = member_of_collection_presenters.group_by(&:model_name).transform_keys(&:human)
+      grouped.select! { |obj| obj.casecmp(filtered_by).zero? } unless filtered_by.nil?
+      grouped.reject! { |obj| except.map(&:downcase).include? obj.downcase } unless except.nil?
       grouped
     end
 

data/app/services/hyrax/access_control_list.rb

@@ -200,13 +200,14 @@ module Hyrax
 
       private
 
+      ##
+      # Returns the identifier used by ACLs to identify agents.
+      #
+      # This defaults to the `:agent_key`, but if that method doesn’t exist,
+      # `:user_key` will be used as a fallback.
       def id_for(agent:)
-        case agent
-        when Hyrax::Group
-          "#{Hyrax::Group.name_prefix}#{agent.name}"
-        else
-          agent.user_key.to_s
-        end
+        key = agent.try(:agent_key) || agent.user_key
+        key.to_s
       end
     end
 

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

@@ -60,7 +60,7 @@ module Hyrax
           object = ActiveFedora::Base.find(id)
           parent_ids = object.try(:member_of_collection_ids) || []
 
-          # note: we do not yield when the object has parents. Calling the nested indexer for the
+          # NOTE: we do not yield when the object has parents. Calling the nested indexer for the
           # top id will reindex all descendants as well.
           if object.try(:use_nested_reindexing?)
             yield(id, parent_ids) if parent_ids.empty?
@@ -119,11 +119,11 @@ module Hyrax
       # @yield Samvera::NestingIndexer::Documents::IndexDocument
       #
       # @return [void]
-      def self.each_child_document_of(document:, extent:, &block)
+      def self.each_child_document_of(document:, extent:, &block) # rubocop:disable Lint/UnusedMethodArgument
         raw_child_solr_documents_of(parent_document: document).each do |solr_document|
           child_document = coerce_solr_document_to_index_document(original_solr_document: solr_document, id: solr_document.fetch('id'))
           # during light reindexing, we want to reindex the child only if fields aren't already there
-          block.call(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
+          yield(child_document) if full_reindex?(extent: extent) || child_document.pathnames.empty?
         end
       end
 

data/app/services/hyrax/characterization/valkyrie_characterization_service.rb

@@ -91,11 +91,9 @@ class Hyrax::Characterization::ValkyrieCharacterizationService
     h = {}
 
     doc.class.terminology.terms.each_pair do |key, _target|
-      begin
-        h[key] = doc.public_send(key)
-      rescue NoMethodError
-        next
-      end
+      h[key] = doc.public_send(key)
+    rescue NoMethodError
+      next
     end
 
     h.compact

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

@@ -83,11 +83,9 @@ module Hyrax
         def add_members(collection_id:, new_members:, user:)
           messages = []
           new_members.map do |new_member|
-            begin
-              add_member(collection_id: collection_id, new_member: new_member, user: user)
-            rescue Hyrax::SingleMembershipError => err
-              messages += [err.message]
-            end
+            add_member(collection_id: collection_id, new_member: new_member, user: user)
+          rescue Hyrax::SingleMembershipError => err
+            messages += [err.message]
           end
           raise Hyrax::SingleMembershipError, messages if messages.present?
         end

data/app/services/hyrax/listeners/file_metadata_listener.rb

@@ -5,6 +5,17 @@ module Hyrax
     ##
     # Listens for events related to {Hyrax::FileMetadata}
     class FileMetadataListener
+      ##
+      # Called when 'file.characterized' event is published;
+      # allows post-characterization handling, like derivatives generation.
+      #
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_characterized(event)
+        CreateDerivativesJob
+          .perform_later(event[:file_set], event[:file_id], event[:path_hint])
+      end
+
       ##
       # Called when 'file.metadata.updated' event is published; reindexes a
       # {Hyrax::FileSet} when a file claiming to be its `pcdm_use:OriginalFile`

data/app/services/hyrax/listeners/member_cleanup_listener.rb

@@ -13,15 +13,13 @@ module Hyrax
         return if event[:object].is_a?(ActiveFedora::Base) # handled by legacy code
 
         Hyrax.custom_queries.find_child_file_sets(resource: event[:object]).each do |file_set|
-          begin
-            Hyrax.persister.delete(resource: file_set)
-            Hyrax.publisher
-                 .publish('object.deleted', object: file_set, id: file_set.id, user: event[:user])
-          rescue StandardError # we don't uncaught errors looping filesets
-            Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
-                              "during cleanup for resource: #{event[:object]}. " \
-                              'This member may now be orphaned.'
-          end
+          Hyrax.persister.delete(resource: file_set)
+          Hyrax.publisher
+               .publish('object.deleted', object: file_set, id: file_set.id, user: event[:user])
+        rescue StandardError # we don't uncaught errors looping filesets
+          Hyrax.logger.warn "Failed to delete #{file_set.class}:#{file_set.id} " \
+                            "during cleanup for resource: #{event[:object]}. " \
+                            'This member may now be orphaned.'
         end
       end
 
@@ -33,15 +31,13 @@ module Hyrax
         return if event[:collection].is_a?(ActiveFedora::Base) # handled by legacy code
 
         Hyrax.custom_queries.find_members_of(collection: event[:collection]).each do |resource|
-          begin
-            resource.member_of_collection_ids -= [event[:collection].id]
-            Hyrax.persister.save(resource: resource)
-            Hyrax.publisher
-                 .publish('collection.membership.updated', collection: event[:collection], user: event[:user])
-          rescue StandardError
-            Hyrax.logger.warn "Failed to remove collection reference from #{work.class}:#{work.id} " \
-                              "during cleanup for collection: #{event[:collection]}. "
-          end
+          resource.member_of_collection_ids -= [event[:collection].id]
+          Hyrax.persister.save(resource: resource)
+          Hyrax.publisher
+               .publish('collection.membership.updated', collection: event[:collection], user: event[:user])
+        rescue StandardError
+          Hyrax.logger.warn "Failed to remove collection reference from #{work.class}:#{work.id} " \
+                            "during cleanup for collection: #{event[:collection]}. "
         end
       end
     end

data/app/services/hyrax/multiple_membership_checker.rb

@@ -21,7 +21,9 @@ module Hyrax
     # also belong to other collections of the same type.
     #
     # @return [True, String] true if no conflicts; otherwise, an error message string
+    # @deprecated Use #check instead; for removal in 4.0.0
     def validate
+      Deprecation.warn "#{self.class}##{__method__} is deprecated; use #check instead."
       return true if item.member_of_collection_ids.empty? || item.member_of_collection_ids.count <= 1
       return true unless single_membership_collection_types_exist?
 

data/app/services/hyrax/valkyrie_persist_derivatives.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+module Hyrax
+  class ValkyriePersistDerivatives < Hydra::Derivatives::PersistOutputFileService
+    # Persists a derivative using the defined Valkyrie storage adapter
+    #
+    # This Service conforms to the signature of `Hydra::Derivatives::PersistOutputFileService`.
+    # This service is a Valkyrized alternative to the default Hydra::Derivatives::PersistOutputFileService.
+    # This service will always update existing and does not do versioning of persisted files.
+    #
+    # to replace the default AF derivative pipeline, set
+    #     ```
+    #     Hydra::Derivatives.config.output_file_service = Hyrax::ValkyriePersistDerivatives
+    #     Hydra::Derivatives.config.source_file_service = Hyrax::LocalFileService
+    #     ```
+    #
+    # @param [#read] stream the derivative filestream
+    # @param [Hash] directives
+    # @option directives [String] :url a url to the file destination
+    def self.call(stream, directives)
+      filepath = URI(directives.fetch(:url)).path
+      fileset_id = fileset_id_from_path(filepath)
+      fileset = Hyrax.metadata_adapter.query_service.find_by(id: fileset_id)
+
+      # Valkyrie storage adapters will typically expect an IO-like object that
+      # responds to #path -- here we only have a StringIO, so some
+      # transformation is in order
+      tmpfile = Tempfile.new(fileset_id, encoding: 'ascii-8bit')
+      tmpfile.write stream.read
+
+      Rails.logger.debug "Uploading thumbnail for FileSet #{fileset_id} as #{filepath}"
+      Hyrax.config.derivatives_storage_adapter.upload(
+        file: tmpfile,
+        original_filename: filepath,
+        resource: fileset
+      )
+    end
+
+    # The filepath will look something like
+    # /app/samvera/hyrax-webapp/derivatives/95/93/tv/12/3-thumbnail.jpeg and
+    # we want to extract the FileSet id, which in this case would be 9593tv123
+    #
+    # @param [String] path
+    # @return [String]
+    def self.fileset_id_from_path(path)
+      path.sub(Hyrax.config.derivatives_path.to_s, "")
+          .sub(/-[^\/]+\..*$/, "")
+          .delete("/")
+    end
+  end
+end

data/app/services/hyrax/valkyrie_upload.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module Hyrax::ValkyrieUpload
+  # @param [IO] io
+  # @param [String] filename
+  # @param [Hyrax::FileSet] file_set
+  # @param [RDF::URI] use
+  # @param [User] user
+  #
+  # @see Hyrax::FileMetadata::Use
+  # @return [Hyrax::FileMetadata] the metadata representing the uploaded file
+  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/ParameterLists
+  def self.file(
+    filename:,
+    file_set:,
+    io:,
+    storage_adapter: Hyrax.storage_adapter,
+    use: Hyrax::FileMetadata::Use::ORIGINAL_FILE,
+    user: nil
+  )
+
+    streamfile = storage_adapter.upload(
+      file: io,
+      original_filename: filename,
+      resource: file_set,
+      use: use
+    )
+    io.close
+
+    file_metadata = Hyrax::FileMetadata(streamfile)
+    file_metadata.file_set_id = file_set.id
+
+    case use
+    when Hyrax::FileMetadata::Use::ORIGINAL_FILE
+      # Set file set label.
+      reset_title = file_set.title.first == file_set.label
+      # set title to label if that's how it was before this characterization
+      file_set.title = file_metadata.original_filename if reset_title
+      # always set the label to the original_name
+      file_set.label = file_metadata.original_filename
+    when Hyrax::FileMetadata::Use::THUMBNAIL
+      # TODO: the parent work's thumbnail_id remains incorrect (it's set to the
+      # FileSet ID, rather than the ID of this thumbnail FileMetadata; but
+      # trying to update the parent attributes here doesn't seem to stick
+      file_set.thumbnail_id = file_metadata.id
+    end
+
+    saved_metadata = Hyrax.persister.save(resource: file_metadata)
+    Hyrax.publisher.publish("object.file.uploaded", metadata: saved_metadata)
+
+    add_file_to_file_set(file_set: file_set,
+                         file_metadata: saved_metadata,
+                         user: user)
+
+    Hyrax.publisher.publish('file.metadata.updated', metadata: saved_metadata, user: user)
+
+    saved_metadata
+  end
+
+  # @param [Hyrax::FileSet] file_set the file set to add to
+  # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
+  #   the file to add
+  # @param [::User] user  the user performing the add
+  #
+  # @return [Hyrax::FileSet] updated file set
+  def self.add_file_to_file_set(file_set:, file_metadata:, user:)
+    file_set.file_ids << file_metadata.id
+    set_file_use_ids(file_set, file_metadata)
+
+    Hyrax.persister.save(resource: file_set)
+    Hyrax.publisher.publish('object.membership.updated', object: file_set, user: user)
+  end
+
+  # @api private
+  # @param [Hyrax::FileSet] file_set the file set to add to
+  # @param [Hyrax::FileMetadata] file_metadata the metadata object representing
+  #   the file to add
+  # @return [void]
+  def self.set_file_use_ids(file_set, file_metadata)
+    file_metadata.type.each do |type|
+      case type
+      when Hyrax::FileMetadata::Use::ORIGINAL_FILE
+        file_set.original_file_id = file_metadata.id
+      when Hyrax::FileMetadata::Use::THUMBNAIL
+        file_set.thumbnail_id = file_metadata.id
+      when Hyrax::FileMetadata::Use::EXTRACTED_TEXT
+        file_set.extracted_text_id = file_metadata.id
+      else
+        Rails.logger.warn "Unknown file use #{file_metadata.type} specified for #{file_metadata.file_identifier}"
+      end
+    end
+  end
+end

data/app/services/hyrax/workflow/workflow_importer.rb

@@ -128,16 +128,14 @@ module Hyrax
       def call
         self.errors = []
         Array.wrap(data.fetch(:workflows)).map do |configuration|
-          begin
-            find_or_create_from(configuration: configuration)
-          rescue InvalidStateRemovalException => e
-            e.states.each do |state|
-              error = I18n.t('hyrax.workflow.load.state_error', workflow_name: state.workflow.name, state_name: state.name, entity_count: state.entities.count)
-              Rails.logger.error(error)
-              errors << error
-            end
-            Sipity::Workflow.find_by(name: configuration[:name])
+          find_or_create_from(configuration: configuration)
+        rescue InvalidStateRemovalException => e
+          e.states.each do |state|
+            error = I18n.t('hyrax.workflow.load.state_error', workflow_name: state.workflow.name, state_name: state.name, entity_count: state.entities.count)
+            Rails.logger.error(error)
+            errors << error
           end
+          Sipity::Workflow.find_by(name: configuration[:name])
         end
       end
 

data/app/services/hyrax/workflow/workflow_schema.rb

@@ -20,11 +20,9 @@ module Hyrax
         include Dry::Types()
 
         Constant = Types::Class.constructor do |v|
-          begin
-            v.constantize
-          rescue NameError => _err
-            v
-          end
+          v.constantize
+        rescue NameError => _err
+          v
         end
       end
 

data/app/strategies/hyrax/strategies/yaml_strategy.rb

@@ -34,12 +34,10 @@ module Hyrax::Strategies
 
     def yaml_file
       @yaml_file ||=
-        begin
-          if File.exist?(@config_file)
-            YAML.load_file(@config_file)
-          else
-            {}
-          end
+        if File.exist?(@config_file)
+          YAML.load_file(@config_file)
+        else
+          {}
         end
     end
   end

data/app/uploaders/hyrax/uploaded_file_uploader.rb

@@ -4,21 +4,21 @@ module Hyrax
     # Override the directory where uploaded files will be stored.
     # This is a sensible default for uploaders that are meant to be mounted:
     def store_dir
-      configured_upload_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      (configured_upload_path / model.class.to_s.underscore / mounted_as.to_s / model.id.to_s).to_s
     end
 
     def cache_dir
-      configured_cache_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      (configured_cache_path / model.class.to_s.underscore / mounted_as.to_s / model.id.to_s).to_s
     end
 
     private
 
     def configured_upload_path
-      Hyrax.config.upload_path.call
+      Pathname.new(Hyrax.config.upload_path.call)
     end
 
     def configured_cache_path
-      Hyrax.config.cache_path.call
+      Pathname.new(Hyrax.config.cache_path.call)
     end
   end
 end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -1,30 +1,30 @@
 # frozen_string_literal: true
 module Hyrax
-  # Validates that the record passes the multiple membership checker
+  ##
+  # Validates that the record passes the multiple membership requirements for collections.
   class CollectionMembershipValidator < ActiveModel::Validator
-    def validate(record)
-      update_collections(record)
-      validation = validate_multi_membership(record)
-      return if validation == true
-      record.errors[:member_of_collection_ids] << validation
+    ##
+    # @param multiple_membership_checker
+    def initialize(multiple_membership_checker: Hyrax::MultipleMembershipChecker, **options)
+      @multiple_membership_checker = multiple_membership_checker
+      super(options)
     end
 
-    private
-
-    def validate_multi_membership(record)
+    def validate(record)
       # collections-in-collections do not have multi-membership restrictions
       return true if record.is_a? Hyrax::Forms::PcdmCollectionForm
+      checker = @multiple_membership_checker.new(item: nil)
+      ids = collections_ids(record)
 
-      Hyrax::MultipleMembershipChecker.new(item: record).validate
+      errors = Array(checker.check(collection_ids: ids))
+      record.errors[:member_of_collection_ids].concat(errors)
     end
 
-    def update_collections(record)
-      record.member_of_collection_ids = collections_ids(record)
-      record.member_of_collection_ids.uniq!
-    end
+    private
 
     def collections_ids(record)
-      collection_ids = []
+      collection_ids = record.member_of_collection_ids.reject(&:blank?)
+
       if record.member_of_collections_attributes.present?
         record.member_of_collections_attributes
               .each do |_k, h|
@@ -32,6 +32,7 @@ module Hyrax
                 collection_ids << Valkyrie::ID.new(h["id"])
               end
       end
+
       collection_ids
     end
   end

data/app/views/catalog/_index_header_list_default.html.erb

@@ -1,3 +1,10 @@
+<% model = document.hydra_model %>
 <div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, document %></h3>
+  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
+    <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
+    <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
+  <% else %>
+    <h3 class="search-result-title"><%= link_to document.title_or_label, document %></h3>
+  <% end %>
 </div>
+

data/app/views/catalog/_thumbnail_list_default.html.erb

@@ -1,5 +1,10 @@
+<% model = document.hydra_model %>
 <div class="col-md-2">
-  <div class="list-thumbnail">
-    <%= render_thumbnail_tag document %>
-  </div>
+  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
+    <%= render_thumbnail_tag document, {}, suppress_link: true %>
+  <% else %>
+    <div class="list-thumbnail">
+      <%= render_thumbnail_tag document %>
+    </div>
+  <% end %>
 </div>

data/app/views/collections/edit_fields/_based_near.html.erb

@@ -1,8 +1,8 @@
 <%= f.input key,
-            as: :multi_value,
-            input_html: {
-              class: 'form-control',
-              data: { 'autocomplete-url' => "/authorities/search/geonames",
-                      'autocomplete' => key }
-            },
-            required: f.object.required?(key) %>
+  as: :multi_value,
+  input_html: {
+    class: 'form-control',
+    data: { 'autocomplete-url' => "/authorities/search/geonames",
+            'autocomplete' => key }
+  },
+  required: f.object.required?(key) %>