curation_concerns 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3c778b10ded8ecbde18b513c114091bd5db0f03
-  data.tar.gz: 7665059aa1ca3e90ac806048ec6e5d05d9336514
+  metadata.gz: a18cbc58262bda78bbccb7fcc5e263e09675b574
+  data.tar.gz: fb6ff7b4b9ad80ff9f2ccb26dbfa2ce93b35b585
 SHA512:
-  metadata.gz: ce3acb4259faa827a4c98563a10f13d492388ae5815f5160a5505a053b8a18ed655928dacbb298a8b2e4cf701ec9280c41efd1d28d05a9a0abc57fb78f65751e
-  data.tar.gz: 7d4ccf6d0e886559560ffc178cba90eeb27d6654d6871905f5bdd79128b688d6a3eff8c1414bf8c89d138d8ecc90e1c34a435c3770c39e540a0c31c4d7382696
+  metadata.gz: df0282909989ce292b1dbaa07ae83497e0bb7a8cd253120c5dc3d6d5d9d085a539aefacb701fd13e8fa70bef726b008fd2e5937faad7a6cc96b1808af0bb6695
+  data.tar.gz: 7bc806d8693440c4e17958531be96a56af544878796081521339bfa7ae261672f537900337035a29ae79b1a7385693b0f5403f82ae37a29fd0e8f493d8f94ad5

data/.rubocop.yml

@@ -107,7 +107,7 @@ Style/HashSyntax:
 
 Style/PredicateName:
   Exclude:
-    - 'app/helpers/curation_concerns/collections_helper_behavior.rb'
+    - 'app/helpers/curation_concerns/collections_helper.rb'
 
 Style/GlobalVars:
   Exclude:

data/Gemfile

@@ -3,10 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in curation_concerns.gemspec
 gemspec
 
-if ENV['RDF_VERSION']
-  gem 'rdf', ENV['RDF_VERSION']
-end
-
 group :development, :test do
   gem 'simplecov', '~> 0.9', require: false
   gem 'coveralls', require: false

data/app/actors/curation_concerns/actors/file_actor.rb

@@ -20,9 +20,11 @@ module CurationConcerns
       # have made it to the repo
       # @param [File, ActionDigest::HTTP::UploadedFile, Tempfile] file the file to save in the repository
       def ingest_file(file)
-        working_file = WorkingDirectory.copy_file_to_working_directory(file, file_set.id)
-        mime_type = file.respond_to?(:content_type) ? file.content_type : nil
-        IngestFileJob.perform_later(file_set, working_file, mime_type, user, relation)
+        IngestFileJob.perform_later(
+          file_set,
+          working_file(file),
+          user,
+          ingest_options(file))
         true
       end
 
@@ -38,6 +40,20 @@ module CurationConcerns
         CharacterizeJob.perform_later(file_set, repository_file.id)
         true
       end
+
+      private
+
+        def working_file(file)
+          path = file.path
+          return path if File.exist?(path)
+          CurationConcerns::WorkingDirectory.copy_file_to_working_directory(file, file_set.id)
+        end
+
+        def ingest_options(file, opts = {})
+          opts.merge!(mime_type: file.content_type) if file.respond_to?(:content_type)
+          opts.merge!(filename: file.original_filename) if file.respond_to?(:original_filename)
+          opts.merge!(relation: relation)
+        end
     end
   end
 end

data/app/assets/javascripts/curation_concerns/curation_concerns.js

@@ -10,6 +10,7 @@
 //= require curation_concerns/collections
 //= require curation_concerns/file_manager
 //= require curation_concerns/boot
+//= require babel/polyfill
 
 // Initialize plugins and Bootstrap dropdowns on jQuery's ready event as well as
 // Turbolinks's page change event.

data/app/assets/javascripts/curation_concerns/file_manager/sorting.es6

@@ -5,6 +5,7 @@ export default class SortManager {
     this.initialize_sort()
     this.element.data("current-order", this.order)
     this.save_manager = save_manager
+    this.initialize_alpha_sort_button()
   }
 
   initialize_sort() {
@@ -42,17 +43,21 @@ export default class SortManager {
     return this.element.children().index(item)
   }
 
+  register_order_change() {
+    if(this.order.toString() != this.element.data("current-order").toString()) {
+      this.save_manager.push_changed(this)
+    } else {
+      this.save_manager.mark_unchanged(this)
+    }
+  }
+
   get stopped_sorting() {
     return (event, ui) => {
       this.sorting_info.end = this.get_sort_position($(ui.item))
       if(this.sorting_info.end == this.sorting_info.start) {
         return
       }
-      if(this.order.toString() != this.element.data("current-order").toString()) {
-        this.save_manager.push_changed(this)
-      } else {
-        this.save_manager.mark_unchanged(this)
-      }
+      this.register_order_change()
     }
   }
 
@@ -82,4 +87,38 @@ export default class SortManager {
       }
     ).toArray()
   }
+
+  get alpha_sort_button() {
+    return $("*[data-action='alpha-sort-action']")
+  }
+
+  initialize_alpha_sort_button() {
+    let that = this
+    this.alpha_sort_button.click(function() { that.sort_alpha() } )
+  }
+
+  sort_alpha() {
+    // create array of { title, element } objects
+    let array = []
+    let children = this.element.children().get()
+    children.forEach(function(child) {
+      let title = $(child).find("input.title").val()
+      array.push(
+        { title: title,
+          element: child }
+      )
+    })
+    // sort array by title of each object
+    array.sort(function(o1, o2) {
+      let a = o1.title.toLowerCase()
+      let b = o2.title.toLowerCase()
+      return a < b ? -1 : (a > b ? 1 : 0);
+    });
+    // replace contents of #sortable with elements from the array
+    this.element.empty()
+    for (let child of array) {
+      this.element.append(child.element)
+    }
+    this.register_order_change()
+  }
 }

data/app/assets/javascripts/curation_concerns/file_manager.es6

@@ -42,8 +42,9 @@ export default class FileManager {
   }
 
   // Initialize a form that represents the parent resource as a whole.
-  // For the purpose of CC, this only comes with a thumbnail_id hidden field
-  // which is synchronized with the radio buttons on each member and then
+  // For the purpose of CC, this comes with hidden fields for
+  // thumbnail_id and representative_id
+  // which are synchronized with the radio buttons on each member and then
   // submitted with the SaveManager.
   resource_form() {
     let manager = new FileManagerMember($("#resource-form").parent(), this.save_manager)
@@ -55,6 +56,12 @@ export default class FileManager {
       $("*[data-member-link=thumbnail_id]").val(val)
       $("*[data-member-link=thumbnail_id]").change()
     })
+    new InputTracker($("*[data-member-link=representative_id]"), manager)
+    $("#sortable *[name=representative_id]").change(function() {
+      let val = $("#sortable *[name=representative_id]:checked").val()
+      $("*[data-member-link=representative_id]").val(val)
+      $("*[data-member-link=representative_id]").change()
+    })
   }
 
   // Keep the ui/sortable placeholder the right size.

data/app/controllers/concerns/curation_concerns/collections_controller_behavior.rb

@@ -2,9 +2,7 @@ module CurationConcerns
   module CollectionsControllerBehavior
     extend ActiveSupport::Concern
     include Blacklight::AccessControls::Catalog
-
     include Blacklight::Base
-    include CurationConcerns::SelectsCollections
 
     included do
       before_action :filter_docs_with_read_access!, except: :show
@@ -29,17 +27,38 @@ module CurationConcerns
       end
 
       # actions: audit, index, create, new, edit, show, update, destroy, permissions, citation
-      before_action :authenticate_user!, except: [:show]
+      before_action :authenticate_user!, except: [:show, :index]
       load_and_authorize_resource except: [:index, :show], instance_name: :collection
 
-      class_attribute :presenter_class, :form_class
+      class_attribute :presenter_class,
+                      :form_class,
+                      :list_search_builder_class,
+                      :single_item_search_builder_class,
+                      :member_search_builder_class
+
+      alias_method :collection_search_builder_class, :single_item_search_builder_class
+      deprecation_deprecate collection_search_builder_class: "use single_item_search_builder_class instead"
+
+      alias_method :collections_search_builder_class, :list_search_builder_class
+      deprecation_deprecate collections_search_builder_class: "use list_search_builder_class instead"
+
+      alias_method :collection_member_search_builder_class, :member_search_builder_class
+      deprecation_deprecate collection_member_search_builder_class: "use member_search_builder_class instead"
+
       self.presenter_class = CurationConcerns::CollectionPresenter
       self.form_class = CurationConcerns::Forms::CollectionEditForm
+
+      # To build a query to find a list of collections
+      self.list_search_builder_class = CurationConcerns::CollectionSearchBuilder
+      # The search builder to find the collection
+      self.single_item_search_builder_class = CurationConcerns::WorkSearchBuilder
+      # The search builder to find the collections' members
+      self.member_search_builder_class = CurationConcerns::CollectionMemberSearchBuilder
     end
 
     def index
       # run the solr query to find the collections
-      query = collections_search_builder.with(params).query
+      query = list_search_builder.with(params).query
       @response = repository.search(query)
       @document_list = @response.documents
     end
@@ -55,7 +74,7 @@ module CurationConcerns
 
     def edit
       query_collection_members
-      find_collections
+      @user_collections = find_collections_for_form
       form
     end
 
@@ -144,6 +163,17 @@ module CurationConcerns
 
     protected
 
+      # TODO: This method could become a collection service.
+      # TODO: It seems suspicious that this is returning collections with read
+      #       access rather than collections with edit access
+      # run a solr query to get the collections the user has access to read
+      # @return [Array] a list of the user's collections
+      def find_collections_for_form
+        query = list_search_builder.with(q: '').query
+        response = repository.search(query)
+        response.documents
+      end
+
       def remove_select_something_first_flash
         flash.delete(:notice) if flash.notice == 'Select something first'
       end
@@ -152,25 +182,38 @@ module CurationConcerns
         @presenter ||= begin
           # Query Solr for the collection.
           # run the solr query to find the collection members
-          response = repository.search(collection_search_builder.query)
+          response = repository.search(single_item_search_builder.query)
           curation_concern = response.documents.first
           raise CanCan::AccessDenied unless curation_concern
           presenter_class.new(curation_concern, current_ability)
         end
       end
 
-      def collection_search_builder
-        collection_search_builder_class.new(self).with(params.except(:q, :page))
+      # Instantiates the search builder that builds a query for a single item
+      # this is useful in the show view.
+      def single_item_search_builder
+        single_item_search_builder_class.new(self).with(params.except(:q, :page))
       end
 
-      def collection_search_builder_class
-        CurationConcerns::WorkSearchBuilder
+      alias collection_search_builder single_item_search_builder
+      deprecation_deprecate collection_search_builder: "use single_item_search_builder instead"
+
+      # Instantiates the search builder that builds a query for items that are
+      # members of the current collection. This is used in the show view.
+      def member_search_builder
+        @member_search_builder ||= member_search_builder_class.new(self)
       end
 
-      def collection_member_search_builder_class
-        CurationConcerns::CollectionMemberSearchBuilder
+      alias collection_member_search_builder member_search_builder
+      deprecation_deprecate collection_member_search_builder: "use member_search_builder instead"
+
+      def list_search_builder
+        list_search_builder_class.new(self)
       end
 
+      alias collections_search_builder list_search_builder
+      deprecation_deprecate collections_search_builder: "use list_search_builder instead"
+
       def collection_params
         form_class.model_attributes(params[:collection])
       end
@@ -189,7 +232,7 @@ module CurationConcerns
 
       # @return <Hash> a representation of the solr query that find the collection members
       def query_for_collection_members
-        collection_member_search_builder.with(params_for_members_query).query
+        member_search_builder.with(params_for_members_query).query
       end
 
       # You can override this method if you need to provide additional inputs to the search
@@ -200,10 +243,6 @@ module CurationConcerns
         params.merge(q: params[:cq])
       end
 
-      def collection_member_search_builder
-        @collection_member_search_builder ||= collection_member_search_builder_class.new(self)
-      end
-
       def process_member_changes
         case params[:collection][:members]
         when 'add' then add_members_to_collection

data/app/controllers/concerns/curation_concerns/permissions_controller_behavior.rb

@@ -0,0 +1,23 @@
+module CurationConcerns
+  module PermissionsControllerBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      include CurationConcerns::CurationConcernController
+
+      def confirm
+      end
+
+      def copy
+        authorize! :edit, curation_concern
+        VisibilityCopyJob.perform_later(curation_concern)
+        flash_message = 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'
+        redirect_to [main_app, curation_concern], notice: flash_message
+      end
+
+      def curation_concern
+        @curation_concern ||= ActiveFedora::Base.find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/concerns/curation_concerns/selects_collections.rb

@@ -1,7 +1,9 @@
 module CurationConcerns::SelectsCollections
   extend ActiveSupport::Concern
+  extend Deprecation
 
   included do
+    Deprecation.warn(CurationConcerns::SelectsCollections, "CurationConcerns::SelectsCollections is deprecated and will be removed in curation_concerns 2.0")
     configure_blacklight do |config|
       config.search_builder_class = CurationConcerns::CollectionSearchBuilder
     end

data/app/controllers/curation_concerns/permissions_controller.rb

@@ -1,18 +1,3 @@
 class CurationConcerns::PermissionsController < ApplicationController
-  include CurationConcerns::CurationConcernController
-  with_themed_layout '1_column'
-
-  def confirm
-  end
-
-  def copy
-    authorize! :edit, curation_concern
-    VisibilityCopyJob.perform_later(curation_concern)
-    flash_message = 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'
-    redirect_to [main_app, curation_concern], notice: flash_message
-  end
-
-  def curation_concern
-    @curation_concern ||= ActiveFedora::Base.find(params[:id])
-  end
+  include CurationConcerns::PermissionsControllerBehavior
 end

data/app/forms/curation_concerns/forms/work_form.rb

@@ -51,13 +51,6 @@ module CurationConcerns
             super
           end
         end
-
-        # Overriden to cast 'rights' to an array
-        def sanitize_params(form_params)
-          super.tap do |params|
-            params['rights'] = Array.wrap(params['rights']) if params.key?('rights')
-          end
-        end
       end
 
       private

data/app/helpers/batch_select_helper.rb

@@ -1,23 +1,8 @@
 # View Helpers for Hydra Batch Edit functionality
 module BatchSelectHelper
-  # determines if the given document id is in the batch
-  # def item_in_batch?(doc_id)
-  #   session[:batch_document_ids] && session[:batch_document_ids].include?(doc_id) ? true : false
-  # end
-
-  # Displays the batch edit tools.  Put this in your search result page template.  We recommend putting it in catalog/_sort_and_per_page.html.erb
-  def batch_select_tools
-    render partial: '/batch_select/tools'
-  end
-
   # Displays the button to select/deselect items for your batch.  Call this in the index partial that's rendered for each search result.
   # @param [Hash] document the Hash (aka Solr hit) for one Solr document
   def button_for_add_to_batch(document)
     render partial: '/batch_select/add_button', locals: { document: document }
   end
-
-  # Displays the check all button to select/deselect items for your batch.  Put this in your search result page template.  We put it in catalog/index.html
-  def batch_check_all(label = 'Use all results')
-    render partial: '/batch_select/check_all', locals: { label: label }
-  end
 end

data/app/helpers/curation_concerns/collections_helper.rb

@@ -1,4 +1,41 @@
 module CurationConcerns::CollectionsHelper
+  def has_collection_search_parameters?
+    !params[:cq].blank?
+  end
+
+  def button_for_remove_from_collection(collection, document, label = 'Remove From Collection')
+    render '/collections/button_remove_from_collection', collection: collection, label: label, document: document
+  end
+
+  def button_for_remove_selected_from_collection(collection, label = 'Remove From Collection')
+    render '/collections/button_for_remove_selected_from_collection', collection: collection, label: label
+  end
+
+  # add hidden fields to a form for removing a single document from a collection
+  def single_item_action_remove_form_fields(form, document)
+    single_item_action_form_fields(form, document, 'remove')
+  end
+
+  # add hidden fields to a form for adding a single document to a collection
+  def single_item_action_add_form_fields(form, document)
+    single_item_action_form_fields(form, document, 'add')
+  end
+
+  # add hidden fields to a form for performing an action on a single document on a collection
+  def single_item_action_form_fields(form, document, action)
+    render '/collections/single_item_action_fields', form: form, document: document, action: action
+  end
+
+  def hidden_collection_members
+    erbout = ''
+    if params[:batch_document_ids].present?
+      params[:batch_document_ids].each do |batch_item|
+        erbout.concat hidden_field_tag('batch_document_ids[]', batch_item)
+      end
+    end
+    erbout.html_safe
+  end
+
   def collection_modal_id(collectible)
     "#{collectible.to_param.tr(':', '-')}-modal"
   end
@@ -49,13 +86,10 @@ module CurationConcerns::CollectionsHelper
       if current_user.respond_to?(:collections)
         return current_user.collections.map { |c| [c.title.join(', '), c.id] }
       end
-      query = ActiveFedora::SolrQueryBuilder
-              .construct_query_for_rel(
-                has_model: Collection.to_class_uri)
       convert_solr_docs_to_select_options(
-        ActiveFedora::SolrService.query(query,
-                                        fl: 'title_tesim id',
-                                        rows: 1000)
+        ::Collection.search_with_conditions({},
+                                            fl: 'title_tesim id',
+                                            rows: 1000)
       )
     end
 

data/app/helpers/curation_concerns/main_app_helpers.rb

@@ -8,6 +8,4 @@ module CurationConcerns::MainAppHelpers
   include CurationConcerns::EmbargoHelper
   include CurationConcerns::LeaseHelper
   include CurationConcerns::CollectionsHelper
-  include CurationConcerns::PermissionsHelper
-  include CurationConcerns::RightsHelper
 end

data/app/jobs/characterize_job.rb

@@ -3,13 +3,15 @@ class CharacterizeJob < ActiveJob::Base
 
   # @param [FileSet] file_set
   # @param [String] file_id identifier for a Hydra::PCDM::File
-  def perform(file_set, file_id)
-    filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id)
+  # @param [String, NilClass] filepath the cached file within the CurationConcerns.config.working_path
+  def perform(file_set, file_id, filepath = nil)
+    filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
     raise LoadError, "#{file_set.class.characterization_proxy} was not found" unless file_set.characterization_proxy?
     Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filename)
     Rails.logger.debug "Ran characterization on #{file_set.characterization_proxy.id} (#{file_set.characterization_proxy.mime_type})"
     file_set.characterization_proxy.save!
     file_set.update_index
-    CreateDerivativesJob.perform_later(file_set, file_id)
+    file_set.parent.in_collections.each(&:update_index) if file_set.parent
+    CreateDerivativesJob.perform_later(file_set, file_id, filename)
   end
 end

data/app/jobs/create_derivatives_job.rb

@@ -3,9 +3,10 @@ class CreateDerivativesJob < ActiveJob::Base
 
   # @param [FileSet] file_set
   # @param [String] file_id identifier for a Hydra::PCDM::File
-  def perform(file_set, file_id)
+  # @param [String, NilClass] filepath the cached file within the CurationConcerns.config.working_path
+  def perform(file_set, file_id, filepath = nil)
     return if file_set.video? && !CurationConcerns.config.enable_ffmpeg
-    filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id)
+    filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id, filepath)
 
     file_set.create_derivatives(filename)
 

data/app/jobs/ingest_file_job.rb

@@ -2,36 +2,36 @@ class IngestFileJob < ActiveJob::Base
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
-  # @param [String] filename the cached file within the CurationConcerns.config.working_path
-  # @param [String,NilClass] mime_type
+  # @param [String] filepath the cached file within the CurationConcerns.config.working_path
   # @param [User] user
-  # @param [String] relation ('original_file')
-  def perform(file_set, filename, mime_type, user, relation = 'original_file')
-    local_file = File.open(filename, "rb")
-    # If mime-type is known, wrap in an IO decorator
-    # Otherwise allow Hydra::Works service to determine mime_type
-    if mime_type
-      local_file = Hydra::Derivatives::IoDecorator.new(local_file)
-      local_file.mime_type = mime_type
-      local_file.original_name = File.basename(filename)
-    end
+  # @option opts [String] mime_type
+  # @option opts [String] filename
+  # @option opts [String] relation, ex. :original_file
+  def perform(file_set, filepath, user, opts = {})
+    relation = opts.fetch(:relation, :original_file).to_sym
 
-    # Tell AddFileToFileSet service to skip versioning because versions will be minted by VersionCommitter (called by save_characterize_and_record_committer) when necessary
+    # Wrap in an IO decorator to attach passed-in options
+    local_file = Hydra::Derivatives::IoDecorator.new(File.open(filepath, "rb"))
+    local_file.mime_type = opts.fetch(:mime_type, nil)
+    local_file.original_name = opts.fetch(:filename, File.basename(filepath))
+
+    # Tell AddFileToFileSet service to skip versioning because versions will be minted by
+    # VersionCommitter when necessary during save_characterize_and_record_committer.
     Hydra::Works::AddFileToFileSet.call(file_set,
                                         local_file,
-                                        relation.to_sym,
+                                        relation,
                                         versioning: false)
 
     # Persist changes to the file_set
     file_set.save!
 
-    repository_file = file_set.send(relation.to_sym)
+    repository_file = file_set.send(relation)
 
     # Do post file ingest actions
     CurationConcerns::VersioningService.create(repository_file, user)
 
     # TODO: this is a problem, the file may not be available at this path on another machine.
     # It may be local, or it may be in s3
-    CharacterizeJob.perform_later(file_set, repository_file.id)
+    CharacterizeJob.perform_later(file_set, repository_file.id, filepath)
   end
 end

data/app/models/concerns/curation_concerns/admin_set_behavior.rb

@@ -17,6 +17,11 @@ module CurationConcerns
       property :description, predicate: ::RDF::Vocab::DC.description do |index|
         index.as :stored_searchable
       end
+
+      property :creator, predicate: ::RDF::Vocab::DC11.creator do |index|
+        index.as :symbol
+      end
+
       has_many :members,
                predicate: ::RDF::Vocab::DC.isPartOf,
                class_name: 'ActiveFedora::Base'

data/app/models/concerns/curation_concerns/basic_metadata.rb

@@ -28,9 +28,17 @@ module CurationConcerns
       property :keyword, predicate: ::RDF::Vocab::DC11.relation do |index|
         index.as :stored_searchable, :facetable
       end
+
+      # Used for a license
       property :rights, predicate: ::RDF::Vocab::DC.rights do |index|
         index.as :stored_searchable
       end
+
+      # This is for the rights statement
+      property :rights_statement, predicate: ::RDF::Vocab::EDM.rights do |index|
+        index.as :stored_searchable
+      end
+
       property :publisher, predicate: ::RDF::Vocab::DC11.publisher do |index|
         index.as :stored_searchable, :facetable
       end

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

@@ -14,7 +14,7 @@ module CurationConcerns
     end
 
     def to_s
-      title.present? ? title : 'No Title'
+      title.present? ? title.join(' | ') : 'No Title'
     end
 
     module ClassMethods
@@ -35,11 +35,10 @@ module CurationConcerns
 
       # One query per member_id because Solr is not a relational database
       sizes = member_ids.collect do |work_id|
-        query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::FileSet.to_class_uri)
         argz = { fl: "id, #{file_size_field}",
                  fq: "{!join from=#{member_ids_field} to=id}id:#{work_id}"
         }
-        files = ActiveFedora::SolrService.query(query, argz)
+        files = ::FileSet.search_with_conditions({}, argz)
         files.reduce(0) { |sum, f| sum + f[file_size_field].to_i }
       end
 

data/app/models/concerns/curation_concerns/serializers.rb

@@ -2,9 +2,9 @@ module CurationConcerns
   module Serializers
     def to_s
       if title.present?
-        Array.wrap(title).join(' | ')
+        title.join(' | ')
       elsif label.present?
-        Array.wrap(label).join(' | ')
+        label
       else
         'No Title'
       end

data/app/models/concerns/curation_concerns/solr_document_behavior.rb

@@ -66,7 +66,7 @@ module CurationConcerns
     end
 
     def thumbnail_id
-      first(Solrizer.solr_name('thumbnail_id', :symbol))
+      first(Solrizer.solr_name('hasRelatedImage', :symbol))
     end
 
     # Date created is indexed as a string. This allows users to enter values like: 'Circa 1840-1844'
@@ -104,7 +104,8 @@ module CurationConcerns
     end
 
     def creator
-      fetch(Solrizer.solr_name('creator'), [])
+      descriptor = hydra_model.index_config[:creator].behaviors.first
+      fetch(Solrizer.solr_name('creator', descriptor), [])
     end
 
     def contributor