blacklight-spotlight 4.2.0 → 4.3.0

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/appearances_controller.rb

@@ -16,7 +16,7 @@ module Spotlight
     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/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

@@ -46,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/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/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

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/roles_controller.rb

@@ -24,7 +24,7 @@ module Spotlight
       if @exhibit.update(exhibit_params)
         notice = any_deleted ? t(:'helpers.submit.role.destroyed') : t(:'helpers.submit.role.updated')
         Spotlight::InviteUsersService.call(resource: @exhibit)
-        redirect_to exhibit_roles_path(@exhibit), notice: notice
+        redirect_to exhibit_roles_path(@exhibit), notice:
       else
         flash[:alert] = t(:'helpers.submit.role.batch_error', count: exhibit_params[:roles_attributes].to_unsafe_h.size)
         render action: 'index'

data/app/controllers/spotlight/searches_controller.rb

@@ -78,7 +78,7 @@ module Spotlight
                else
                  t(:'helpers.submit.search.batch_error', model: Spotlight::Search.model_name.human.pluralize.downcase)
                end
-      redirect_back fallback_location: fallback_url, notice: notice
+      redirect_back fallback_location: fallback_url, notice:
     end
 
     protected

data/app/controllers/spotlight/translations_controller.rb

@@ -21,7 +21,7 @@ module Spotlight
       if current_exhibit.update(exhibit_params)
         I18n.reload! # reload since we're memoizing
         notice = t(:'helpers.submit.spotlight_default.updated', model: current_exhibit.class.model_name.human.downcase)
-        redirect_to edit_exhibit_translations_path(current_exhibit, language: @language, tab: @tab), notice: notice
+        redirect_to edit_exhibit_translations_path(current_exhibit, language: @language, tab: @tab), notice:
       else
         render 'edit'
       end
@@ -31,7 +31,7 @@ module Spotlight
       if current_exhibit.update(import_exhibit_params)
         I18n.reload! # reload since we're memoizing
         notice = t(:'helpers.submit.spotlight_default.updated', model: current_exhibit.class.model_name.human.downcase)
-        redirect_to edit_exhibit_translations_path(current_exhibit, language: @language), notice: notice
+        redirect_to edit_exhibit_translations_path(current_exhibit, language: @language), notice:
       else
         render 'edit'
       end

data/app/helpers/spotlight/application_helper.rb

@@ -37,7 +37,7 @@ module Spotlight
       initial_exception = nil
 
       ([self] + additional_locale_routing_scopes).each do |scope|
-        return scope.public_send(:url_for, params.to_unsafe_h.merge(locale: locale))
+        return scope.public_send(:url_for, params.to_unsafe_h.merge(locale:))
       rescue ActionController::UrlGenerationError => e
         initial_exception ||= e
       end
@@ -51,7 +51,7 @@ module Spotlight
 
     # Can search for named routes directly in the main app, omitting
     # the "main_app." prefix
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args, &)
       if main_app_url_helper?(method)
         main_app.send(method, *args)
       else

data/app/helpers/spotlight/crop_helper.rb

@@ -11,7 +11,7 @@ module Spotlight
         concat f.hidden_field(:iiif_image_id)
         concat f.hidden_field(:iiif_region)
         concat f.hidden_field(:iiif_tilesource)
-        concat iiif_cropper_tag(f, initial_crop_selection: initial_crop_selection)
+        concat iiif_cropper_tag(f, initial_crop_selection:)
       end
     end
 

data/app/helpers/spotlight/pages_helper.rb

@@ -80,5 +80,12 @@ module Spotlight
     def configurations_for_current_page
       Spotlight::PageConfigurations.new(context: self, page: @page).as_json
     end
+
+    def resource_alt_text(options, default)
+      return '' if options[:decorative].present?
+      return options[:alt_text] if options[:alt_text].present?
+
+      default
+    end
   end
 end

data/app/helpers/spotlight/title_helper.rb

@@ -15,7 +15,7 @@ module Spotlight
     def page_title(section, title = nil)
       title ||= t(:'.header', default: '').presence
 
-      head_content = t(:'spotlight.html_admin_title', section: section, title: title) if section && title
+      head_content = t(:'spotlight.html_admin_title', section:, title:) if section && title
       head_content ||= section || title
       set_html_page_title(head_content)
 
@@ -28,7 +28,7 @@ module Spotlight
     end
 
     def set_html_page_title(title = nil)
-      @page_title = strip_tags(t(:'spotlight.html_title', title: title || t(:'.title', default: :'.header'), application_name: application_name)).html_safe
+      @page_title = strip_tags(t(:'spotlight.html_title', title: title || t(:'.title', default: :'.header'), application_name:)).html_safe
     end
   end
 end

data/app/javascript/spotlight/admin/blocks/browse_group_categories_block.js

@@ -82,7 +82,7 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
     },
 
     item_options: function() { return `
-      '<label>
+      <label>
         <input type="hidden" name="display-item-counts" value="false" />
         <input type="checkbox" name="display-item-counts" value="true" checked />
         ${i18n.t("blocks:browse_group_categories:item_counts")}

data/app/javascript/spotlight/admin/blocks/resources_block.js

@@ -8,10 +8,24 @@ Core.Block.Resources = (function(){
     formable: true,
     autocompleteable: true,
     show_heading: true,
+    show_alt_text: true,
 
     title: function() { return i18n.t("blocks:" + this.type + ":title"); },
     description: function() { return i18n.t("blocks:" + this.type + ":description"); },
-
+    alt_text_guidelines: function() { 
+      if (this.show_alt_text) {
+        return i18n.t("blocks:alt_text_guidelines:intro"); 
+      }
+      return "";
+    },
+    alt_text_guidelines_link: function() {
+      if (this.show_alt_text) {
+        var link_url = i18n.t("blocks:alt_text_guidelines:link_url");
+        var link_label = i18n.t("blocks:alt_text_guidelines:link_label");
+        return '<a target="_blank" href="' + link_url + '">' +  link_label + '</a>'; 
+      }
+      return "";
+    },
     icon_name: "resources",
     blockGroup: function() { return i18n.t("blocks:group:items") },
 
@@ -21,6 +35,8 @@ Core.Block.Resources = (function(){
     show_secondary_field_key: "show-secondary-caption",
 
     display_checkbox: "display-checkbox",
+    decorative_checkbox: "decorative-checkbox",
+    alt_text_textarea: "alt-text-textarea",
 
     globalIndex: 0,
 
@@ -28,6 +44,13 @@ Core.Block.Resources = (function(){
       return [];
     },
 
+    _altTextFieldsHTML: function(index, data) {
+      if (this.show_alt_text) {
+        return this.altTextHTML(index, data);
+      }
+      return "";
+    },
+
     _itemPanel: function(data) {
       var index = "item_" + this.globalIndex++;
       var checked;
@@ -58,6 +81,7 @@ Core.Block.Resources = (function(){
                     <div class="main">
                       <div class="title card-title">${data.title}</div>
                       <div>${(data.slug || data.id)}</div>
+                      ${this._altTextFieldsHTML(index, data)}
                     </div>
                     <div class="remove float-right float-end">
                       <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
@@ -94,6 +118,7 @@ Core.Block.Resources = (function(){
 
     createItemPanel: function(data) {
       var panel = this._itemPanel(data);
+      this.attachAltTextHandlers(panel);
       $(panel).appendTo($('.panels > ol', this.inner));
       $('[data-behavior="nestable"]', this.inner).trigger('change');
     },
@@ -126,11 +151,67 @@ Core.Block.Resources = (function(){
       return `<div class="form resources-admin clearfix">
         <div class="widget-header">
           ${this.description()}
+          ${this.alt_text_guidelines()}
+          ${this.alt_text_guidelines_link()}
         </div>
         ${this.content()}
       </div>`
     },
 
+    _altTextData: function(data) {
+      const isDecorative = data.decorative;
+      const altText = isDecorative ? '' : (data.alt_text || '');
+      const altTextBackup = data.alt_text_backup || '';
+      const placeholderAttr = isDecorative ? '' : `placeholder="${i18n.t("blocks:resources:alt_text:placeholder")}"`;
+      const disabledAttr = isDecorative ? 'disabled' : '';
+
+      return { isDecorative, altText, altTextBackup, placeholderAttr, disabledAttr };
+    },
+
+    altTextHTML: function(index, data) {
+      const { isDecorative, altText, altTextBackup, placeholderAttr, disabledAttr } = this._altTextData(data);
+      return `<div class="mt-2 pt-2 d-flex">
+          <div class="me-2 mr-2">
+            <label class="col-form-label pb-0 pt-1" for="${this.formId(this.alt_text_textarea + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:alternative_text")}</label>
+            <div class="form-check mb-1 justify-content-end">
+              <input class="form-check-input" type="checkbox" 
+                id="${this.formId(this.decorative_checkbox + '_' + data.id)}" name="item[${index}][decorative]" ${isDecorative ? 'checked' : ''}>
+              <label class="form-check-label" for="${this.formId(this.decorative_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:decorative")}</label>
+            </div>
+          </div>
+          <div class="flex-grow-1 flex-fill d-flex">
+            <input type="hidden" name="item[${index}][alt_text_backup]" value="${altTextBackup}" />
+            <textarea class="form-control w-100" rows="2" ${placeholderAttr}
+              id="${this.formId(this.alt_text_textarea + '_' + data.id)}" name="item[${index}][alt_text]" ${disabledAttr}>${altText}</textarea>
+          </div>
+        </div>`
+    },
+
+    attachAltTextHandlers: function(panel) {
+      if (this.show_alt_text) {
+        const decorativeCheckbox = $('input[name$="[decorative]"]', panel);
+        const altTextInput = $('textarea[name$="[alt_text]"]', panel);
+        const altTextBackupInput = $('input[name$="[alt_text_backup]"]', panel);
+
+        decorativeCheckbox.on('change', function() {
+          const isDecorative = this.checked;
+          if (isDecorative) {
+            altTextBackupInput.val(altTextInput.val());
+            altTextInput.val('');
+          } else {
+            altTextInput.val(altTextBackupInput.val());
+          }
+          altTextInput
+            .prop('disabled', isDecorative)
+            .attr('placeholder', isDecorative ? '' : i18n.t("blocks:resources:alt_text:placeholder"));
+        });
+
+        altTextInput.on('input', function() {
+          $(this).data('lastValue', $(this).val());
+        });
+      }
+    },
+
     onBlockRender: function() {
       SpotlightNestable.init($('[data-behavior="nestable"]', this.inner));
 

data/app/javascript/spotlight/admin/blocks/solr_documents_embed_block.js

@@ -4,7 +4,7 @@ SirTrevor.Blocks.SolrDocumentsEmbed = (function(){
 
   return SirTrevor.Blocks.SolrDocumentsBase.extend({
     type: "solr_documents_embed",
-
+    show_alt_text: false,
     icon_name: "item_embed",
 
     item_options: function() { return "" },

data/app/javascript/spotlight/admin/blocks/uploaded_items_block.js

@@ -96,6 +96,7 @@ SirTrevor.Blocks.UploadedItems = (function(){
                     <label for="${this.formId('link_' + dataId)}" class="col-form-label col-md-3">${i18n.t("blocks:uploaded_items:link")}</label>
                     <input type="text" class="form-control col" id="${this.formId('link_' + dataId)}" name="item[${index}][link]" data-field="link"/>
                   </div>
+                  ${this._altTextFieldsHTML(index, data)}
                 </div>
                 <div class="remove float-right float-end">
                   <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
@@ -123,6 +124,8 @@ SirTrevor.Blocks.UploadedItems = (function(){
       return `<div class="form oembed-text-admin clearfix">
         <div class="widget-header">
           ${this.description()}
+          ${this.alt_text_guidelines()}
+          ${this.alt_text_guidelines_link()}
         </div>
         <div class="row">
           <div class="form-group mb-3 col-md-8">
@@ -142,6 +145,24 @@ SirTrevor.Blocks.UploadedItems = (function(){
       </div>`
     },
 
+    altTextHTML: function(index, data) {
+      const { isDecorative, altText, altTextBackup, placeholderAttr, disabledAttr } = this._altTextData(data);
+      return `
+      <div class="field row mr-3 me-3">
+        <div class="col-lg-3 ps-md-2 pl-md-2">
+          <label class="col-form-label text-nowrap pb-0 pt-1 justify-content-md-start justify-content-lg-end d-flex" for="${this.formId(this.alt_text_textarea + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:alternative_text")}</label>
+          <div class="form-check d-flex justify-content-md-start justify-content-lg-end">
+            <input class="form-check-input" type="checkbox" 
+              id="${this.formId(this.decorative_checkbox + '_' + data.id)}" name="item[${index}][decorative]" ${isDecorative ? 'checked' : ''}>
+            <label class="form-check-label" for="${this.formId(this.decorative_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:decorative")}</label>
+          </div>
+        </div>
+        <input type="hidden" name="item[${index}][alt_text_backup]" value="${altTextBackup}" />
+        <textarea class="col-lg-9" rows="2" ${placeholderAttr}
+          id="${this.formId(this.alt_text_textarea + '_' + data.id)}" name="item[${index}][alt_text]" ${disabledAttr}>${altText}</textarea>
+      </div>`
+    },
+
     zpr_key: 'zpr_link'
   });
 })();

data/app/javascript/spotlight/admin/sir-trevor/locales.js

@@ -51,6 +51,11 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
       drag: "Drag",
       display: "Display?",
       remove: "Remove"
+    },
+    alt_text: {
+      decorative: "Decorative",
+      alternative_text: "Alternative text",
+      placeholder: "Enter alt text for this item..."
     }
   },
 
@@ -116,5 +121,11 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
   group: {
     undefined: "Standard widgets",
     items: "Exhibit item widgets"
+  },
+
+  alt_text_guidelines: {
+    intro: 'For each item, please enter alternative text or appropriately check the decorative box. ',
+    link_label: 'Guidelines for writing alt text.',
+    link_url: 'https://www.w3.org/WAI/tutorials/images/' 
   }
 });

data/app/jobs/concerns/spotlight/job_tracking.rb

@@ -55,7 +55,7 @@ module Spotlight
     private
 
     def find_or_initialize_job_tracker
-      JobTracker.find_or_create_by(job_id: job_id) do |tracker|
+      JobTracker.find_or_create_by(job_id:) do |tracker|
         tracker.job_class = self.class.name
         tracker.status = 'enqueued'
       end

data/app/jobs/spotlight/add_tags_job.rb

@@ -19,12 +19,12 @@ module Spotlight
         document.reindex(update_params: {})
         progress&.increment
       rescue StandardError => e
-        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        job_tracker.append_log_entry(type: :error, exhibit:, message: e.to_s)
         @errors += 1
         mark_job_as_failed!
       end
       exhibit.blacklight_config.repository.connection.commit
-      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+      job_tracker.append_log_entry(type: :info, exhibit:, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end

data/app/jobs/spotlight/add_uploads_from_csv.rb

@@ -44,7 +44,7 @@ module Spotlight
 
         resource = Spotlight::Resources::Upload.new(
           data: row,
-          exhibit: exhibit
+          exhibit:
         )
         resource.build_upload(remote_image_url: url) unless url == '~'
 

data/app/jobs/spotlight/change_visibility_job.rb

@@ -21,12 +21,12 @@ module Spotlight
         document.reindex(update_params: {})
         progress&.increment
       rescue StandardError => e
-        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        job_tracker.append_log_entry(type: :error, exhibit:, message: e.to_s)
         @errors += 1
         mark_job_as_failed!
       end
       exhibit.blacklight_config.repository.connection.commit
-      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+      job_tracker.append_log_entry(type: :info, exhibit:, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
     end
     # rubocop:enable Metrics/MethodLength
   end

data/app/jobs/spotlight/process_bulk_updates_csv_job.rb

@@ -20,13 +20,13 @@ module Spotlight
           process_row(exhibit, row)
           progress&.increment
         rescue StandardError => e
-          job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+          job_tracker.append_log_entry(type: :error, exhibit:, message: e.to_s)
           errors += 1
           mark_job_as_failed!
         end
 
         exhibit.blacklight_config.repository.connection.commit
-        job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress&.progress} of #{progress&.total} (#{errors} errors)")
+        job_tracker.append_log_entry(type: :info, exhibit:, message: "#{progress&.progress} of #{progress&.total} (#{errors} errors)")
       end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/app/jobs/spotlight/reindex_exhibit_job.rb

@@ -30,7 +30,7 @@ module Spotlight
 
     def perform_later_in_batches(exhibit, of:)
       last = 0
-      exhibit.resources.select(:id).in_batches(of: of) do |batch|
+      exhibit.resources.select(:id).in_batches(of:) do |batch|
         last = batch.last.id
         Spotlight::ReindexJob.perform_later(exhibit, reports_on: job_tracker, start: batch.first.id, finish: batch.last.id)
       end

data/app/jobs/spotlight/reindex_job.rb

@@ -29,7 +29,7 @@ module Spotlight
       error_handler = lambda do |pipeline, exception, _data|
         job_tracker.append_log_entry(
           type: :error,
-          exhibit: exhibit,
+          exhibit:,
           message: exception.to_s,
           backtrace: exception.backtrace.first(5).join("\n"),
           resource_id: (pipeline.source.id if pipeline.source.respond_to?(:id))
@@ -38,8 +38,8 @@ module Spotlight
         errors += 1
       end
 
-      resource_list(exhibit_or_resources, start: start, finish: finish).each do |resource|
-        resource.reindex(touch: false, commit: false, job_tracker: job_tracker, additional_data: job_data, on_error: error_handler) do |*|
+      resource_list(exhibit_or_resources, start:, finish:).each do |resource|
+        resource.reindex(touch: false, commit: false, job_tracker:, additional_data: job_data, on_error: error_handler) do |*|
           progress&.increment
         end
       rescue StandardError => e
@@ -48,14 +48,14 @@ module Spotlight
 
       job_tracker.append_log_entry(
         type: :summary,
-        exhibit: exhibit,
+        exhibit:,
         message: I18n.t(
           'spotlight.job_trackers.show.messages.status.in_progress',
           progress: progress.progress,
           total: progress.total,
           errors: (I18n.t('spotlight.job_trackers.show.messages.errors', count: errors) if errors.positive?)
         ),
-        progress: progress.progress, total: progress.total, errors: errors
+        progress: progress.progress, total: progress.total, errors:
       )
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -85,7 +85,7 @@ module Spotlight
 
     def resource_list(exhibit_or_resources, start: nil, finish: nil)
       if exhibit_or_resources.is_a?(Spotlight::Exhibit)
-        exhibit_or_resources.resources.find_each(start: start, finish: finish)
+        exhibit_or_resources.resources.find_each(start:, finish:)
       else
         Array(exhibit_or_resources)
       end

data/app/jobs/spotlight/remove_tags_job.rb

@@ -19,12 +19,12 @@ module Spotlight
         document.reindex(update_params: {})
         progress&.increment
       rescue StandardError => e
-        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        job_tracker.append_log_entry(type: :error, exhibit:, message: e.to_s)
         @errors += 1
         mark_job_as_failed!
       end
       exhibit.blacklight_config.repository.connection.commit
-      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+      job_tracker.append_log_entry(type: :info, exhibit:, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end

data/app/jobs/spotlight/rename_tags_job.rb

@@ -20,13 +20,13 @@ module Spotlight
         exhibit.tag(sidecar, with: all_tags, on: :tags)
         sidecar.document.reindex(update_params: {})
       rescue StandardError => e
-        job_tracker.append_log_entry(type: :error, exhibit: exhibit, message: e.to_s)
+        job_tracker.append_log_entry(type: :error, exhibit:, message: e.to_s)
         @errors += 1
         mark_job_as_failed!
       end
 
       exhibit.blacklight_config.repository.connection.commit
-      job_tracker.append_log_entry(type: :info, exhibit: exhibit, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
+      job_tracker.append_log_entry(type: :info, exhibit:, message: "#{progress.progress} of #{progress.total} (#{@errors} errors)")
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end

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

@@ -35,7 +35,7 @@ module Spotlight
 
     def initialize_main_navigation
       default_main_navigations.each_with_index do |nav_type, weight|
-        main_navigations.create nav_type: nav_type, weight: weight
+        main_navigations.create nav_type:, weight:
       end
     end
 

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