hyrax 3.4.2 → 4.0.0.beta2

data/app/services/hyrax/valkyrie_upload.rb

@@ -28,7 +28,7 @@ module Hyrax::ValkyrieUpload
     )
     io.close
 
-    file_metadata = Hyrax::FileMetadata(streamfile)
+    file_metadata = find_or_create_metadata(id: streamfile.id, file: streamfile)
     file_metadata.file_set_id = file_set.id
 
     case use
@@ -87,8 +87,20 @@ module Hyrax::ValkyrieUpload
       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}"
+        Hyrax.logger.warn "Unknown file use #{file_metadata.type} specified for #{file_metadata.file_identifier}"
       end
     end
   end
+
+  # @api private
+  # @param [#to_s] id
+  # @param [Valkyrie::StorageAdapter::StreamFile] file
+  def self.find_or_create_metadata(id:, file:)
+    Hyrax.custom_queries.find_file_metadata_by(id: id)
+  rescue Valkyrie::Persistence::ObjectNotFoundError => e
+    Hyrax.logger.warn "Failed to find existing metadata for #{id}:"
+    Hyrax.logger.warn e.message
+    Hyrax.logger.warn "Creating Hyrax::FileMetadata now"
+    Hyrax::FileMetadata.for(file: file)
+  end
 end

data/app/services/hyrax/versioning_service.rb

@@ -1,7 +1,80 @@
 # frozen_string_literal: true
 
 module Hyrax
+  ##
+  # Provides methods for dealing with versions of files across both ActiveFedora
+  # and Valkyrie.
+  #
+  # Note that many of the methods pertaining to version creation are currently
+  # implemented as static methods.
   class VersioningService
+    ##
+    # @!attribute [rw] resource
+    #   @return [ActiveFedora::File | Hyrax::FileMetadata | NilClass]
+    attr_accessor :resource
+
+    ##
+    # @!attribute [r] storage_adapter
+    #   @return [#supports?]
+    attr_reader :storage_adapter
+
+    ##
+    # @param resource [ActiveFedora::File | Hyrax::FileMetadata | NilClass]
+    def initialize(resource:, storage_adapter: Hyrax.storage_adapter)
+      @storage_adapter = storage_adapter
+      self.resource = resource
+    end
+
+    ##
+    # Returns an array of versions for the resource associated with this
+    # Hyrax::VersioningService.
+    #
+    # If the resource is nil, or if it is a Hyrax::FileMetadata and versioning
+    # is not supported in the storage adapter, an empty array will be returned.
+    def versions
+      if resource.nil?
+        []
+      elsif resource.is_a?(Hyrax::FileMetadata)
+        if storage_adapter.try(:"supports?", :versions)
+          storage_adapter.find_versions(id: resource.file_identifier).to_a
+        else
+          []
+        end
+      else
+        resource.versions.all.to_a
+      end
+    end
+
+    ##
+    # Returns the latest version of the file associated with this
+    # Hyrax::VersioningService.
+    def latest_version
+      versions.last
+    end
+
+    ##
+    # Returns the file ID of the latest version of the file associated with this
+    # Hyrax::VersioningService, or the ID of the file resource itself if no
+    # latest version is defined.
+    #
+    # If the resource is nil, this method returns an empty string.
+    def versioned_file_id
+      latest = latest_version
+      if latest
+        if latest.respond_to?(:id)
+          latest.id
+        else
+          Hyrax.config.translate_uri_to_id.call(latest.uri)
+        end
+      elsif resource.nil?
+        ""
+      elsif resource.is_a?(Hyrax::FileMetadata)
+        resource.file_identifier
+      else
+        resource.id
+      end
+    end
+
     class << self
       # Make a version and record the version committer
       # @param [ActiveFedora::File | Hyrax::FileMetadata] content
@@ -11,19 +84,14 @@ module Hyrax
         perform_create(content, user, use_valkyrie)
       end
 
-      # @param [ActiveFedora::File | Hyrax::FileMetadata] content
+      # @param [ActiveFedora::File | Hyrax::FileMetadata] file
       def latest_version_of(file)
-        file.versions.last
+        Hyrax::VersioningService.new(resource: file).latest_version
       end
 
-      # @param [ActiveFedora::File | Hyrax::FileMetadata] content
+      # @param [ActiveFedora::File | Hyrax::FileMetadata] file
       def versioned_file_id(file)
-        versions = file.versions.all
-        if versions.present?
-          Hyrax.config.translate_uri_to_id.call(versions.last.uri)
-        else
-          file.id
-        end
+        Hyrax::VersioningService.new(resource: file).versioned_file_id
       end
 
       # Record the version committer of the last version
@@ -42,7 +110,7 @@ module Hyrax
       def perform_create(content, user, use_valkyrie)
         use_valkyrie ? perform_create_through_valkyrie(content, user) : perform_create_through_active_fedora(content, user)
       rescue NotImplementedError
-        Rails.logger.warn "Declining to create a Version for #{content}; #{self} doesn't support versioning with use_valkyrie: #{use_valkyrie}"
+        Hyrax.logger.warn "Declining to create a Version for #{content}; #{self} doesn't support versioning with use_valkyrie: #{use_valkyrie}"
       end
 
       def perform_create_through_active_fedora(content, user)

data/app/services/hyrax/visibility_map.rb

@@ -51,15 +51,23 @@ module Hyrax
     end
 
     def additions_for(visibility:)
-      self[visibility][:additions]
+      fetch(visibility)&.fetch(:additions)
     end
 
     def deletions_for(visibility:)
-      self[visibility][:deletions]
+      fetch(visibility)&.fetch(:deletions)
+    end
+
+    def fetch(key, &block)
+      @map.fetch(key, &block)
+    rescue KeyError => e
+      raise(UnknownVisibility, e.message)
     end
 
     def visibilities
       @map.keys
     end
+
+    class UnknownVisibility < KeyError; end
   end
 end

data/app/services/hyrax/work_query_service.rb

@@ -53,7 +53,7 @@ module Hyrax
     end
 
     def query
-      Hyrax::SolrQueryBuilderService.construct_query_for_ids([id])
+      Hyrax::SolrQueryService.new.with_ids(ids: [id]).build
     end
   end
 end

data/app/services/hyrax/work_resource_query_service.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+module Hyrax
+  # Responsible for retrieving information based on the given work.
+  #
+  # @see ProxyDepositRequest
+  # @see SolrDocument
+  # @see Hyrax::SolrService
+  # @note This was extracted from the ProxyDepositRequest, which was coordinating lots of effort. It was also an ActiveRecord object that required lots of Fedora/Solr interactions.
+  class WorkResourceQueryService
+    # @param [String] id - The id of the work
+    def initialize(id:)
+      @id = id
+    end
+    attr_reader :id
+
+    # @return [Boolean] if the work has been deleted
+    def deleted_work?
+      Hyrax.query_service.find_by(id: id)
+      false
+    rescue Valkyrie::Persistence::ObjectNotFoundError
+      true
+    end
+
+    def work
+      # Need to ensure it is a work?
+      resource = Hyrax.query_service.find_by(id: id)
+      raise ModelMismatchError, "Expected work but got #{resource.class}" unless resource.work?
+      resource
+    end
+
+    def to_s
+      if deleted_work?
+        'work not found'
+      else
+        solr_doc.to_s
+      end
+    end
+
+    private
+
+    def solr_doc
+      @solr_doc ||= ::SolrDocument.new(Hyrax::SolrService.search_by_id(id))
+    end
+  end
+end

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

@@ -35,12 +35,12 @@ module Hyrax
         return unless action.triggered_methods.any?
         success = action.triggered_methods.order(:weight).all? do |method|
           status = process_action(method.service_name)
-          Rails.logger.debug("Result of #{method.service_name} is #{status}")
+          Hyrax.logger.debug("Result of #{method.service_name} is #{status}")
           status
         end
 
         return save_target if success
-        Rails.logger.error "Not all workflow methods were successful, so not saving (#{target.id})"
+        Hyrax.logger.error "Not all workflow methods were successful, so not saving (#{target.id})"
         false
       end
 
@@ -63,11 +63,11 @@ module Hyrax
         klass = begin
                   class_name.constantize
                 rescue NameError
-                  Rails.logger.error "Unable to find '#{class_name}', so not running workflow callback"
+                  Hyrax.logger.error "Unable to find '#{class_name}', so not running workflow callback"
                   return nil
                 end
         return klass if klass.respond_to?(:call)
-        Rails.logger.error "Expected '#{class_name}' to respond to 'call', but it didn't, so not running workflow callback"
+        Hyrax.logger.error "Expected '#{class_name}' to respond to 'call', but it didn't, so not running workflow callback"
         nil
       end
 

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

@@ -60,11 +60,11 @@ module Hyrax
         klass = begin
                   class_name.constantize
                 rescue NameError
-                  Rails.logger.error "Unable to find '#{class_name}', so not sending notification"
+                  Hyrax.logger.error "Unable to find '#{class_name}', so not sending notification"
                   return nil
                 end
         return klass if klass.respond_to?(:send_notification)
-        Rails.logger.error "Expected '#{class_name}' to respond to 'send_notification', but it didn't, so not sending notification"
+        Hyrax.logger.error "Expected '#{class_name}' to respond to 'send_notification', but it didn't, so not sending notification"
         nil
       end
     end

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

@@ -7,7 +7,7 @@ module Hyrax
     # @see .generate_from_json_file
     class WorkflowImporter
       class_attribute :default_logger
-      self.default_logger = Rails.logger
+      self.default_logger = Hyrax.logger
       class_attribute :path_to_workflow_files
       self.path_to_workflow_files = Rails.root.join('config', 'workflows', '*.json')
 
@@ -132,7 +132,7 @@ module Hyrax
         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)
+            Hyrax.logger.error(error)
             errors << error
           end
           Sipity::Workflow.find_by(name: configuration[:name])

data/app/services/hyrax/working_directory.rb

@@ -3,6 +3,7 @@ module Hyrax
   # @deprecated Use JobIoWrapper instead
   class WorkingDirectory
     class << self
+      # @deprecated No longer used anywhere in Hyrax code, naively assumes filenames of versions/revisions are distinct
       # Returns the file passed as filepath if that file exists. Otherwise it grabs the file from repository,
       # puts it on the disk and returns that path.
       # @param [String] repository_file_id identifier for Hydra::PCDM::File
@@ -10,11 +11,12 @@ module Hyrax
       # @param [String, NilClass] filepath path to existing cached copy of the file
       # @return [String] path of the working file
       def find_or_retrieve(repository_file_id, id, filepath = nil)
+        Deprecation.warn("Hyrax::WorkingDirectory.find_or_retrieve() is deprecated and no longer used in Hyrax")
         return filepath if filepath && File.exist?(filepath)
         repository_file = Hydra::PCDM::File.find(repository_file_id)
         working_path = full_filename(id, repository_file.original_name)
         if File.exist?(working_path)
-          Rails.logger.debug "#{repository_file.original_name} already exists in the working directory at #{working_path}"
+          Hyrax.logger.debug "#{repository_file.original_name} already exists in the working directory at #{working_path}"
           return working_path
         end
         copy_repository_resource_to_working_directory(repository_file, id)
@@ -24,7 +26,7 @@ module Hyrax
       # @param [String] id the identifier of the FileSet
       # @return [String] path of the working file
       def copy_repository_resource_to_working_directory(file, id)
-        Rails.logger.debug "Loading #{file.original_name} (#{file.id}) from the repository to the working directory"
+        Hyrax.logger.debug "Loading #{file.original_name} (#{file.id}) from the repository to the working directory"
         copy_stream_to_working_directory(id, file.original_name, StringIO.new(file.content))
       end
 
@@ -36,7 +38,7 @@ module Hyrax
       # @return [String] path of the working file
       def copy_stream_to_working_directory(id, name, stream)
         working_path = full_filename(id, name)
-        Rails.logger.debug "Writing #{name} to the working directory at #{working_path}"
+        Hyrax.logger.debug "Writing #{name} to the working directory at #{working_path}"
         FileUtils.mkdir_p(File.dirname(working_path))
         IO.copy_stream(stream, working_path)
         working_path

data/app/services/hyrax/works/migration_service.rb

@@ -10,13 +10,13 @@ module Hyrax
       #   and the original data cleaned up.
       def self.migrate_predicate(predicate_from, predicate_to, works_to_update = ActiveFedora::Base.all)
         migrated = 0
-        Rails.logger.info "*** Migrating #{predicate_from} to #{predicate_to} in #{works_to_update.count} works"
+        Hyrax.logger.info "*** Migrating #{predicate_from} to #{predicate_to} in #{works_to_update.count} works"
         works_to_update.each do |work|
           next unless work.ldp_source.content.include?(predicate_from.to_s)
           migrate_data(predicate_from, predicate_to, work)
           migrated += 1
         end
-        Rails.logger.info "--- Migration Complete (#{migrated} migrated)"
+        Hyrax.logger.info "--- Migration Complete (#{migrated} migrated)"
       end
 
       # @api private
@@ -27,7 +27,7 @@ module Hyrax
         orm.value(predicate_from).each { |val| orm.graph.insert([orm.resource.subject_uri, predicate_to, val.to_s]) }
         orm.graph.delete([orm.resource.subject_uri, predicate_from, nil])
         orm.save
-        Rails.logger.info " Data migrated from #{predicate_from} to #{predicate_to} - id: #{work.id}"
+        Hyrax.logger.info " Data migrated from #{predicate_from} to #{predicate_to} - id: #{work.id}"
       end
     end
   end

data/app/utils/hyrax/test_data_seeders/user_seeder.rb

@@ -25,14 +25,14 @@ module Hyrax
         private
 
         def admin_role
-          unless defined? Role
+          unless ::User.reflect_on_association(:roles)
             logger.warn("Cannot create `Role` because the `hyrda-role-management` gem, or " \
                         "other gem providing a definition for a Role class, is not installed.  " \
                         "For development, you can edit `config/role_map.yml` and add the user's " \
                         "email under the role you want to assign.")
             return
           end
-          @admin_role ||= Role.find_by(name: Hyrax.config.admin_user_group_name)
+          @admin_role ||= Role.find_or_create_by(name: Hyrax.config.admin_user_group_name)
         end
 
         def add_user(email, password, role = nil)
@@ -43,6 +43,7 @@ module Hyrax
           end
           logger.info("   #{email} -- #{created ? 'CREATED' : 'ALREADY EXISTS'}")
           return unless role && !user.roles.include?(role)
+          logger.info("Adding #{role.name} to #{user.email}")
           user.roles << role
           user.save
         end

data/app/validators/hyrax/collection_membership_validator.rb

@@ -16,8 +16,8 @@ module Hyrax
       checker = @multiple_membership_checker.new(item: nil)
       ids = collections_ids(record)
 
-      errors = Array(checker.check(collection_ids: ids))
-      record.errors[:member_of_collection_ids].concat(errors)
+      error = checker.check(collection_ids: ids)
+      record.errors.add(:member_of_collection_ids, error) if error
     end
 
     private

data/app/views/_controls.html.erb

@@ -1,19 +1,15 @@
-<nav class="navbar navbar-default navbar-static-top" role="navigation" aria-label="Root Menu">
-  <div class="container-fluid">
-    <div class="row">
-      <ul class="nav navbar-nav col-sm-5">
-        <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
-          <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
-          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
-          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
-          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
-      </ul><!-- /.nav -->
-      <div class="searchbar-right navbar-right col-sm-7">
-        <%= render partial: 'catalog/search_form' %>
-      </div>
+<nav class="navbar navbar-light bg-light navbar-expand-sm justify-content-between align-items-center px-2 py-3 border-bottom" role="navigation" aria-label="Root Menu">
+    <ul class="nav navbar-nav col-sm-5">
+      <li class="nav-item <%= 'active' if current_page?(hyrax.root_path) %>">
+        <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, class: "nav-link", aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
+      <li class="nav-item <%= 'active' if current_page?(hyrax.about_path) %>">
+        <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, class: "nav-link", aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
+      <li class="nav-item <%= 'active' if current_page?(hyrax.help_path) %>">
+        <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, class: "nav-link", aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
+      <li class="nav-item <%= 'active' if current_page?(hyrax.contact_path) %>">
+        <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, class: "nav-link", aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
+    </ul><!-- /.nav -->
+    <div class="col-sm-7">
+      <%= render partial: 'catalog/search_form' %>
     </div>
-  </div>
-</nav><!-- /.navbar -->
+  </nav><!-- /.navbar -->

data/app/views/_logo.html.erb

@@ -1,4 +1,3 @@
 <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-  <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
   <span class="institution_name"><%= application_name %></span>
 </a>

data/app/views/_masthead.html.erb

@@ -1,22 +1,12 @@
-<header aria-label="header">
-  <nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation" aria-label="masthead">
+<header aria-label="header" class="top-header">
+  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between <%= placement_class %>" role="navigation" aria-label="masthead">
     <h1 class="sr-only"><%= application_name %></h1>
-    <div class="container-fluid">
-      <!-- Brand and toggle get grouped for better mobile display -->
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <%= render '/logo' %>
-      </div>
-
-      <div class="collapse navbar-collapse" id="top-navbar-collapse">
-        <%= render '/user_util_links' %>
-      </div>
+    <%= render '/logo' %>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse justify-content-end" id="top-navbar-collapse">
+      <%= render '/user_util_links' %>
     </div>
   </nav>
 </header>
-

data/app/views/_user_util_links.html.erb

@@ -1,28 +1,26 @@
-<ul id="user_utility_links" class="nav navbar-nav navbar-right">
+<ul id="user_utility_links" class="navbar-nav navbar-dark">
   <%= render 'shared/locale_picker' if available_translations.size > 1 %>
   <% if user_signed_in? %>
-    <li>
+    <li class="nav-item">
       <%= render_notifications(user: current_user) %>
     </li>
-    <li class="dropdown">
-      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
-        <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+        <span><%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
-        <span class="fa fa-user" aria-hidden="true"></span>
-        <span class="caret"></span>
-      <% end %>
-      <ul id="user-util-links" class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
-
-        <li class="divider"></li>
-        <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
-      </ul>
-    </li><!-- /.btn-group -->
+      </a>
+      <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+        <%= link_to "My Profile", hyrax.dashboard_profile_path(current_user), class: 'dropdown-item' %>
+        <%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path, class: "dropdown-item" %>
+        <div class="dropdown-divider"></div>
+        <%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path, class: "dropdown-item" %>
+      </div>
+    </li>
   <% else %>
-    <li>
-      <%= link_to main_app.new_user_session_path do %>
-        <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
+    <li class="nav-item">
+      <%= link_to main_app.new_user_session_path, class: 'nav-link' do %>
+        <span class="fa fa-sign-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
       <% end %>
     </li>
   <% end %>

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

@@ -1,5 +1,5 @@
-<li id="document_<%= document.to_param %>" class="document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
-  <div class="row search-result-wrapper">
+<li id="document_<%= document.to_param %>" class="pb-3 document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
+  <div class="search-result-wrapper row">
     <%= render_document_partials document, blacklight_config.view_config(document_index_view_type).partials, document_counter: document_counter %>
   </div>
 </li>

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

@@ -1,6 +1,6 @@
 <%# container for all documents in index view -%>
 <div id="search-results">
-  <ul class="list-unstyled catalog" start="<%= document_counter_with_offset(0) %>">
+  <ul class="list-unstyled catalog mt-4" start="<%= document_counter_with_offset(0) %>">
     <%= render documents, as: :document %>
   </ul>
 </div>

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

@@ -5,7 +5,7 @@
   <% unless paginator.last_page? || params[:action] == "facet" %>
     <li class="more_facets_link">
       <%= link_to t("more_#{field_name}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: facet_field_label(facet_field.field).pluralize),
-          search_facet_path(id: facet_field.key), class: "more_facets_link" %>
+          search_facet_path(id: facet_field.key), class: "more_facets_link", data: { blacklight_modal: 'trigger' } %>
     </li>
   <% end %>
 </ul>

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

@@ -1,4 +1,4 @@
-<div class="document col-xs-6 col-md-3">
+<div class="document col-6 col-md-3">
   <div class="thumbnail">
     <%= collection_thumbnail(document, {}, counter: document_counter_with_offset(document_counter)) %>
     <div class="caption">

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

@@ -1,4 +1,4 @@
-<div class="search-results-title-row">
-  <h3 class="search-result-title"><%= link_to document.title_or_label, [hyrax, document] %></h3>
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
+  <h3 class="search-result-title mb-0 pr-3"><%= link_to document.title_or_label, [hyrax, document] %></h3>
   <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>

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

@@ -1,5 +1,5 @@
 <% model = document.hydra_model %>
-<div class="search-results-title-row">
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
   <% 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 %>

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

@@ -1,11 +1,13 @@
-<div class="col-md-6">
+<div class="col-md-9 col-lg-6">
   <div class="metadata">
-    <dl class="dl-horizontal">
+    <dl>
     <% doc_presenter = index_presenter(document) %>
     <% index_fields(document).each do |field_name, field| -%>
       <% if should_render_index_field? document, field %>
-          <dt data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
-          <dd><%= doc_presenter.field_value field %></dd>
+        <div class="row">
+          <dt class="col-5 text-right" data-solr-field-name="<%= field_name %>"><%= render_index_field_label document, field: field_name %></dt>
+          <dd class="col-7"><%= doc_presenter.field_value field %></dd>
+        </div>
       <% end %>
     <% end %>
     </dl>
@@ -13,7 +15,7 @@
 </div>
 <% if document.collection? %>
 <% collection_presenter = Hyrax::CollectionPresenter.new(document, current_ability) %>
-<div class="col-md-4">
+<div class="col-md-12 col-lg-3">
   <div class="collection-counts-wrapper">
     <div class="collection-counts-item">
       <span><%= collection_presenter.total_viewable_collections %></span>Collections