hyrax 3.4.2 → 4.0.0.beta1

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

@@ -147,7 +147,7 @@ module Hyrax
       ##
       # @api private
       def self.find_solr_document_by(id:)
-        query = Hyrax::SolrQueryBuilderService.construct_query_for_ids([id])
+        query = Hyrax::SolrQueryService.new.with_ids(ids: [id]).build
         document = Hyrax::SolrService.query(query, rows: 1).first
         document = ActiveFedora::Base.find(id).to_solr if document.nil?
         raise "Unable to find SolrDocument with ID=#{id}" if document.nil?

data/app/services/hyrax/collection_member_service.rb

@@ -5,7 +5,6 @@ module Hyrax
   # Returns a list of solr documents for collections the item is a part of
   class CollectionMemberService
     include Blacklight::Configurable
-    include Blacklight::SearchHelper
 
     attr_reader :item, :current_ability
 
@@ -25,7 +24,7 @@ module Hyrax
 
     def list_collections
       query = collection_search_builder.rows(1000)
-      resp = repository.search(query)
+      resp = blacklight_config.repository.search(query)
       resp.documents
     end
 

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

@@ -3,7 +3,6 @@ module Hyrax
   module Collections
     class SearchService
       include Blacklight::Configurable
-      include Blacklight::SearchHelper
 
       def initialize(session, user_key)
         @session = session

data/app/services/hyrax/custom_queries.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # These custom queries are used throughout the Hyrax codebase. They are
+  # intended for use with Valkyrie's custom query interface (i.e. you
+  # shouldn't call classes in this namespace directly except to configure that
+  # interface).
+  #
+  # In this namespace, we provide default/reference implementations, with the
+  # restriction that they cannot use any adapter-specific knowledge. I.e. these
+  # queries use the Valkyrie core queries and client side data manipulation
+  # only. This restriction limits performance expectations for these
+  # implementations, but guarantees a basic level of compatibility for all
+  # conforming Valkyrie adapters.
+  #
+  # In order for a Valkyrie adapter to be "supported" by Hyrax, these queries
+  # should be individually evaluated for performance when using the adapter.
+  # Where appropriate, optimized implementations should be provided taking
+  # advantage of backend-specific query features.
+  #
+  # @see https://github.com/samvera/valkyrie/wiki/Queries#custom-queries
+  # @see https://github.com/samvera/hyrax/wiki/Hyrax-Valkyrie-Usage-Guide#custom-queriesy
+  module CustomQueries
+  end
+end

data/app/services/hyrax/file_set_csv_service.rb

@@ -8,7 +8,7 @@ module Hyrax
   # @attr_reader [FileSet] file_set file that will be examined to generate the CSVs
   # @attr_reader [Array] terms list of terms that will be output in CSV form
   # @attr_reader [String] multi_value_separator separator for terms that have more than one value
-  class FileSetCSVService
+  class FileSetCsvService
     attr_reader :file_set, :terms, :multi_value_separator
 
     # @param [SolrDocument] file solr document that will be examined to generate the CSVs

data/app/services/hyrax/graph_exporter.rb

@@ -10,11 +10,9 @@ module Hyrax
     # @param [SolrDocument, #id] solr_document idea here is that in the future, ActiveFedora may serialize the object as JSON+LD
     # @param [ActionDispatch::Request] request the http request context
     # @param [String] hostname  the current http host
-    def initialize(solr_document, request = nil, hostname: nil)
-      Deprecation.warn('passing `request` is deprecated; pass a host as `hostname:` instead.') if request
+    def initialize(solr_document, hostname:)
       @solr_document = solr_document
-      @request = request
-      @hostname = hostname || request.host
+      @hostname = hostname
       @additional_resources = []
       @visited_subresources = Set.new
     end
@@ -22,15 +20,12 @@ module Hyrax
     ##
     # @!attribute [r] additional_resources
     #   @return [Array<RDF::Graph>]
-    # @!attribute [r] request
-    #   @deprecated use {#hostname} to access the host
     #   @return [ActionDispatch::Request]
     # @!attribute [r] solr_document
     #   @return [#id]
     # @!attribute [r] hostname
     #   @return [String]
-    attr_reader :solr_document, :request, :additional_resources, :hostname
-    deprecation_deprecate :request
+    attr_reader :solr_document, :additional_resources, :hostname
 
     ##
     # @return [RDF::Graph]

data/app/services/hyrax/iiif_authorization_service.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Hyrax
-  class IIIFAuthorizationService
+  class IiifAuthorizationService
     attr_reader :controller
     def initialize(controller)
       @controller = controller

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

@@ -5,17 +5,6 @@ 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/search_service.rb

@@ -1,66 +1,9 @@
 # frozen_string_literal: true
 
 module Hyrax
-  ##
-  # Returns search results from the repository.
-  #
-  # @note Adapted from Blacklight 7
-  class SearchService
-    def initialize(config:, user_params: nil, search_builder_class: config.search_builder_class, **context)
-      @blacklight_config = config
-      @user_params = user_params || {}
-      @search_builder_class = search_builder_class
-      @context = context
-    end
-
-    # The blacklight_config + controller are accessed by the search_builder
-    attr_reader :blacklight_config, :context
-
-    def search_builder
-      search_builder_class.new(self)
-    end
-
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-    # a solr query method
-    # @yield [search_builder] optional block yields configured SearchBuilder, caller can modify or create new SearchBuilder to be used. Block should return SearchBuilder to be used.
-    # @return [Blacklight::Solr::Response] the solr response object
-    def search_results
-      builder = search_builder.with(user_params)
-      builder.page = user_params[:page] if user_params[:page]
-      builder.rows = (user_params[:per_page] || user_params[:rows]) if user_params[:per_page] || user_params[:rows]
-
-      builder = yield(builder) if block_given?
-      response = repository.search(builder)
-
-      if response.grouped? && grouped_key_for_results
-        [response.group(grouped_key_for_results), []]
-      elsif response.grouped? && response.grouped.length == 1
-        [response.grouped.first, []]
-      else
-        [response, response.documents]
-      end
-    end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-    # retrieve a document, given the doc id
-    # @param [Array{#to_s},#to_s] id
-    # @return [Blacklight::Solr::Response, Blacklight::SolrDocument] the solr response object and the first document
-    def fetch(id = nil, extra_controller_params = {})
-      if id.is_a? Array
-        fetch_many(id, extra_controller_params)
-      else
-        fetch_one(id, extra_controller_params)
-      end
-    end
-
+  class SearchService < Blacklight::SearchService
     private
 
-    attr_reader :search_builder_class, :user_params, :search_state
-
-    def repository
-      blacklight_config.repository || blacklight_config.repository_class.new(blacklight_config)
-    end
-
     def scope
       @context[:scope]
     end
@@ -83,28 +26,5 @@ module Hyrax
     def current_ability
       @current_ability || @context[:current_ability]
     end
-
-    ##
-    # Retrieve a set of documents by id
-    # @param [Array] ids
-    # @param [HashWithIndifferentAccess] extra_controller_params
-    def fetch_many(ids, extra_controller_params)
-      extra_controller_params ||= {}
-
-      query = search_builder
-              .with(user_params)
-              .where(blacklight_config.document_model.unique_key => ids)
-              .merge(blacklight_config.fetch_many_document_params)
-              .merge(extra_controller_params)
-
-      solr_response = repository.search(query)
-
-      [solr_response, solr_response.documents]
-    end
-
-    def fetch_one(id, extra_controller_params)
-      solr_response = repository.find id, extra_controller_params
-      [solr_response, solr_response.documents.first]
-    end
   end
 end

data/app/services/hyrax/statistics/depositors/summary.rb

@@ -5,8 +5,6 @@ module Hyrax
       ##
       # Gather information about the depositors who have contributed to the repository
       class Summary
-        include Blacklight::SearchHelper
-
         # @api public
         # @param [Time] start_date optionally specify the start date to gather the stats from
         # @param [Time] end_date optionally specify the end date to gather the stats from
@@ -43,7 +41,7 @@ module Hyrax
         # [ abc123, 55, ccczzz, 205 ]
         # @return [#each] an enumerable object of tuples (user and count)
         def results
-          facet_results = repository.search(query)
+          facet_results = blacklight_config.repository.search(query)
           facet_results.facet_fields[depositor_field].each_slice(2)
         end
 

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
@@ -91,4 +91,16 @@ module Hyrax::ValkyrieUpload
       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/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/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,6 +11,7 @@ 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)

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

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

@@ -1,43 +1,41 @@
-<%= form_tag search_form_action, method: :get, class: "form-horizontal search-form", id: "search-form-header", role: "search" do %>
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+<%= form_tag search_form_action, method: :get, class: "search-form", id: "search-form-header", role: "search" do %>
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <%= hidden_field_tag :search_field, 'all_fields' %>
-  <div class="form-group">
+  <div class="form-group row">
 
-    <label class="control-label col-sm-3" for="search-field-header">
+    <label class="col-sm-3 mb-0" for="search-field-header">
       <%= t("hyrax.search.form.q.label", application_name: application_name) %>
     </label>
 
-    <div class="input-group">
+    <div class="input-group col-sm-9">
       <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
-      <div class="input-group-btn">
+      <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>
         </button>
         <% if current_user %>
-          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+          <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
             <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
-            <span class="caret"></span>
           </button>
 
-          <ul class="dropdown-menu pull-right">
-            <li>
+          <ul class="dropdown-menu dropdown-menu-right">
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
                   data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
                   data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          <% end %>
-
-        </ul>
+          </ul>
+        <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
     

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

@@ -1,4 +1,4 @@
-<div class="col-md-2">
-  <%= render_thumbnail_tag document, {}, suppress_link: true %>
+<div class="col-md-3">
+  <%= document_presenter(document)&.thumbnail&.thumbnail_tag({}, { suppress_link: true }) %>
 </div> 
 

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

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

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

@@ -0,0 +1,21 @@
+<%# Blacklight 7.24.0 %>
+<%# Override app/views/catalog/facet.html.erb %>
+
+<%= render Blacklight::System::ModalComponent.new do |component| %>
+  <%# Removed component prefix that duplicates the facet pagination view %>
+
+  <% component.title { facet_field_label(@facet.key) } %>
+
+  <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
+
+  <div class="facet-extended-list">
+    <%= render_facet_limit(@display_facet, layout: false) %>
+  </div>
+
+  <%# Removed component footer and placed the facet pagination partial within a `container` div %>
+  <div class="container">
+    <div class="facet-pagination bottom row justify-content-between">
+      <%= render :partial=>'facet_pagination' %>
+    </div>
+  </div>
+<% end %>

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

@@ -1,7 +1,9 @@
-<div id="content" class="col-md-9 col-md-push-3 col-sm-8 col-sm-push-4">
+<div class="row mt-4">
+  <div id="content" class="order-sm-1 order-md-2 col-md-9 col-sm-12">
     <%= render 'search_results' %>
-</div>
+  </div>
 
-<div id="sidebar" class="col-md-3 col-md-pull-9 col-sm-4 col-sm-pull-8">
-  <%= render 'search_sidebar' %>
+  <div id="sidebar" class="order-sm-2 order-md-1 col-md-3 col-sm-12">
+    <%= render 'search_sidebar' %>
+  </div>
 </div>