blacklight-spotlight 4.1.2 → 4.3.0

data/app/models/concerns/spotlight/exhibit_documents.rb

@@ -8,7 +8,7 @@ module Spotlight
     # filtered by the exhibit-specific solr field.
     #
     # @return [Enumerable<SolrDocument>]
-    def solr_documents(&block)
+    def solr_documents(&)
       return to_enum(:solr_documents) unless block_given?
 
       start = 0
@@ -17,7 +17,7 @@ module Spotlight
       response = repository.search(search_params.start(start).to_h)
 
       while response.documents.present?
-        response.documents.each(&block)
+        response.documents.each(&)
         start += response.documents.length
         response = repository.search(search_params.start(start).to_h)
       end

data/app/models/concerns/spotlight/solr_document/finder.rb

@@ -19,17 +19,17 @@ module Spotlight
           @index ||= blacklight_config.repository_class.new(blacklight_config)
         end
 
-        def find_each(&block)
+        def find_each(&)
           return to_enum(:find_each) unless block_given?
 
           start = 0
           search_params = { q: '*:*', fl: 'id', facet: false }
-          response = index.search(search_params.merge(start: start))
+          response = index.search(search_params.merge(start:))
 
           while response.documents.present?
-            response.documents.each(&block)
+            response.documents.each(&)
             start += response.documents.length
-            response = index.search(search_params.merge(start: start))
+            response = index.search(search_params.merge(start:))
           end
         end
 

data/app/models/concerns/spotlight/solr_document.rb

@@ -87,7 +87,7 @@ module Spotlight
     end
 
     def sidecar(exhibit)
-      sidecars.find_or_initialize_by exhibit: exhibit, document_id: id, document_type: self.class.to_s
+      sidecars.find_or_initialize_by exhibit:, document_id: id, document_type: self.class.to_s
     end
 
     def to_solr
@@ -156,12 +156,12 @@ module Spotlight
       deep_compact(attributes)
     end
 
-    def deep_transform_values(object, &block)
+    def deep_transform_values(object, &)
       # Available in Rails 6
       if object.respond_to?(:deep_transform_values)
-        object.deep_transform_values(&block)
+        object.deep_transform_values(&)
       else
-        _deep_transform_values(object, &block)
+        _deep_transform_values(object, &)
       end
     end
 

data/app/models/concerns/spotlight/translatables.rb

@@ -32,7 +32,7 @@ module Spotlight
         define_method(:"translated_#{attr_name}") do |default: [], **options|
           default = Array.wrap(default)
           default.prepend(attr_translation(attr_name)) if I18n.locale == I18n.default_locale
-          I18n.t(attr_name, scope: slug, default: default, **options).presence
+          I18n.t(attr_name, scope: slug, default:, **options).presence
         end
       end
     end

data/app/models/spotlight/analytics/ga.rb

@@ -37,8 +37,8 @@ module Spotlight
           filter: Google::Analytics::Data::V1beta::Filter.new(
             field_name: 'pagePath',
             string_filter: Google::Analytics::Data::V1beta::Filter::StringFilter.new(
-              match_type: :BEGINS_WITH,
-              value: path.to_s
+              match_type: :PARTIAL_REGEXP,
+              value: "^#{path}(/.*)?$"
             )
           )
         )
@@ -115,7 +115,7 @@ module Spotlight
 
         @report_data = report_data
 
-        OpenStruct.new({ rows: rows, totals: totals })
+        OpenStruct.new({ rows:, totals: })
       end
 
       private

data/app/models/spotlight/attachment.rb

@@ -8,7 +8,7 @@ module Spotlight
     mount_uploader :file, Spotlight::AttachmentUploader
 
     def as_json(options = nil)
-      file.as_json(options).merge(name: name, uid: uid, attachment: to_global_id)
+      file.as_json(options).merge(name:, uid:, attachment: to_global_id)
     end
   end
 end

data/app/models/spotlight/background_job_progress.rb

@@ -20,7 +20,7 @@ module Spotlight
         finished_at: localized_finish_time,
         updated_at: localized_updated_time,
         total: [total, completed].max,
-        completed: completed,
+        completed:,
         finished: finished?,
         errored: errored?
       }

data/app/models/spotlight/contact_email.rb

@@ -33,7 +33,7 @@ module Spotlight
     end
 
     def send_devise_notification(notification, *args)
-      notice = notification_mailer.send(notification, self, *args, exhibit: exhibit)
+      notice = notification_mailer.send(notification, self, *args, exhibit:)
       if notice.respond_to? :deliver_now
         notice.deliver_now
       else

data/app/models/spotlight/contact_form.rb

@@ -19,8 +19,8 @@ module Spotlight
 
     def headers
       {
-        to: to,
-        subject: I18n.t(:'spotlight.contact_form.subject', application_name: application_name),
+        to:,
+        subject: I18n.t(:'spotlight.contact_form.subject', application_name:),
         cc: contact_emails.join(', ')
       }
     end

data/app/models/spotlight/custom_field.rb

@@ -34,7 +34,7 @@ module Spotlight
     end
 
     def label
-      conf = if field && blacklight_configuration && blacklight_configuration.index_fields.key?(field)
+      conf = if field && blacklight_configuration&.index_fields&.key?(field)
                blacklight_configuration.index_fields[field].reverse_merge(configuration)
              else
                configuration
@@ -74,7 +74,7 @@ module Spotlight
     end
 
     def update_blacklight_configuration_label(label)
-      return unless field && blacklight_configuration && blacklight_configuration.index_fields.key?(field)
+      return unless field && blacklight_configuration&.index_fields&.key?(field)
 
       blacklight_configuration.index_fields[field]['label'] = label
       blacklight_configuration.save

data/app/models/spotlight/custom_search_field.rb

@@ -17,7 +17,7 @@ module Spotlight
     end
 
     def label
-      conf = if slug && blacklight_configuration && blacklight_configuration.search_fields.key?(slug)
+      conf = if slug && blacklight_configuration&.search_fields&.key?(slug)
                blacklight_configuration.search_fields[slug].reverse_merge(configuration)
              else
                configuration
@@ -32,7 +32,7 @@ module Spotlight
     end
 
     def update_blacklight_configuration_label(label)
-      return unless slug && blacklight_configuration && blacklight_configuration.search_fields.key?(slug)
+      return unless slug && blacklight_configuration&.search_fields&.key?(slug)
 
       blacklight_configuration.search_fields[slug]['label'] = label
       blacklight_configuration.save

data/app/models/spotlight/job_tracker.rb

@@ -92,7 +92,7 @@ module Spotlight
     end
 
     def append_log_entry(type:, exhibit: nil, **args)
-      events.create(type: type, exhibit: exhibit, data: args)
+      events.create(type:, exhibit:, data: args)
     rescue StandardError => e
       Rails.logger.error("Unable to create log entry for job tracker #{id}: #{e}")
     end

data/app/models/spotlight/page.rb

@@ -31,7 +31,7 @@ module Spotlight
     scope :at_top_level, -> { where(parent_page_id: nil) }
     scope :published, -> { where(published: true) }
     scope :recent, -> { order('updated_at DESC').limit(10) }
-    scope :for_locale, ->(locale = I18n.locale) { unscope(where: :locale).where(locale: locale) }
+    scope :for_locale, ->(locale = I18n.locale) { unscope(where: :locale).where(locale:) }
     scope :for_default_locale, -> { for_locale(I18n.default_locale) }
 
     has_one :lock, as: :on, dependent: :destroy
@@ -171,7 +171,7 @@ module Spotlight
         end
       end
 
-      translated_pages.update(weight: weight) if saved_change_to_weight?
+      translated_pages.update(weight:) if saved_change_to_weight?
     end
   end
 end

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

@@ -56,21 +56,21 @@ module Spotlight
 
         private
 
-        def recursive_manifests(thing, &block)
+        def recursive_manifests(thing, &)
           return to_enum(:recursive_manifests, thing) unless block_given?
 
-          thing.manifests.each(&block)
+          thing.manifests.each(&)
 
           return if thing.collections.blank?
 
           thing.collections.each do |collection|
-            recursive_manifests(collection, &block)
+            recursive_manifests(collection, &)
           end
         end
       end
 
       def create_iiif_manifest(manifest, collection = nil)
-        IiifManifest.new(url: manifest['@id'], manifest: manifest, collection: collection)
+        IiifManifest.new(url: manifest['@id'], manifest:, collection:)
       end
 
       def manifest?

data/app/models/spotlight/role.rb

@@ -32,7 +32,7 @@ module Spotlight
     #    validates :user, uniqueness: { scope: :exhibit}
     # but it puts the error message on the user_key instead of user so that the form will render correctly
     def user_must_be_unique
-      errors.add(:user_key, 'already a member of this exhibit') if Spotlight::Role.where(resource: resource, user: user).where.not(id: id).any?
+      errors.add(:user_key, 'already a member of this exhibit') if Spotlight::Role.where(resource:, user:).where.not(id:).any?
     end
   end
 end

data/app/models/spotlight/search.rb

@@ -49,14 +49,14 @@ module Spotlight
       thumbnail.iiif_url
     end
 
-    def documents(&block)
+    def documents(&)
       start = 0
       response = repository.search(search_params.start(start))
 
       return to_enum(:documents) { response['response']['numFound'] } unless block_given?
 
       while response.documents.present?
-        response.documents.each(&block)
+        response.documents.each(&)
         start += response.documents.length
         response = repository.search(search_params.start(start))
       end

data/app/services/spotlight/bulk_updates_csv_template_service.rb

@@ -12,9 +12,9 @@ module Spotlight
     end
 
     def template(view_context:, title: true, tags: true, visibility: true)
-      return to_enum(:template, view_context: view_context, title: title, tags: tags, visibility: visibility) unless block_given?
+      return to_enum(:template, view_context:, title:, tags:, visibility:) unless block_given?
 
-      yield ::CSV.generate_line(csv_headers(title: title, tags: tags, visibility: visibility))
+      yield ::CSV.generate_line(csv_headers(title:, tags:, visibility:))
       each_document do |document|
         sidecar = document.sidecar(exhibit)
         yield ::CSV.generate_line([

data/app/services/spotlight/clone_translated_page_from_locale.rb

@@ -13,7 +13,7 @@ module Spotlight
     end
 
     def self.call(locale:, page:)
-      new(locale: locale, page: page).clone
+      new(locale:, page:).clone
     end
 
     def clone

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

@@ -59,7 +59,7 @@ module Spotlight
       # @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: cache).call(data: data, &block)
+        executor(context, cache:).call(data:, &block)
       end
 
       ##

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

@@ -1,24 +1,2 @@
-<div id="exhibit-navbar" class="exhibit-navbar navbar navbar-light navbar-expand-md" role="navigation" aria-label="<%= t('spotlight.exhibitnavbar.label') %>">
-  <div class="container flex-column flex-md-row">
-    <% if resource_masthead? %>
-      <%= link_to(current_exhibit.title, spotlight.exhibit_path(current_exhibit), class: 'navbar-brand') %>
-    <% end %>
-
-    <ul class="navbar-nav <%= resource_masthead? ? 'justify-content-md-end' : 'mr-auto me-auto' %>">
-      <li class="nav-item <%= "active" if current_page?([spotlight, current_exhibit]) %>"><%= link_to t(:'spotlight.curation.nav.home'), [spotlight, current_exhibit], class: 'nav-link' %></li>
-      <% current_exhibit.main_navigations.displayable.each do |navigation| %>
-        <%= render partial: "shared/#{navigation.nav_type}_navbar", locals: { navigation: navigation } %>
-      <% end %>
-    </ul>
-    <% if should_render_spotlight_search_bar? %>
-      <div class="navbar-right navbar-nav exhibit-search-form mt-3 mt-md-0">
-        <%= render Blacklight::SearchBarComponent.new(
-          url: search_action_url,
-          advanced_search_url: search_action_url(action: 'advanced_search'),
-          params: search_state.params_for_search.except(:qt),
-          autocomplete_path: suggest_index_catalog_path
-        ) %>
-      </div>
-    <% end %>
-  </div>
-</div>
+<%- Spotlight.deprecator.warn("_exhibit_navbar.html.erb will be removed.  Customize the exhibit navbar using components instead.") if !blacklight_config.key?(:exhibit_navbar_component) %>
+<%= render (blacklight_config&.exhibit_navbar_component || Spotlight::ExhibitNavbarComponent).new %>

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

@@ -42,4 +42,4 @@
   <%= masthead_navbar unless resource_masthead? %>
 </header>
 
-<%= render 'shared/breadcrumbs' unless resource_masthead? %>
+<%= render Spotlight::BreadcrumbsComponent.new(breadcrumbs:) %>

data/app/views/spotlight/exhibits/_form.html.erb

@@ -3,7 +3,7 @@
   <%= f.text_field :title, disabled: !default_language?, help: !default_language? ? t('.uneditable_non_default_language') : '' %>
   <%= f.text_field :subtitle %>
   <%= f.text_area :description %>
-  <%= f.text_field :tag_list, value: f.object.tag_list.to_s %>
+  <%= render Spotlight::TagListFormComponent.new(form: f) %>
   <%= f.form_group(:contact_emails, label: { text: nil, class: nil, for: 'exhibit_contact_email_0' }, class: 'form-group mb-3', help: nil) do %>
     <%= f.fields_for :contact_emails do |contact| %> 
       <%= render partial: 'contact', locals: {exhibit: @exhibit, contact: contact} %>

data/app/views/spotlight/exhibits/_new_exhibit_form.html.erb

@@ -1,7 +1,7 @@
 <%= bootstrap_form_for @exhibit, url: ((spotlight.exhibit_path(@exhibit) if @exhibit.persisted?) || spotlight.exhibits_path), layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
   <%= f.text_field :title, label: t(:'.fields.title.label'), help: t(:'.fields.title.help_block') %>
   <%= f.text_field :slug, label: t(:'.fields.slug.label'), help: t(:'.fields.slug.help_block') %>
-  <%= f.text_field :tag_list %>
+  <%= render Spotlight::TagListFormComponent.new(form: f) %>
 
   <%= render 'initial_resources_form', locals: { f: f } %>
 

data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb

@@ -1,12 +1,23 @@
-<tr data-id="<%= key.parameterize %>" class="dd-item">
+<% default_field_label = local_assigns.dig(:config, :original, :label) %>
+
+<tr data-id="<%= key.parameterize %>" class="dd-item" data-behavior="restore-default">
   <%= f.fields_for key do |field| %>
     <td>
       <%= field.hidden_field :weight, 'data-property' => 'weight' %>
-      <div class="handle-wrap" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
+      <div class="handle-wrap d-flex">
         <div class="dd-handle dd3-handle"><%= t :drag %></div>
-        <a href="#edit-in-place" class="field-label edit-in-place"><%= config.display_label %></a>
-        <%= field.hidden_field :label, value: config.display_label, class: 'form-control form-control-sm', data: {:"edit-field-target" => 'true'} %>
-       </div>
+        <div class="flex-grow-1 align-self-center">
+          <span data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
+            <a href="#edit-in-place" class="field-label edit-in-place align-self-center"><%= config.display_label %></a>
+            <%= field.hidden_field :label, value: config.display_label, class: 'metadata-label-edit form-control form-control-sm', data: {:"edit-field-target" => 'true', default_value: default_field_label} %>
+          </span>
+        </div>
+        <% if default_field_label %>
+          <div class="restore-default">
+            <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn btn-secondary btn-sm #{'d-none' if config.display_label == default_field_label}" %>
+          </div>
+        <% end %>
+      </div>
     </td>
     <td class="checkbox-cell text-center">
       <%= field.check_box_without_bootstrap :show, checked: config.show, disabled: !config.immutable.show.nil?, hide_label: true %>

data/app/views/spotlight/metadata_configurations/edit.html.erb

@@ -8,10 +8,10 @@
 
     <p class="instructions"><%= t :'.instructions' %></p>
 
-    <table id="nested-fields" class="table table-striped dd-table">
+    <table id="nested-fields" class="metadata-configuration table table-striped dd-table">
       <thead>
         <tr>
-          <th><%= t :'.field.label' %></th>
+          <th class="w-50"><%= t :'.field.label' %></th>
           <th class="text-center">
             <div>
               <%= t :'.view.show' %>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb

@@ -9,11 +9,11 @@
         <div class="box" data-id="<%= document.id %>">
           <div class="contents">
             <% if block_options[:thumbnail_image_url].present? %>
-              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
             <% elsif block_options[:iiif_tilesource_base].present?  %>
-              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
             <% elsif doc_presenter.thumbnail.exists? %>
-              <%= doc_presenter.thumbnail.thumbnail_tag({ class: 'img-thumbnail', alt: doc_presenter.heading }, document_counter: -1) %>
+              <%= doc_presenter.thumbnail.thumbnail_tag({ class: 'img-thumbnail', alt: resource_alt_text(block_options, doc_presenter.heading) }, document_counter: -1) %>
             <% end %>
             <% if solr_documents_block.primary_caption? %>
               <div class="caption primary-caption">

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb

@@ -9,11 +9,11 @@
       <% doc_presenter = document_presenter(document) %>
       <div class="carousel-item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
         <% if block_options[:full_image_url].present? %>
-          <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+          <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
         <% elsif block_options[:iiif_tilesource_base].present?  %>
-          <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+          <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
         <% elsif doc_presenter.thumbnail.exists? %>
-          <%= doc_presenter.thumbnail.thumbnail_tag({ alt: doc_presenter.heading }, document_counter: -1) %>
+          <%= doc_presenter.thumbnail.thumbnail_tag({ alt: resource_alt_text(block_options, doc_presenter.heading) }, document_counter: -1) %>
         <% end %>
         <div class="carousel-caption">
           <% if solr_documents_carousel_block.primary_caption? %>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb

@@ -12,11 +12,11 @@
               <% doc_presenter = document_presenter(document) %>
               <div class="carousel-item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
                 <% if block_options[:full_image_url].present? %>
-                  <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+                  <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
                 <% elsif block_options[:iiif_tilesource_base].present?  %>
-                  <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+                  <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
                 <% elsif doc_presenter.thumbnail.exists? %>
-                  <%= doc_presenter.thumbnail.thumbnail_tag({ alt: doc_presenter.heading }, document_counter: -1) %>
+                  <%= doc_presenter.thumbnail.thumbnail_tag({ alt: resource_alt_text(block_options, doc_presenter.heading) }, document_counter: -1) %>
                 <% end %>
               </div>
 

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb

@@ -6,11 +6,11 @@
           <% doc_presenter = document_presenter(document) %>
           <div class="box item-<%= index %>" data-id="<%= document.id %>">
             <% if block_options[:thumbnail_image_url].present? %>
-              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
             <% elsif block_options[:iiif_tilesource_base].present?  %>
-              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: resource_alt_text(block_options, doc_presenter.heading), skip_pipeline: true), counter: -1) %>
             <% elsif doc_presenter.thumbnail.exists? %>
-              <%= doc_presenter.thumbnail.thumbnail_tag({ class: 'img-thumbnail', alt: doc_presenter.heading }, document_counter: -1) %>
+              <%= doc_presenter.thumbnail.thumbnail_tag({ class: 'img-thumbnail', alt: resource_alt_text(block_options, doc_presenter.heading) }, document_counter: -1) %>
             <% end %>
           </div>
         <% end %>

data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb

@@ -6,10 +6,11 @@
           <div class="contents">
             <% if file[:link].present? %>
               <%= link_to file[:link], rel: 'ugc' do %>
-                <%= image_tag file[:url], class: 'img-thumbnail', alt: file[:caption] %>
+                <%= image_tag file[:url], class: 'img-thumbnail', alt: resource_alt_text(file, file[:caption]) %>
               <% end %>
             <% else %>
-              <%= image_tag file[:url], class: 'img-thumbnail', alt: '', role: 'presentation' %>
+              <% alt_text = resource_alt_text(file, '') %>
+              <%= image_tag file[:url], class: 'img-thumbnail', alt: alt_text, role: alt_text.present? ? nil : 'presentation' %>
             <% end %>
             <% if file[:caption].present? %>
               <div class="caption">

data/config/locales/spotlight.en.yml

@@ -707,6 +707,8 @@ en:
         select_all: Select all
         view:
           show: Item details
+      metadata_field:
+        restore_default: Restore default
     pages:
       edit:
         header: Edit page
@@ -721,6 +723,8 @@ en:
       index:
         about_pages:
           header: About pages
+        bulk_updates:
+          header: Bulk updates
         feature_pages:
           header: Feature pages
           home_pages_header: Homepage

data/lib/generators/spotlight/templates/catalog_controller.rb

@@ -16,6 +16,7 @@ class CatalogController < ApplicationController
     # Blacklight 8 sets a default value to 'advanced'
     config.json_solr_path = nil
     config.header_component = Spotlight::HeaderComponent
+    config.exhibit_navbar_component = Spotlight::ExhibitNavbarComponent
     config.document_solr_path = 'get'
     config.document_unique_id_param = 'ids'
 

data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb

@@ -83,6 +83,10 @@
 #   Spotlight::Engine.config.ga_debug_mode = false
 # end
 
+# ==> Customizable settings for site tags
+# When set the free text tag list field becomes multiple selection checklist
+# Spotlight::Engine.config.site_tags = []
+
 # ==> Sir Trevor Widget Configuration
 # These are set by default by Spotlight's configuration,
 # but you can customize them here, or in the SirTrevorRails::Block#custom_block_types method

data/lib/migration/iiif.rb

@@ -32,7 +32,7 @@ module Migration
     def migrate_contact_avatars
       Spotlight::Contact.all.find_each do |contact|
         avatar = copy_contact_image_to_avatar(contact)
-        contact.update(avatar: avatar) if avatar
+        contact.update(avatar:) if avatar
       end
     end
 
@@ -70,7 +70,7 @@ module Migration
       old_file = File.new(filepath)
       image = contact.create_avatar { |i| i.image.store!(old_file) }
       iiif_tilesource = Spotlight::Engine.config.iiif_service.info_url(image)
-      image.update(iiif_tilesource: iiif_tilesource, iiif_region: avatar_coordinates(contact))
+      image.update(iiif_tilesource:, iiif_region: avatar_coordinates(contact))
       image
     end
 
@@ -84,7 +84,7 @@ module Migration
       old_file = File.new(filepath)
       image = upload.create_upload { |i| i.image.store!(old_file) }
       iiif_tilesource = Spotlight::Engine.config.iiif_service.info_url(image)
-      image.update(iiif_tilesource: iiif_tilesource)
+      image.update(iiif_tilesource:)
       upload.upload_id = image.id
       upload.save_and_index
     end

data/lib/spotlight/engine.rb

@@ -27,15 +27,6 @@ module Spotlight
   # rubocop:disable Metrics/ClassLength
   class Engine < ::Rails::Engine
     isolate_namespace Spotlight
-    # Breadcrumbs on rails must be required outside of an initializer or it doesn't get loaded.
-    require 'breadcrumbs_on_rails/breadcrumbs'
-    require 'breadcrumbs_on_rails/action_controller'
-
-    initializer 'breadcrumbs_on_rails.initialize' do
-      ActiveSupport.on_load(:action_controller) do
-        include BreadcrumbsOnRails::ActionController
-      end
-    end
 
     require 'carrierwave'
     require 'redcarpet' # required for markdown support in github/markup https://github.com/github/markup#markups
@@ -145,6 +136,8 @@ module Spotlight
     config.full_image_field = :full_image_url_ssm
     config.thumbnail_field = :thumbnail_url_ssm
 
+    Spotlight::Engine.config.site_tags = nil
+
     # Defaults to the blacklight_config.index.title_field:
     config.upload_title_field = nil # UploadFieldConfig.new(...)
     config.upload_description_field = :spotlight_upload_description_tesim
@@ -337,23 +330,10 @@ module Spotlight
 
     config.exhibit_roles = %w[admin curator viewer]
     # PaperTrail serializes objects to YAML, so we need to permit these classes to be deserialized
-    if ActiveRecord.respond_to?(:yaml_column_permitted_classes)
-      # Rails >= 7.0
-      ActiveRecord.yaml_column_permitted_classes ||= []
-      ActiveRecord.yaml_column_permitted_classes += [Symbol,
-                                                     ActiveSupport::HashWithIndifferentAccess,
-                                                     ActiveSupport::TimeWithZone,
-                                                     ActiveSupport::TimeZone,
-                                                     Time]
-    elsif ActiveRecord::Base.respond_to?(:yaml_column_permitted_classes)
-      # Rails 6.1
-      ActiveRecord::Base.yaml_column_permitted_classes ||= []
-      ActiveRecord::Base.yaml_column_permitted_classes += [Symbol,
-                                                           ActiveSupport::HashWithIndifferentAccess,
-                                                           ActiveSupport::TimeWithZone,
-                                                           ActiveSupport::TimeZone,
-                                                           Time]
-    end
+    ActiveRecord.yaml_column_permitted_classes += [ActiveSupport::HashWithIndifferentAccess,
+                                                   ActiveSupport::TimeWithZone,
+                                                   ActiveSupport::TimeZone,
+                                                   Time]
   end
   # rubocop:enable Metrics/ClassLength
 end

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '4.1.2'
+  VERSION = '4.3.0'
 end