blacklight-spotlight 4.1.2 → 4.3.0

data/app/assets/stylesheets/spotlight/_blacklight_configuration.scss

@@ -18,7 +18,6 @@
       padding: 0.75rem 0.75rem 0.75rem 40px;
       margin: 0;
       margin-top: -1px;
-
     }
 
     .dd3-handle:before {
@@ -48,9 +47,27 @@
   }
 }
 
+.metadata-configuration {
+  td, th {
+    padding: 0.75rem 0.25rem;
+  }
+  th {
+    font-size: $font-size-sm;
+  }
+  .metadata-label-edit {
+    max-width: fit-content;
+  }
+  .restore-default .btn {
+    text-wrap: nowrap;
+    margin-left: 0.5rem;
+  }
+}
+
+// the table id
 #nested-fields {
   margin-bottom: 1em;
 
+  // the tbody class
   .metadata_fields {
     .checkbox-cell {
       vertical-align: middle;
@@ -59,6 +76,7 @@
 
   .metadata-select {
     display: inline-block;
+    text-wrap: nowrap;
     min-width: 72px;
   }
 }

data/app/components/spotlight/breadcrumbs_component.html.erb

@@ -0,0 +1,19 @@
+<div class="container breadcrumbs-container" role="navigation" aria-label="<%= t('spotlight.breadcrumb.label') %>">
+  <div class="row">
+    <div class="col-md-12">
+      <nav>
+        <ul class="breadcrumb list-unstyled d-flex">
+          <% breadcrumbs.each do |crumb| %>
+          <li class="breadcrumb-item <%= crumb == breadcrumbs.last ? 'active' : '' %>">
+            <% if crumb.link? && crumb != breadcrumbs.last %>
+              <%= link_to crumb.name, path(crumb.path) %>
+            <% else %>
+              <%= crumb.name %>
+            <% end %>
+          </li>
+          <% end %>
+        </ul>
+      </nav>
+    </div>
+  </div>
+</div>

data/app/components/spotlight/breadcrumbs_component.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Component to render breadcrumbs
+  class BreadcrumbsComponent < ViewComponent::Base
+    attr_reader :breadcrumbs
+
+    def initialize(breadcrumbs: [])
+      @breadcrumbs = breadcrumbs
+      super
+    end
+
+    def render?
+      !helpers.resource_masthead? && breadcrumbs.present?
+    end
+
+    def path(path)
+      return path unless path.instance_of?(::Spotlight::Exhibit)
+
+      helpers.exhibit_path(path)
+    end
+  end
+end

data/app/components/spotlight/exhibit_navbar_component.html.erb

@@ -0,0 +1,25 @@
+<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 helpers.resource_masthead? %>
+      <%= link_to(helpers.current_exhibit.title, helpers.spotlight.exhibit_path(helpers.current_exhibit), class: 'navbar-brand') %>
+    <% end %>
+
+    <ul class="navbar-nav <%= helpers.resource_masthead? ? 'justify-content-md-end' : 'mr-auto me-auto' %>">
+      <li class="nav-item <%= "active" if helpers.current_page?([helpers.spotlight, helpers.current_exhibit]) %>"><%= link_to t(:'spotlight.curation.nav.home'), [helpers.spotlight, helpers.current_exhibit], class: 'nav-link' %></li>
+      <% helpers.current_exhibit.main_navigations.displayable.each do |navigation| %>
+        <%= render partial: "shared/#{navigation.nav_type}_navbar", locals: { navigation: navigation } %>
+      <% end %>
+    </ul>
+    <% if helpers.should_render_spotlight_search_bar? %>
+      <div class="navbar-right navbar-nav exhibit-search-form mt-3 mt-md-0">
+        <%= prepend_to_search_bar %>
+        <%= render search_component.new(
+          url: helpers.search_action_url,
+          advanced_search_url: helpers.search_action_url(action: 'advanced_search'),
+          params: helpers.search_state.params_for_search.except(:qt),
+          autocomplete_path: suggest_index_catalog_path
+        ) %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/components/spotlight/exhibit_navbar_component.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Allows component addition to exhibit navbar
+  class ExhibitNavbarComponent < ViewComponent::Base
+    renders_one :prepend_to_search_bar
+
+    def search_component
+      helpers.blacklight_config&.view_config(helpers.document_index_view_type)&.search_bar_component || Blacklight::SearchBarComponent
+    end
+  end
+end

data/app/components/spotlight/tag_list_form_component.html.erb

@@ -0,0 +1,14 @@
+<% if Spotlight::Engine.config.site_tags %>
+  <div class="form-group row">
+  <label class="col-form-label col-md-2" for="tag_list">Tag list</label>
+  <div class="col-md-10">
+    <div class="overflow-scroll rounded border px-3 py-2 h-25" style="overflow: scroll; height: 25vh!important;">
+      <% Spotlight::Engine.config.site_tags.each do |tag| %>
+        <%= form.check_box :tag_list, { multiple: true, label: tag }, tag , nil %>
+      <% end %>
+    </div>
+  </div>
+  </div>
+<% else %>
+  <%= form.text_field :tag_list, value: form.object.tag_list.to_s %>
+<% end %>

data/app/components/spotlight/tag_list_form_component.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Create tag list for exhibit general/create form
+  class TagListFormComponent < ViewComponent::Base
+    attr_reader :form
+
+    def initialize(form:)
+      @form = form
+      super
+    end
+  end
+end

data/app/controllers/concerns/spotlight/controller.rb

@@ -11,7 +11,7 @@ module Spotlight
     include Spotlight::Config
 
     included do
-      helper_method :current_site, :current_exhibit, :current_masthead, :exhibit_masthead?, :resource_masthead?
+      helper_method :current_site, :current_exhibit, :current_masthead, :exhibit_masthead?, :resource_masthead?, :breadcrumbs
       before_action :set_exhibit_locale_scope, :set_locale
     end
 
@@ -23,6 +23,14 @@ module Spotlight
       @current_site ||= Spotlight::Site.instance
     end
 
+    def breadcrumbs
+      @breadcrumbs ||= []
+    end
+
+    def add_breadcrumb(name, path = nil, _current = nil)
+      breadcrumbs << Breadcrumb.new(name, path)
+    end
+
     def current_exhibit
       @exhibit || (Spotlight::Exhibit.find(params[:exhibit_id]) if params[:exhibit_id].present?)
     end

data/app/controllers/concerns/spotlight/search_helper.rb

@@ -6,14 +6,14 @@ module Spotlight
     def search_service(user_params = respond_to?(:search_state, true) ? search_state.to_h : {})
       klass = respond_to?(:search_service_class) ? search_service_class : Blacklight::SearchService
 
-      klass.new(config: blacklight_config, user_params: user_params, **search_service_context)
+      klass.new(config: blacklight_config, user_params:, **search_service_context)
     end
 
     # @return [Hash] a hash of context information to pass through to the search service
     def search_service_context
       return {} unless respond_to?(:current_ability)
 
-      { current_ability: current_ability }
+      { current_ability: }
     end
   end
 end

data/app/controllers/spotlight/about_pages_controller.rb

@@ -46,7 +46,7 @@ module Spotlight
 
     def attach_section_breadcrumbs
       if action_name == 'edit'
-        add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
+        add_breadcrumb(t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit))
       else
         add_breadcrumb(@exhibit.main_navigations.about.label_or_default, [spotlight, @exhibit, @exhibit.main_about_page])
       end

data/app/controllers/spotlight/admin_users_controller.rb

@@ -11,8 +11,8 @@ module Spotlight
     load_and_authorize_resource :site, class: 'Spotlight::Site'
 
     def index
-      add_breadcrumb t(:'spotlight.sites.home'), root_url
-      add_breadcrumb t(:'spotlight.admin_users.index.page_title')
+      add_breadcrumb(t(:'spotlight.sites.home'), root_url)
+      add_breadcrumb(t(:'spotlight.admin_users.index.page_title'))
     end
 
     def create

data/app/controllers/spotlight/appearances_controller.rb

@@ -8,15 +8,15 @@ module Spotlight
     load_and_authorize_resource id_param: :exhibit_id, instance_name: 'exhibit', class: 'Spotlight::Exhibit', parent: false
 
     def edit
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.configuration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.appearance'), edit_exhibit_appearance_path(@exhibit))
     end
 
     def update
       if @exhibit.update(exhibit_params)
         notice = t(:'helpers.submit.spotlight_default.updated', model: @exhibit.class.model_name.human.downcase)
-        redirect_to edit_exhibit_appearance_path(@exhibit), notice: notice
+        redirect_to edit_exhibit_appearance_path(@exhibit), notice:
       else
         render 'edit'
       end

data/app/controllers/spotlight/browse_controller.rb

@@ -67,13 +67,13 @@ module Spotlight
     end
 
     def attach_breadcrumbs
-      add_breadcrumb t(:'spotlight.curation.nav.home', title: @exhibit.title), @exhibit
+      add_breadcrumb(t(:'spotlight.curation.nav.home', title: @exhibit.title), @exhibit)
       add_breadcrumb(@exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(@exhibit))
       add_breadcrumb(@group.title, exhibit_browse_groups_path(@exhibit, @group)) if @group.present?
     end
 
     def attach_search_breadcrumb
-      add_breadcrumb @search.full_title, (@group.present? ? exhibit_browse_group_path(@exhibit, @group, @search) : exhibit_browse_path(@exhibit, @search))
+      add_breadcrumb(@search.full_title, (@group.present? ? exhibit_browse_group_path(@exhibit, @group, @search) : exhibit_browse_path(@exhibit, @search)))
     end
 
     def _prefixes

data/app/controllers/spotlight/bulk_actions_controller.rb

@@ -23,7 +23,7 @@ module Spotlight
 
     def handle_bulk_action_with_job(job, i18n_key: action_name, **params)
       job.perform_later(
-        solr_params: solr_params,
+        solr_params:,
         exhibit: current_exhibit,
         user: current_user,
         **params

data/app/controllers/spotlight/bulk_updates_controller.rb

@@ -8,8 +8,13 @@ module Spotlight
   class BulkUpdatesController < Spotlight::ApplicationController
     before_action :authenticate_user!
     before_action :check_authorization
+    load_and_authorize_resource :exhibit, class: 'Spotlight::Exhibit'
 
-    def edit; end
+    def edit
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.pages.index.bulk_updates.header'), edit_exhibit_bulk_updates_path(@exhibit))
+    end
 
     def download_template
       # Set Last-Modified as a work-around for https://github.com/rack/rack/issues/1619
@@ -41,7 +46,7 @@ module Spotlight
     def csv_template
       boolean = ActiveModel::Type::Boolean.new
       Spotlight::BulkUpdatesCsvTemplateService.new(exhibit: current_exhibit).template(
-        view_context: view_context,
+        view_context:,
         title: boolean.cast(reference_field_params[:item_title]),
         tags: boolean.cast(updatable_field_params[:tags]),
         visibility: boolean.cast(updatable_field_params[:visibility])

data/app/controllers/spotlight/catalog_controller.rb

@@ -8,6 +8,7 @@ module Spotlight
   # rubocop:disable Metrics/ClassLength
   class CatalogController < ::CatalogController
     include Spotlight::Concerns::ApplicationController
+
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit, prepend: true
     include Blacklight::Catalog
     include Spotlight::Catalog
@@ -85,8 +86,8 @@ module Spotlight
     end
 
     def admin
-      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_path(@exhibit))
       (@response,) = search_service.search_results
       @filters = params[:f] || []
 
@@ -148,10 +149,10 @@ module Spotlight
 
     def attach_breadcrumbs
       if view_context.current_page?({ action: :admin })
-        add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit)
+        add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit))
       else
         # When not on the admin page, get the translated value for the "Home" breadcrumb
-        add_breadcrumb t(:'spotlight.curation.nav.home', title: @exhibit.title), exhibit_root_path(@exhibit)
+        add_breadcrumb(t(:'spotlight.curation.nav.home', title: @exhibit.title), exhibit_root_path(@exhibit))
       end
     end
 
@@ -227,21 +228,21 @@ module Spotlight
     def add_breadcrumb_with_search_params
       return unless has_search_parameters?
 
-      add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), spotlight.search_exhibit_catalog_path(params.to_unsafe_h), current: action_name == 'index'
+      add_breadcrumb(t(:'spotlight.catalog.breadcrumb.index'), spotlight.search_exhibit_catalog_path(params.to_unsafe_h), current: action_name == 'index')
     end
 
     # rubocop:disable Metrics/AbcSize
     def add_document_breadcrumbs(document)
       if current_browse_category
-        add_breadcrumb current_browse_category.exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(current_browse_category.exhibit)
-        add_breadcrumb current_browse_category.title, exhibit_browse_path(current_browse_category.exhibit, current_browse_category)
+        add_breadcrumb(current_browse_category.exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(current_browse_category.exhibit))
+        add_breadcrumb(current_browse_category.title, exhibit_browse_path(current_browse_category.exhibit, current_browse_category))
       elsif current_page_context&.title&.present? && !current_page_context.is_a?(Spotlight::HomePage)
-        add_breadcrumb current_page_context.title, [current_page_context.exhibit, current_page_context]
+        add_breadcrumb(current_page_context.title, [current_page_context.exhibit, current_page_context])
       elsif current_search_session && !current_page_context&.is_a?(Spotlight::HomePage)
-        add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session.query_params)
+        add_breadcrumb(t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session.query_params))
       end
 
-      add_breadcrumb view_context.document_presenter(document).heading, polymorphic_path([current_exhibit, document])
+      add_breadcrumb(view_context.document_presenter(document).heading, polymorphic_path([current_exhibit, document]))
     end
     # rubocop:enable Metrics/AbcSize
 

data/app/controllers/spotlight/contacts_controller.rb

@@ -11,11 +11,11 @@ module Spotlight
     before_action :attach_breadcrumbs
 
     def new
-      add_breadcrumb t(:'helpers.action.spotlight/contact.create'), new_exhibit_contact_path(@exhibit)
+      add_breadcrumb(t(:'helpers.action.spotlight/contact.create'), new_exhibit_contact_path(@exhibit))
     end
 
     def edit
-      add_breadcrumb @contact.name, edit_exhibit_contact_path(@contact.exhibit, @contact)
+      add_breadcrumb(@contact.name, edit_exhibit_contact_path(@contact.exhibit, @contact))
     end
 
     def create
@@ -42,9 +42,9 @@ module Spotlight
     protected
 
     def attach_breadcrumbs
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.pages.index.about_pages.header'), exhibit_about_pages_path(@exhibit))
     end
 
     def contact_params

data/app/controllers/spotlight/custom_fields_controller.rb

@@ -12,11 +12,11 @@ module Spotlight
 
     def new
       @custom_field.field_type ||= 'text'
-      add_breadcrumb t(:'helpers.action.spotlight/custom_field.create'), new_exhibit_custom_field_path(@exhibit)
+      add_breadcrumb(t(:'helpers.action.spotlight/custom_field.create'), new_exhibit_custom_field_path(@exhibit))
     end
 
     def edit
-      add_breadcrumb @custom_field.label, edit_exhibit_custom_field_path(@custom_field.exhibit, @custom_field)
+      add_breadcrumb(@custom_field.label, edit_exhibit_custom_field_path(@custom_field.exhibit, @custom_field))
     end
 
     def create
@@ -50,9 +50,9 @@ module Spotlight
     protected
 
     def attach_breadcrumbs
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.metadata_configurations.edit.header'), edit_exhibit_metadata_configuration_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.metadata_configurations.edit.header'), edit_exhibit_metadata_configuration_path(@exhibit))
     end
 
     def custom_field_params

data/app/controllers/spotlight/custom_search_fields_controller.rb

@@ -11,12 +11,12 @@ module Spotlight
 
     # GET /custom_search_fields/new
     def new
-      add_breadcrumb t(:'helpers.action.spotlight/custom_search_field.create'), new_exhibit_custom_search_field_path(@exhibit)
+      add_breadcrumb(t(:'helpers.action.spotlight/custom_search_field.create'), new_exhibit_custom_search_field_path(@exhibit))
     end
 
     # GET /custom_search_fields/1/edit
     def edit
-      add_breadcrumb @custom_search_field.label, edit_exhibit_custom_search_field_path(@custom_search_field.exhibit, @custom_search_field)
+      add_breadcrumb(@custom_search_field.label, edit_exhibit_custom_search_field_path(@custom_search_field.exhibit, @custom_search_field))
     end
 
     # POST /custom_search_fields
@@ -52,9 +52,9 @@ module Spotlight
     private
 
     def attach_breadcrumbs
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.configuration.sidebar.search_configuration'), edit_exhibit_search_configuration_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.search_configuration'), edit_exhibit_search_configuration_path(@exhibit))
     end
 
     # Only allow trusted parameters through.

data/app/controllers/spotlight/dashboards_controller.rb

@@ -46,13 +46,13 @@ module Spotlight
     protected
 
     def attach_analytics_breadcrumbs
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.curation.sidebar.analytics'), analytics_exhibit_dashboard_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.curation.sidebar.analytics'), analytics_exhibit_dashboard_path(@exhibit))
     end
 
     def attach_dashboard_breadcrumbs
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.curation.sidebar.dashboard'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.curation.sidebar.dashboard'), exhibit_dashboard_path(@exhibit))
     end
 
     def load_recent_solr_documents(count)

data/app/controllers/spotlight/exhibits_controller.rb

@@ -34,8 +34,8 @@ module Spotlight
 
     def new
       build_initial_exhibit_contact_emails
-      add_breadcrumb t(:'spotlight.sites.home'), root_url
-      add_breadcrumb t(:'spotlight.exhibits.new.page_title')
+      add_breadcrumb(t(:'spotlight.sites.home'), root_url)
+      add_breadcrumb(t(:'spotlight.exhibits.new.page_title'))
     end
 
     def process_import
@@ -47,9 +47,9 @@ module Spotlight
     end
 
     def edit
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.configuration.sidebar.settings'), edit_exhibit_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.settings'), edit_exhibit_path(@exhibit))
       build_initial_exhibit_contact_emails
     end
 
@@ -94,6 +94,7 @@ module Spotlight
         :description,
         :published,
         :tag_list,
+        tag_list: [],
         contact_emails_attributes: %i[id email],
         languages_attributes: %i[id public]
       )

data/app/controllers/spotlight/feature_pages_controller.rb

@@ -26,15 +26,15 @@ module Spotlight
     end
 
     def attach_page_breadcrumbs
-      add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit) if action_name == 'edit'
+      add_breadcrumb(t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)) if action_name == 'edit'
 
-      add_breadcrumb @page.parent_page.title, [spotlight, @page.exhibit, @page.parent_page] unless @page.top_level_page?
-      add_breadcrumb @page.title, action_name == 'edit' ? [:edit, @page.exhibit, @page] : [spotlight, @page.exhibit, @page]
+      add_breadcrumb(@page.parent_page.title, [spotlight, @page.exhibit, @page.parent_page]) unless @page.top_level_page?
+      add_breadcrumb(@page.title, action_name == 'edit' ? [:edit, @page.exhibit, @page] : [spotlight, @page.exhibit, @page])
     end
 
     def attach_index_breadcrumbs
-      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit))
     end
 
     def update_all_page_params

data/app/controllers/spotlight/featured_images_controller.rb

@@ -7,7 +7,7 @@ module Spotlight
 
     def create
       if @featured_image.save && @featured_image.file_present?
-        render json: { tilesource: tilesource, id: @featured_image.id }
+        render json: { tilesource:, id: @featured_image.id }
       else
         render json: { error: 'unable to create image' }, status: :bad_request
       end

data/app/controllers/spotlight/groups_controller.rb

@@ -50,7 +50,7 @@ module Spotlight
                else
                  t(:'helpers.submit.group.batch_error', model: human_name)
                end
-      redirect_to spotlight.exhibit_searches_path(anchor: 'browse-groups'), notice: notice
+      redirect_to spotlight.exhibit_searches_path(anchor: 'browse-groups'), notice:
     end
 
     protected

data/app/controllers/spotlight/home_pages_controller.rb

@@ -27,8 +27,8 @@ module Spotlight
     end
 
     def edit
-      add_breadcrumb t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit)
-      add_breadcrumb @page.title, [:edit, @exhibit, @page]
+      add_breadcrumb(t(:'spotlight.curation.sidebar.feature_pages'), exhibit_feature_pages_path(@exhibit))
+      add_breadcrumb(@page.title, [:edit, @exhibit, @page])
       super
     end
 

data/app/controllers/spotlight/job_trackers_controller.rb

@@ -9,9 +9,9 @@ module Spotlight
 
     # GET /:exhibit_id/job_trackers/1
     def show
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.curation.sidebar.dashboard'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.configuration.sidebar.job_trackers'), [@job_tracker.on, @job_tracker]
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.curation.sidebar.dashboard'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.job_trackers'), [@job_tracker.on, @job_tracker])
     end
   end
 end

data/app/controllers/spotlight/metadata_configurations_controller.rb

@@ -18,9 +18,9 @@ module Spotlight
     end
 
     def edit
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
-      add_breadcrumb t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.configuration.sidebar.metadata'), edit_exhibit_metadata_configuration_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit)
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.configuration.sidebar.metadata'), edit_exhibit_metadata_configuration_path(@exhibit))
     end
 
     def update

data/app/controllers/spotlight/pages_controller.rb

@@ -93,7 +93,7 @@ module Spotlight
                else
                  t(:'helpers.submit.page.batch_error', model: human_name)
                end
-      redirect_back fallback_location: spotlight.exhibit_dashboard_path(@exhibit), notice: notice
+      redirect_back fallback_location: spotlight.exhibit_dashboard_path(@exhibit), notice:
     end
 
     def clone
@@ -162,7 +162,7 @@ module Spotlight
 
     def attach_breadcrumbs
       if view_context.current_page? '/'
-        add_breadcrumb t(:'spotlight.curation.nav.home', title: current_exhibit.title), main_app.root_path
+        add_breadcrumb(t(:'spotlight.curation.nav.home', title: current_exhibit.title), main_app.root_path)
       elsif @page
         # Use curator-accessible i18n key for user-facing breadcrumb
         breadcrumb_to_exhibit_root(:'spotlight.curation.nav.home')
@@ -187,7 +187,7 @@ module Spotlight
     end
 
     def breadcrumb_to_exhibit_root(key)
-      add_breadcrumb t(key, title: current_exhibit.title), spotlight.exhibit_root_path(current_exhibit)
+      add_breadcrumb(t(key, title: current_exhibit.title), spotlight.exhibit_root_path(current_exhibit))
     end
 
     # Only allow trusted parameters through.

data/app/controllers/spotlight/resources/csv_upload_controller.rb

@@ -36,7 +36,7 @@ module Spotlight
       end
 
       def data_param_keys
-        Spotlight::Resources::Upload.fields(current_exhibit).map(&:field_name) + current_exhibit.custom_fields.map(&:field)
+        Spotlight::Resources::Upload.fields(current_exhibit).map(&:field_name) + current_exhibit.custom_fields.map(&:slug)
       end
 
       # Gets an IO-like object for the CSV parser to use.

data/app/controllers/spotlight/resources_controller.rb

@@ -15,10 +15,10 @@ module Spotlight
     helper_method :resource_class
 
     def new
-      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit)
-      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
-      add_breadcrumb t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_path(@exhibit)
-      add_breadcrumb t(:'spotlight.resources.new.header'), new_exhibit_resource_path(@exhibit)
+      add_breadcrumb(t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), exhibit_root_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.curation.sidebar.items'), admin_exhibit_catalog_path(@exhibit))
+      add_breadcrumb(t(:'spotlight.resources.new.header'), new_exhibit_resource_path(@exhibit))
 
       render
     end