blacklight-spotlight 5.3.2 → 6.0.0.rc2

data/app/models/spotlight/contact_email.rb

@@ -33,8 +33,8 @@ module Spotlight
       errors.add :email, 'is not valid' if parsed.nil? || parsed.address != email || parsed.local == email
     end
 
-    def send_devise_notification(notification, *args)
-      notice = notification_mailer.send(notification, self, *args, exhibit:)
+    def send_devise_notification(notification, *)
+      notice = notification_mailer.send(notification, self, *, exhibit:)
       if notice.respond_to? :deliver_now
         notice.deliver_now
       else

data/app/models/spotlight/custom_field.rb

@@ -59,6 +59,19 @@ module Spotlight
         end
     end
 
+    # The component used to render the field on the upload and edit forms,
+    # from the `component` option of the field's entry in Spotlight::Engine.config.custom_field_types
+    def component
+      component = field_type_config[:component]
+      return Spotlight::SidecarFormFieldComponent if component.blank?
+
+      component.is_a?(String) ? component.constantize : component
+    end
+
+    def form_field_type
+      field_type_config.fetch(:form_field_type, :text_field)
+    end
+
     def solr_field
       if field&.starts_with?(solr_field_prefix)
         # backwards compatibility with pre-0.9 custom fields
@@ -70,6 +83,10 @@ module Spotlight
 
     protected
 
+    def field_type_config
+      Spotlight::Engine.config.custom_field_types.fetch(field_type.to_s.to_sym, {})
+    end
+
     def blacklight_configuration
       exhibit&.blacklight_configuration
     end

data/app/models/spotlight/exhibit.rb

@@ -5,6 +5,8 @@ module Spotlight
   ##
   # Spotlight exhibit
   class Exhibit < ActiveRecord::Base
+    PUBLISHING_STATUSES = %w[unpublished previewable discoverable].freeze
+
     class_attribute :themes_selector
     include Spotlight::ExhibitAnalytics
     include Spotlight::ExhibitDefaults
@@ -17,6 +19,8 @@ module Spotlight
 
     scope :published, -> { where(published: true) }
     scope :unpublished, -> { where(published: false) }
+    scope :previewable, -> { published.where(discovery_enabled: false) }
+    scope :discoverable, -> { published.where(discovery_enabled: true) }
     scope :ordered_by_weight, -> { order(:weight) }
 
     paginates_per 48
@@ -96,6 +100,30 @@ module Spotlight
       searches.published.any?
     end
 
+    # Published, but only viewable by people with the exhibit link
+    def previewable?
+      published? && !discovery_enabled?
+    end
+
+    # Published, and included on the home page and in the sitemap
+    def discoverable?
+      published? && discovery_enabled?
+    end
+
+    def publishing_status
+      return 'unpublished' unless published?
+
+      discovery_enabled? ? 'discoverable' : 'previewable'
+    end
+
+    def publishing_status=(status)
+      status = status.to_s
+      return unless PUBLISHING_STATUSES.include?(status)
+
+      self.published = status != 'unpublished'
+      self.discovery_enabled = status != 'previewable'
+    end
+
     def themes
       @themes ||= begin
         return Spotlight::Engine.config.exhibit_themes unless self.class.themes_selector

data/app/models/spotlight/featured_image.rb

@@ -38,7 +38,7 @@ module Spotlight
     # If the image is local, this step will fail, which is okay since the only
     # consumer is CSV uploads and the URL is intended to be remote
     def remote_image_url=(url)
-      super url unless url.starts_with? '/'
+      super unless url.starts_with? '/'
     end
 
     def document

data/app/models/spotlight/field_metadata.rb

@@ -24,11 +24,16 @@ module Spotlight
     end
 
     def search_params
-      search_service.search_builder.merge(rows: 0, 'facet.limit' => FACET_LIMIT + 1)
+      search_service.search_builder.with(search_state).merge(rows: 0, 'facet.limit' => FACET_LIMIT + 1)
     end
 
     private
 
+    # Field metadata queries aren't scoped to a user query, so use an empty search state
+    def search_state
+      Blacklight::SearchState.new({}, blacklight_config)
+    end
+
     def field_name(key)
       if blacklight_config.facet_fields[key]
         blacklight_config.facet_fields[key].field
@@ -38,15 +43,15 @@ module Spotlight
     end
 
     def solr_response
-      @solr_response ||= repository.search(search_params.merge('facet.query' => facet_fields.map { |_key, fields| "#{fields.field}:[* TO *]" },
-                                                               'rows' => 0,
-                                                               'facet' => true))
+      @solr_response ||= repository.search(params: search_params.merge('facet.query' => facet_fields.map { |_key, fields| "#{fields.field}:[* TO *]" },
+                                                                       'rows' => 0,
+                                                                       'facet' => true))
     end
 
     # This gets the number of *documents* with a field
     def document_counts
       @document_count ||= solr_response.facet_queries.each_with_object({}) do |(k, v), h|
-        h[k.split(/:/).first] = v
+        h[k.split(':').first] = v
       end
     end
 

data/app/models/spotlight/job_tracker.rb

@@ -43,12 +43,6 @@ module Spotlight
       @job_status ||= ActiveJob::Status.get(job_id)
     end
 
-    def progress_label
-      return number_with_delimiter(progress) unless total?
-
-      "#{number_with_delimiter(progress)} / #{number_with_delimiter(total)}"
-    end
-
     def progress
       data[:progress] || job_status[:progress] || 0
     end
@@ -61,12 +55,6 @@ module Spotlight
       total(default: 0).positive?
     end
 
-    def percent
-      return nil unless total?
-
-      (100.0 * progress) / total
-    end
-
     def status
       @status ||= super
       @status ||= 'missing'
@@ -104,11 +92,5 @@ module Spotlight
         self
       end
     end
-
-    private
-
-    def number_with_delimiter(*args)
-      ActiveSupport::NumberHelper.number_to_delimited(*args)
-    end
   end
 end

data/app/models/spotlight/main_navigation.rb

@@ -22,8 +22,8 @@ module Spotlight
       label.presence || default_label
     end
 
-    def default_label(**options)
-      I18n.t(:"spotlight.main_navigation.#{nav_type}", **options)
+    def default_label(**)
+      I18n.t(:"spotlight.main_navigation.#{nav_type}", **)
     end
 
     private

data/app/models/spotlight/page.rb

@@ -74,7 +74,7 @@ module Spotlight
 
     def content=(content)
       if content.is_a? Array
-        super content.to_json
+        super(content.to_json)
       else
         super
       end
@@ -167,12 +167,12 @@ module Spotlight
       end
     end
 
-    private
-
     def default_locale?
       locale.to_sym == I18n.default_locale
     end
 
+    private
+
     def parent_page_for(locale)
       parent_page&.translated_page_for(locale)
     end

data/app/models/spotlight/resources/iiif_harvester.rb

@@ -33,13 +33,16 @@ module Spotlight
 
       def url_is_iiif?(url)
         valid_content_types = ['application/json', 'application/ld+json']
-        req = Spotlight::Resources::IiifService.http_client.head(url)
-        req = Spotlight::Resources::IiifService.http_client.get(url) if req.status == 405
-        return unless req.success?
+        req = Spotlight::Resources::IiifService.fetch(:head, url)
+        req = Spotlight::Resources::IiifService.fetch(:get, url) if req.code == '405'
+        return unless req.is_a?(Net::HTTPSuccess)
 
         valid_content_types.any? do |valid_type|
-          req.headers['content-type'].include?(valid_type)
+          req['content-type'].to_s.include?(valid_type)
         end
+      rescue *Spotlight::Resources::IiifService::FETCH_ERRORS => e
+        Rails.logger.warn("Unable to fetch #{url}: #{e.message}")
+        false
       end
     end
   end

data/app/models/spotlight/resources/iiif_manifest.rb

@@ -28,10 +28,6 @@ module Spotlight
         solr_hash
       end
 
-      def with_exhibit(e)
-        @exhibit = e
-      end
-
       def compound_id
         Digest::MD5.hexdigest("#{exhibit.id}-#{url}")
       end

data/app/models/spotlight/resources/iiif_manifest_metadata.rb

@@ -120,13 +120,11 @@ module Spotlight
           if value.key? '@value'
             value['@value']
             # IIIF v3 multilingual(?), multivalued(?) values
-            # If all of the values are associated with the none key, the client must display all of those values.
-          elsif value.keys == ['none']
-            value['none']
             # If any of the values have a language associated with them, the client must display all of the values associated with the language
             # that best matches the language preference.
           elsif value.key? default_json_ld_language
             value[default_json_ld_language]
+            # If all of the values are associated with the none key, the client must display all of those values.
             # If some of the values have a language associated with them, but none match the language preference, the client must display all
             # of the values that do not have a language associated with them.
           elsif value.key? 'none'

data/app/models/spotlight/resources/iiif_service.rb

@@ -2,12 +2,21 @@
 
 require 'iiif/presentation'
 require 'iiif/v3/presentation'
+require 'ssrf_filter'
 module Spotlight
   module Resources
     ###
     # Wrapper around IIIF-Presentation's IIIF::Service that provides the
     # ability to recursively traverse through all collections and manifests
     class IiifService
+      # Errors from a failed fetch, covering what Faraday::ConnectionFailed used to wrap
+      FETCH_ERRORS = [
+        SsrfFilter::Error, URI::Error, IOError, SocketError, SystemCallError, Timeout::Error,
+        Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
+        OpenSSL::SSL::SSLError, Zlib::Error
+      ].freeze
+      MAX_REDIRECTS = 3
+
       def initialize(url)
         @url = url
       end
@@ -32,11 +41,17 @@ module Spotlight
         recursive_manifests(new(url))
       end
 
-      def self.http_client
-        Faraday.new do |b|
-          b.response :follow_redirects
-          b.adapter Faraday.default_adapter
+      # SsrfFilter only resolves redirects whose Location starts with "/", so
+      # follow them here instead; each hop still goes through SsrfFilter.
+      def self.fetch(verb, url, **)
+        (MAX_REDIRECTS + 1).times do
+          response = SsrfFilter.public_send(verb, url, max_redirects: 0, allow_unfollowed_redirects: true, **)
+          return response unless response.is_a?(Net::HTTPRedirection) && response['location']
+
+          url = URI.join(url, response['location']).to_s
         end
+
+        raise SsrfFilter::TooManyRedirects, "Got #{MAX_REDIRECTS} redirects fetching #{url}"
       end
 
       protected
@@ -64,8 +79,8 @@ module Spotlight
 
       class << self
         def iiif_response(url)
-          Spotlight::Resources::IiifService.http_client.get(url).body
-        rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+          fetch(:get, url, http_options: { response_body_encoding: true }).body
+        rescue *FETCH_ERRORS => e
           Rails.logger.warn("HTTP GET for #{url} failed with #{e}")
           {}.to_json
         end

data/app/models/spotlight/resources/upload.rb

@@ -23,6 +23,12 @@ module Spotlight
         end
       end
 
+      def self.as_strong_params(exhibit)
+        fields(exhibit).map do |field|
+          field.is_multiple? ? { field.field_name => [] } : field.field_name
+        end
+      end
+
       def self.indexing_pipeline
         @indexing_pipeline ||= super.dup.tap do |pipeline|
           pipeline.transforms = [

data/app/models/spotlight/search.rb

@@ -52,14 +52,14 @@ module Spotlight
 
     def documents(&)
       start = 0
-      response = repository.search(search_params.start(start))
+      response = repository.search(params: search_params.start(start))
 
       return to_enum(:documents) { response['response']['numFound'] } unless block_given?
 
       while response.documents.present?
         response.documents.each(&)
         start += response.documents.length
-        response = repository.search(search_params.start(start))
+        response = repository.search(params: search_params.start(start))
       end
     end
 
@@ -75,20 +75,16 @@ module Spotlight
 
     delegate :blacklight_config, to: :exhibit
 
-    def display_masthead?
-      masthead&.display?
-    end
-
     def search_params
-      search_service.search_builder.with(base_search_state).merge(facet: false)
+      search_service.search_builder.with(search_state).merge(facet: false)
     end
 
     def merge_params_for_search(params, blacklight_config)
       user_query = Blacklight::SearchState.new(params, blacklight_config, nil).to_h
-      base_search_state.params_for_search(user_query).merge(user_query.slice(:page))
+      search_state.params_for_search(user_query).merge(user_query.slice(:page))
     end
 
-    def base_search_state
+    def search_state
       Blacklight::SearchState.new((query_params || {}).with_indifferent_access, blacklight_config, nil)
     end
 

data/app/models/spotlight/solr_document_sidecar.rb

@@ -22,6 +22,8 @@ module Spotlight
 
     delegate :has_key?, :key?, to: :data
 
+    before_save :strip_blank_values_from_data
+
     def to_solr
       { document.class.unique_key.to_sym => document.id,
         visibility_field => public? }
@@ -48,6 +50,22 @@ module Spotlight
 
     private
 
+    # Remove blank entries (e.g. from an empty "Add another value" input) from multivalued fields
+    def strip_blank_values_from_data
+      self.data = strip_blank_values(data)
+    end
+
+    def strip_blank_values(value)
+      case value
+      when Array
+        value.compact_blank
+      when Hash
+        value.transform_values { |v| strip_blank_values(v) }
+      else
+        value
+      end
+    end
+
     def document_type_class
       return default_document_type unless document_type.is_a?(String)
 

data/app/services/spotlight/bulk_updates_csv_template_service.rb

@@ -74,7 +74,7 @@ module Spotlight
       until next_cursor_mark == cursor_mark || next_cursor_mark.nil?
         cursor_mark = next_cursor_mark
         response = exhibit.blacklight_config.repository.search(
-          solr_params.merge(
+          params: solr_params.merge(
             'q' => '*',
             'rows' => Spotlight::Engine.config.bulk_actions_batch_size,
             'cursorMark' => cursor_mark,

data/app/services/spotlight/etl/pipeline.rb

@@ -58,8 +58,8 @@ module Spotlight
       # @param [Hash] data the initial data structure to pass through to the transform steps
       # @yield (optioanlly..) each transformed document after it is transformed but before
       #        it is sent to the loaders
-      def call(context, data: {}, cache: nil, &block)
-        executor(context, cache:).call(data:, &block)
+      def call(context, data: {}, cache: nil, &)
+        executor(context, cache:).call(data:, &)
       end
 
       ##

data/app/services/spotlight/etl/step.rb

@@ -37,8 +37,8 @@ module Spotlight
       end
       # rubocop:enable Metrics/MethodLength
 
-      def finalize(*args)
-        action.finalize(*args) if action.respond_to? :finalize
+      def finalize(*)
+        action.finalize(*) if action.respond_to? :finalize
       end
 
       private

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

@@ -20,8 +20,8 @@
         <% end %>
 
         <div class="form-group mb-3 mt-4">
-          <%= label_tag :tags, t(:'spotlight.bulk_actions.remove_tags.label') %>
-          <%= render Spotlight::TagSelectorComponent.new(field_name: :tags, all_tags: current_exhibit.owned_tags) %>
+          <%= label_tag 'remove_tags', t(:'spotlight.bulk_actions.remove_tags.label') %>
+          <%= render Spotlight::TagSelectorComponent.new(field_name: :tags, id: 'remove_tags', all_tags: current_exhibit.owned_tags) %>
         </div>
         <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search) %>
       </div>

data/app/views/layouts/spotlight/base.html.erb

@@ -15,8 +15,6 @@
     <% end %>
     <%= javascript_tag "window.sirTrevorIcon = '#{asset_path('spotlight/blocks/sir-trevor-icons.svg')}'" %>
 
-    <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.serializeJSON/3.2.1/jquery.serializejson.min.js"></script>
     <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
     <%= javascript_tag 'L.Icon.Default.prototype.options.imagePath = "https://unpkg.com/leaflet@1.9.4/dist/images/"' %>
     <%= javascript_include_tag 'leaflet-iiif', "data-turbo-track": "reload", defer: true %>
@@ -25,7 +23,7 @@
     <% if defined? Importmap %>
       <%= javascript_importmap_tags %>
     <% else %>
-      <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
     <% end %>
     <%= csrf_meta_tags %>
     <%= content_for(:head) %>
@@ -36,15 +34,14 @@
       <% add_exhibit_meta_content %>
     <% end %>
     <%= yield(:meta) %>
-    <%= javascript_tag "window.addEventListener('load', () => $.fx.off = true)" if Rails.env.test? %>
   </head>
   <body class="<%= render_body_class %>">
     <%= render partial: 'shared/body_preamble' %>
     <%= render blacklight_config.skip_link_component.new(render_search_link: should_render_spotlight_search_bar?) do %>
       <%= content_for(:skip_links) %>
     <% end %>
-    <%= render partial: 'shared/header_navbar' %>
-    <%= render partial: 'shared/masthead' %>
+    <%= render blacklight_config.header_component.new(blacklight_config:) %>
+    <%= render Spotlight::MastheadComponent.new(current_exhibit:, current_masthead:, resource_masthead: resource_masthead?) %>
     <%= content_for?(:header_content) ? yield(:header_content) : "" %>
 
     <main id="main-container" class="<%= container_classes %>" aria-label="<%= t('blacklight.main.aria.main_container') %>">

data/app/views/layouts/spotlight/spotlight.html.erb

@@ -1,10 +1,10 @@
 <% content_for(:content) do %>
   <% if content? :sidebar %>
-    <aside id="sidebar" class="<%= sidebar_classes %> <%= content_for(:sidebar_position) %>" aria-label="<%= t('blacklight.search.documents.aria.limit_search') %>">
+    <aside id="sidebar" class="<%= sidebar_classes %> <%= content_for(:sidebar_position) %>">
       <%= content_for(:sidebar) %>
     </aside>
 
-    <section id="content" class="<%= main_content_classes %> <%= content_for(:content_position) %>" aria-label="<%= t('blacklight.search.search_results') %>">
+    <section id="content" class="<%= main_content_classes %> <%= content_for(:content_position) %>">
       <%= yield %>
     </section>
   <% else %>

data/app/views/shared/_analytics.html.erb

@@ -1,14 +1,15 @@
-<% if Spotlight::Engine.config.ga_web_property_id %>
+<% ga_id = Spotlight::Engine.config.ga_measurement_id.presence || Spotlight::Engine.config.ga_web_property_id %>
+<% if ga_id.present? %>
 <!-- Google tag (gtag.js) -->
 <% if Spotlight::Engine.config.ga_debug_mode %>
 <script>window.analyticsDebug = true;</script>
 <% end %>
-<script async src="https://www.googletagmanager.com/gtag/js?id=<%= Spotlight::Engine.config.ga_web_property_id %>"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id=<%= ga_id %>"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag() { dataLayer.push(arguments); }
   var opts = window.analyticsDebug ? {'debug_mode': true} : {};
   gtag("js", new Date());
-  gtag("config", "<%= Spotlight::Engine.config.ga_web_property_id %>", opts);
+  gtag("config", "<%= ga_id %>", opts);
 </script>
 <% end %>

data/app/views/shared/_masthead.html.erb

@@ -1,18 +1,2 @@
-<% if show_contact_form? && (current_exhibit.nil? || !current_page?(spotlight.new_exhibit_contact_form_path(current_exhibit))) %>
-  <div id="report-problem-form" class="collapse">
-    <%= render 'spotlight/shared/report_a_problem' %>
-  </div>
-<% end %>
-
-<header class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>">
-  <% if current_masthead %>
-    <span class="background-container" style="background-image: url('<%= current_masthead.iiif_url %>')"></span>
-    <span class="background-container-gradient"></span>
-  <% end %>
-
-  <%= render current_exhibit ? 'shared/exhibit_navbar' : 'shared/site_navbar' if resource_masthead? %>
-  <%= render Spotlight::Engine.config.spotlight.title_component.new(title: content_for(:masthead) || masthead_heading_content, subtitle: masthead_subheading_content) %>
-  <%= render current_exhibit ? 'shared/exhibit_navbar' : 'shared/site_navbar' unless resource_masthead? %>
-</header>
-
-<%= render Spotlight::BreadcrumbsComponent.new(breadcrumbs:) %>
+<% Spotlight.deprecator.warn "Rendering deprecated partial shared/masthead. Use MastheadComponent instead" %>
+<%= render Spotlight::MastheadComponent.new(current_exhibit:, current_masthead:, resource_masthead: resource_masthead?) %>

data/app/views/spotlight/about_pages/_empty.html.erb

@@ -19,7 +19,7 @@
         Use the checkbox in the <b>Options</b> tab to publish or unpublish the page.
       </li>
       <li>
-        Visit the Spotlight <%= link_to 'documentation pages', 'https://github.com/projectblacklight/spotlight/wiki' %> to learn more about creating exhibit pages.
+        Visit the Spotlight <%= link_to 'documentation pages', 'https://github.com/projectblacklight/spotlight/wiki', class: "alert-link" %> to learn more about creating exhibit pages.
       </li>
     </ol>
   </div>

data/app/views/spotlight/about_pages/_sidebar.html.erb

@@ -1,12 +1,14 @@
 <% cache_unless current_user, [current_exhibit, @page, I18n.locale] do %>
-  <h2 class="nav-heading h4"><%= current_exhibit.main_navigations.about.label_or_default %></h2>
-  <ul class="nav sidenav flex-column">
-    <% current_exhibit.about_pages.for_locale.published.each do |page| %>
-      <li class="nav-item <%= 'active' if current_page? [spotlight, current_exhibit, page] %>">
-        <%= link_to page.title, [spotlight, current_exhibit, page], class: 'nav-link' %>
-      </li>
-    <% end %>
-  </ul>
+  <nav aria-labelledby="about-pages-h">
+    <h2 id="about-pages-h" class="nav-heading h4"><%= current_exhibit.main_navigations.about.label_or_default %></h2>
+    <ul class="nav sidenav flex-column">
+      <% current_exhibit.about_pages.for_locale.published.each do |page| %>
+        <li class="nav-item <%= 'active' if current_page? [spotlight, current_exhibit, page] %>">
+          <%= link_to page.title, [spotlight, current_exhibit, page], class: 'nav-link' %>
+        </li>
+      <% end %>
+    </ul>
+  </nav>
   <%= cache [current_exhibit, I18n.locale] do %>
     <%= render 'contacts' if current_exhibit.contacts.published.present? %>
   <% end %>

data/app/views/spotlight/browse/_search.html.erb

@@ -5,11 +5,11 @@
       <div class="image-overlay">
         <%= image_tag(search.thumbnail_image_url || 'spotlight/default_browse_thumbnail.jpg', class: 'img-responsive', alt: '') %>
         <div class="text-overlay">
-           <h2 class="browse-category-title">
+           <h3 class="browse-category-title">
              <span class="title"><%= search.title %></span>
              <% if search.subtitle.present? %><span class="category-subtitle"><%= search.subtitle %></span><% end %>
              <small class="item-count"><%= t :'spotlight.browse.search.item_count', count: search.count %></small>
-           </h2>
+           </h3>
          </div>
       </div>
     <% end %>

data/app/views/spotlight/browse/_search_box.html.erb

@@ -1,7 +1,7 @@
 <div class="search-box-container">
   <%= form_tag exhibit_browse_path(current_exhibit, search), method: :get, class: 'browse-search-form search-query-form form-horizontal', role: 'search', 'aria-labelledby' => 'browse-search-form' do %>
     <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :exhibit_id, :qt, :page)) %>
-    <div class="form-group mb-5 row">
+    <div class="form-group mb-3 row">
       <label id="browse-search-form" class="col-sm-4 col-form-label h6" for="browse_q"><%= t(:'.label') %></label>
       <div class="col-sm-6">
         <div class="input-group">
@@ -18,22 +18,14 @@
       </div>
     </div>
   <% end %>
-  <% if params[:q].present? %>
-    <div class="browse-search-expand">
+  <div class="text-center">
+    <p><%= link_to(t(:'.view_search'), path_to_saved_search(search)) %></p>
+    <% if params[:q].present? %>
       <% if @response.size > 0 %>
         <p><%= t(:'.success.result_number_html', search_size: @response.size, parent_search_count: parent_search_count) %></p>
-        <p><%= t(:'.success.expand_html',
-                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:q]),
-                  browse_query: params[:q]) %>
-        </p>
       <% else %>
         <p><%= t(:'.zero_results.result_number') %></p>
-        <p><%= t(:'.zero_results.expand_html',
-                  clear_search_url: exhibit_browse_path(current_exhibit, search),
-                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:q]),
-                  browse_query: params[:q]) %>
-        </p>
       <% end %>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 </div>

data/app/views/spotlight/browse/index.html.erb

@@ -1,6 +1,6 @@
 <% title = current_exhibit.main_navigations.browse.label_or_default %>
 <% set_html_page_title(title) %>
-<h1 class="visually-hidden"><%= title %></h1>
+<h2 class="visually-hidden"><%= title %></h2>
 
 <% if @groups.any? # active %>
   <ul class="browse-group-navigation nav nav-pills justify-content-center">