blacklight 8.13.0 → 9.0.0.beta1

data/config/locales/blacklight.en.yml

@@ -2,7 +2,7 @@
 en:
   blacklight:
     advanced_search:
-      any_of: 'Any of:'
+      any_of: "Any of:"
       form:
         limit_criteria_heading_html: "<strong>AND</strong> have these attributes"
         query_criteria_heading_html: Match %{select_menu} of the fields below
@@ -49,25 +49,25 @@ en:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Did you mean to type: %{options}?'
+    did_you_mean: "Did you mean to type: %{options}?"
     email:
       errors:
         to:
           blank: You must enter a recipient in order to send this message
           invalid: You must enter a valid email address
       form:
-        message: 'Message:'
+        message: "Message:"
         submit: Send
         title: Email This
-        to: 'Email:'
+        to: "Email:"
       success: Email Sent
       text:
         default_title: N/A
-        message: 'Message: %{message}'
+        message: "Message: %{message}"
         subject:
-          one: 'Item Record: %{title}'
+          one: "Item Record: %{title}"
           other: Item records
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default:
         one: entry
@@ -111,7 +111,7 @@ en:
           close: Hide facets
           open: Show facets
         missing: "[Missing]"
-        more_html: more <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: more <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Hide
           show: Show
@@ -127,9 +127,9 @@ en:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Remove constraint %{label}: %{value}'
+          label_value: "Remove constraint %{label}: %{value}"
           value: Remove constraint %{value}
-        title: 'You searched for:'
+        title: "You searched for:"
       form:
         search:
           label: search for
@@ -160,7 +160,7 @@ en:
         aria_label: Results navigation
         button_label: "%{count} per page"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> per page</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> per page</span>'
+        label: '%{count}<span class="visually-hidden"> per page</span>'
         submit: Update
         title: Number of results to display per page
       rss_feed: RSS for results
@@ -176,7 +176,7 @@ en:
       start_over: Start Over
       view:
         list: List
-      view_title: 'View results as: '
+      view_title: "View results as: "
       zero_results:
         modify_search: Try modifying your search
         search_everything: try searching everything
@@ -213,10 +213,10 @@ en:
         carrier_prompt: Please select your carrier
         submit: Send
         title: SMS This
-        to: 'Phone Number:'
+        to: "Phone Number:"
       success: SMS Sent
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Cite
       clear: Clear

data/config/locales/blacklight.es.yml

@@ -92,7 +92,7 @@ es:
           close: Ocultar facetas
           open: Mostrar facetas
         missing: "[Falta]"
-        more_html: más <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: más <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Cerrar
           show: Abierto
@@ -102,8 +102,8 @@ es:
           count: Ordenación numérica
           index: Ordenación A-Z
         suggest:
-          label: Filtro %{field_label}
-          placeholder: Filtrar...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: Limite su búsqueda
       filters:
         label: "%{label}:"
@@ -141,7 +141,7 @@ es:
         aria_label: Navegación de resultados
         button_label: "%{count} por página"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> por página</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> por página</span>'
+        label: '%{count}<span class="visually-hidden"> por página</span>'
         submit: Actualización
         title: El número de resultados a mostrar por página
       rss_feed: RSS de los resultados

data/config/locales/blacklight.fr.yml

@@ -92,7 +92,7 @@ fr:
           close: Masquer les facettes
           open: Afficher les facettes
         missing: "[manquante]"
-        more_html: plus <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: plus <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Fermer
           show: Ouvrir
@@ -102,8 +102,8 @@ fr:
           count: Du + au - fréquent
           index: Tri de A à Z
         suggest:
-          label: Filtre %{field_label}
-          placeholder: Filtre...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: Limiter votre recherche
       filters:
         label: "%{label}:"
@@ -141,7 +141,7 @@ fr:
         aria_label: Navigation dans les résultats
         button_label: "%{count} par page"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> par page</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> par page</span>'
+        label: '%{count}<span class="visually-hidden"> par page</span>'
         submit: mettre à jour
         title: Nombre de résultats à afficher par page
       rss_feed: RSS pour les résultats

data/config/locales/blacklight.hu.yml

@@ -90,7 +90,7 @@ hu:
           close: Fazetek elrejtése
           open: Szempontok megjelenítése
         missing: "[Hiányzó]"
-        more_html: több <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: több <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Bezárás
           show: Megnyitás
@@ -100,8 +100,8 @@ hu:
           count: Numerikus rendezés
           index: A-Z rendezés
         suggest:
-          label: Szűrő %{field_label}
-          placeholder: Szűrő...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: Szűrje tovább a keresését
       filters:
         label: "%{label}:"
@@ -139,7 +139,7 @@ hu:
         aria_label: Eredmények navigáció
         button_label: "%{count} oldalanként"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> oldalanként</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> oldalanként</span>'
+        label: '%{count}<span class="visually-hidden"> oldalanként</span>'
         submit: Frissítés
         title: Az eredmények száma oldalanként
       rss_feed: Eredmények RSS-ként

data/config/locales/blacklight.it.yml

@@ -103,8 +103,8 @@ it:
           count: Ordina per numero
           index: Ordina A-Z
         suggest:
-          label: Filtro %{field_label}
-          placeholder: Filtro...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: Affina la ricerca
       filters:
         label: "%{label}:"
@@ -142,7 +142,7 @@ it:
         aria_label: Navigazione dei risultati
         button_label: "%{count} per pagina"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> per pagina</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> per pagina</span>'
+        label: '%{count}<span class="visually-hidden"> per pagina</span>'
         submit: Aggiorna
         title: Risultati per pagina
       rss_feed: RSS per i risultati

data/config/locales/blacklight.nl.yml

@@ -90,7 +90,7 @@ nl:
           close: Verberg facetten
           open: Toon facetten
         missing: "[Ontbrekend]"
-        more_html: Meer <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: Meer <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Sluiten
           show: Openen
@@ -100,7 +100,7 @@ nl:
           count: Numeriek sorteren
           index: A-Z Sorteren
         suggest:
-          label: Filteren %{field_label}
+          label: Filter %{field_label}
           placeholder: Filter...
         title: Verfijn uw zoekopdracht
       filters:
@@ -139,7 +139,7 @@ nl:
         aria_label: Resultaten navigatie
         button_label: "%{count} per pagina"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> per pagina</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> per pagina</span>'
+        label: '%{count}<span class="visually-hidden"> per pagina</span>'
         submit: Update
         title: Toon aantal zoekresultaten per pagina
       rss_feed: RSS voor zoekresultaten

data/config/locales/blacklight.pt-BR.yml

@@ -91,7 +91,7 @@ pt-BR:
           open: Mostrar facetas
         missing:
         - Ausência
-        more_html: mais <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: mais <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Fechar
           show: Abrir
@@ -101,8 +101,8 @@ pt-BR:
           count: Ordenar por Número
           index: Ordem Alfabética A-Z
         suggest:
-          label: Filtro %{field_label}
-          placeholder: Filtro...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: Filtre sua busca
       filters:
         label: "%{label}:"

data/config/locales/blacklight.sq.yml

@@ -90,7 +90,7 @@ sq:
           close: Fshih aspektet
           open: Trego aspektet
         missing: "[Mungon]"
-        more_html: Më shumë <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: Më shumë <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Mbylle
           show: Hape
@@ -100,8 +100,8 @@ sq:
           count: Renditja numerike
           index: A-Z Renditja
         suggest:
-          label: Filtri %{field_label}
-          placeholder: Filtro...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: Kufizo këkimin
       filters:
         label: "%{label}:"
@@ -139,7 +139,7 @@ sq:
         aria_label: Rezultatet e lundrimit
         button_label: "%{count} për faqe"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> për faqe</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> për faqe</span>'
+        label: '%{count}<span class="visually-hidden"> për faqe</span>'
         submit: Përditëso
         title: Numri i rezultateve që do të shfaqen për faqe
       rss_feed: RSS për rezultatet

data/config/locales/blacklight.zh.yml

@@ -90,7 +90,7 @@ zh:
           close: 隐藏方面
           open: 显示方面
         missing: "[未找到]"
-        more_html: 更多 <span class="sr-only visually-hidden">%{field_name}</span> »
+        more_html: 更多 <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: 关
           show: 打开
@@ -100,8 +100,8 @@ zh:
           count: 按数量排序
           index: 按字母排序
         suggest:
-          label: 过滤器 %{field_label}
-          placeholder: 筛选...
+          label: Filter %{field_label}
+          placeholder: Filter...
         title: 限定搜索
       filters:
         label: "%{label}:"
@@ -139,7 +139,7 @@ zh:
         aria_label: 结果导航
         button_label: "%{count} 每页"
         button_label_html: '%{count}<span class="d-none d-sm-inline"> 每页</span>'
-        label: '%{count}<span class="sr-only visually-hidden"> 每页</span>'
+        label: '%{count}<span class="visually-hidden"> 每页</span>'
         submit: 更新
         title: 每页显示结果数
       rss_feed: 搜索结果RSS

data/lib/blacklight/abstract_repository.rb

@@ -37,8 +37,8 @@ module Blacklight
 
     # Find multiple documents by their ids
     # @param [Hash] _params query parameters
-    def find_many(params, **)
-      search(params, **)
+    def find_many(params, **kwargs)
+      search(params, **kwargs)
     end
 
     ##

data/lib/blacklight/component.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'view_component/version'
-
 module Blacklight
   class Component < ViewComponent::Base
     class << self
@@ -13,8 +11,7 @@ module Blacklight
 
       def sidecar_files(*args, **kwargs)
         upstream_sidecar_files(*args, **kwargs).map do |path|
-          components_path = ViewComponent::VERSION::MAJOR < 4 ? view_component_path : config.generate.path
-          app_path = Rails.root.join(path.slice(path.index(components_path)..-1).to_s).to_s
+          app_path = Rails.root.join(path.slice(path.index(view_component_path)..-1).to_s).to_s
 
           if File.exist?(app_path)
             app_path

data/lib/blacklight/configuration/context.rb

@@ -24,16 +24,16 @@ module Blacklight
       #
       # @param [#if,#unless] config an object that responds to if/unless
       # @return [Boolean]
-      def evaluate_if_unless_configuration(config, *)
+      def evaluate_if_unless_configuration(config, *args)
         return config if config == true || config == false
 
         if_value = !config.respond_to?(:if) ||
                    config.if.nil? ||
-                   evaluate_configuration_conditional(config.if, config, *)
+                   evaluate_configuration_conditional(config.if, config, *args)
 
         unless_value = !config.respond_to?(:unless) ||
                        config.unless.nil? ||
-                       !evaluate_configuration_conditional(config.unless, config, *)
+                       !evaluate_configuration_conditional(config.unless, config, *args)
 
         if_value && unless_value
       end

data/lib/blacklight/configuration/field.rb

@@ -17,37 +17,37 @@ module Blacklight
 
     def normalize! _blacklight_config = nil
       self.field ||= key
-      self.key ||= field
+      self.key ||= self.field
 
       self.label ||= default_label
 
       self.if = true if self.if.nil?
       self.unless = false if self.unless.nil?
 
-      self.field &&= field.to_s
+      self.field &&= self.field.to_s
 
       self
     end
 
     def validate!
-      raise ArgumentError, "Must supply a field name" if field.nil?
+      raise ArgumentError, "Must supply a field name" if self.field.nil?
     end
 
-    def display_label(context = nil, **)
+    def display_label(context = nil, **options)
       field_label(
         (:"blacklight.search.fields.#{context}.#{key}" if context),
         :"blacklight.search.fields.#{key}",
         label,
         default_label,
-        **
+        **options
       )
     end
 
     def default_label
-      if key.respond_to?(:titleize)
-        key.titleize
+      if self.key.respond_to?(:titleize)
+        self.key.titleize
       else
-        key.to_s.titleize
+        self.key.to_s.titleize
       end
     end
 
@@ -65,10 +65,10 @@ module Blacklight
     #     before falling  back to the label
     #   @param [Symbol] any number of additional keys
     #   @param [Symbol] ...
-    def field_label(*i18n_keys, **)
+    def field_label *i18n_keys, **options
       first, *rest = i18n_keys.compact
 
-      I18n.t(first, default: rest, **)
+      I18n.t(first, default: rest, **options)
     end
   end
 end

data/lib/blacklight/configuration/sort_field.rb

@@ -10,13 +10,13 @@ module Blacklight
       self.field ||= label&.parameterize
       self.field ||= sort
 
-      self.sort ||= field
+      self.sort ||= self.field
 
       self
     end
 
     def validate!
-      raise ArgumentError.new, "Must supply a sort string" if sort.nil?
+      raise ArgumentError.new, "Must supply a sort string" if self.sort.nil?
     end
   end
 end

data/lib/blacklight/configuration/view_config.rb

@@ -4,8 +4,6 @@ class Blacklight::Configuration
   class ViewConfig < Blacklight::OpenStructWithHashAccess
     # @!attribute template
     #   @return [String] partial to render around the documents
-    # @!attribute partials
-    #   @return [Array<String>] partials to render for each document(see #render_document_partials)
     # @!attribute document_presenter_class
     #   @return [Class] document presenter class used by helpers and views
     # @!attribute document_component
@@ -26,7 +24,7 @@ class Blacklight::Configuration
     #   @return [Class] component class used to render the search bar
     # @!attribute search_header_component
     #   @return [Class] component class used to render the header above the documents
-    def display_label(**)
+    def display_label(**options)
       I18n.t(
         :"blacklight.search.view_title.#{key}",
         default: [
@@ -35,7 +33,7 @@ class Blacklight::Configuration
           title,
           key.to_s.humanize
         ],
-        **
+        **options
       )
     end
 

data/lib/blacklight/configuration.rb

@@ -138,8 +138,8 @@ module Blacklight
       # @!attribute bookmark_icon_component
       # @since v8.3.1
       # component class used to render a document
-      # set to Blacklight::Icons::BookmarkIconComponent to replace checkbox with icon
-      property :bookmark_icon_component, default: nil
+      # set to nil if a checkbox is prefered to the icon
+      property :bookmark_icon_component, default: Blacklight::Icons::BookmarkIconComponent
 
       # @!attribute index
       # General configuration for all views
@@ -157,8 +157,6 @@ module Blacklight
         display_type_field: nil,
         # the "field access" key to use to look up the document display fields
         document_fields_key: :index_fields,
-        # partials to render for each document(see #render_document_partials)
-        partials: [],
         document_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
         collection_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
         # what field, if any, to use to render grouped results
@@ -166,7 +164,7 @@ module Blacklight
         # additional response formats for search results
         respond_to: OpenStructWithHashAccess.new,
         # component class used to render the facet grouping
-        facet_group_component: nil,
+        facet_group_component: Blacklight::Response::FacetGroupComponent,
         # component class used to render search constraints
         constraints_component: Blacklight::ConstraintsComponent,
         # component class used to render the search bar
@@ -184,9 +182,7 @@ module Blacklight
         # document presenter class used by helpers and views
         document_presenter_class: nil,
         document_component: Blacklight::DocumentComponent,
-        # in Blacklight 9, the default show_tools_component configuration will
-        # be Blacklight::Document::ShowToolsComponent
-        show_tools_component: nil,
+        show_tools_component: Blacklight::Document::ShowToolsComponent,
         show_header_tools_component: nil,
         document_header_component: Blacklight::Document::PageHeaderComponent,
         sidebar_component: Blacklight::Document::SidebarComponent,
@@ -197,8 +193,6 @@ module Blacklight
         # Set this to a hash with additional arguments to merge into the route,
         # or set `controller: :current` to route to the current controller.
         route: nil,
-        # partials to render for each document(see #render_document_partials)
-        partials: [],
         document_actions: NestedOpenStructWithHashAccess.new(ToolConfig),
         header_actions: NestedOpenStructWithHashAccess.new(ToolConfig)
       )

data/lib/blacklight/engine.rb

@@ -72,12 +72,6 @@ module Blacklight
       outer_window: 2
     }
 
-    # Blacklight 9 moves the next button after the page numbers. This behavior can be configured
-    # in Blacklight 8 by setting the next_button_position to :after
-    bl_global_config.paginator = {
-      next_button_position: :before
-    }
-
     bl_global_config.search_params_permitted_classes = [ActiveSupport::HashWithIndifferentAccess, Symbol]
 
     # Anything that goes into Blacklight::Engine.config is stored as a class

data/lib/blacklight/nested_open_struct_with_hash_access.rb

@@ -114,7 +114,7 @@ module Blacklight
 
     def set_default_proc!
       self.default_proc = lambda do |hash, key|
-        hash[key] = nested_class.new({ key: key })
+        hash[key] = nested_class.new(key: key)
       end
     end
   end

data/lib/blacklight/open_struct_with_hash_access.rb

@@ -57,7 +57,7 @@ module Blacklight
       self.class.new @table.deep_transform_values(&)
     end
 
-    def try(method_name = nil, *, &)
+    def try(method_name = nil, *args, &)
       if method_name.nil? && block_given?
         if b.arity.zero?
           instance_eval(&)
@@ -65,7 +65,7 @@ module Blacklight
           yield self
         end
       elsif respond_to?(method_name)
-        public_send(method_name, *, &)
+        public_send(method_name, *args, &b)
       end
     end
   end

data/lib/blacklight/parameters.rb

@@ -79,7 +79,7 @@ module Blacklight
     # Facebook's crawler turns array query parameters into a hash with numeric keys. Once we know
     # the expected parameter structure, we can unmangle those parameters to match our expected values.
     def deep_unmangle_params!(params, permitted_params)
-      permitted_params.grep(Hash).each do |permission|
+      permitted_params.select { |p| p.is_a?(Hash) }.each do |permission|
         permission.each do |key, permitted_value|
           next unless params[key].is_a?(ActionController::Parameters)
 

data/lib/blacklight/search_state/filter_field.rb

@@ -120,8 +120,8 @@ module Blacklight
       delegate :any?, to: :values
 
       # Appease rubocop rules by implementing #each_value
-      def each_value(except: [], &)
-        values(except: except).each(&)
+      def each_value(except: [], &block)
+        values(except: except).each(&block)
       end
 
       # @param [String,#value] item a filter to remove from the url
@@ -145,8 +145,8 @@ module Blacklight
       def permitted_params
         if config.pivot
           {
-            filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge!(key => [], "-#{key}" => []) },
-            inclusive_filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge!(key => []) }
+            filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge(key => [], "-#{key}" => []) },
+            inclusive_filters_key => config.pivot.each_with_object({}) { |key, filter| filter.merge(key => []) }
           }
         else
           {

data/lib/blacklight/search_state/pivot_filter_field.rb

@@ -102,7 +102,7 @@ module Blacklight
             end
             queries.uniq!
           end
-          [queries - existing]
+          [(queries - existing)]
         end
       end
 

data/lib/blacklight/solr/request.rb

@@ -2,13 +2,7 @@
 
 class Blacklight::Solr::InvalidParameter < ArgumentError; end
 
-class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess # rubocop:disable Style/OneClassPerFile
-  # @deprecated
-  SINGULAR_KEYS = %w(facet fl q qt rows start spellcheck spellcheck.q sort per_page wt hl group defType)
-
-  # @deprecated
-  ARRAY_KEYS = %w(facet.field facet.query facet.pivot fq hl.fl)
-
+class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess
   def initialize(constructor = {})
     if constructor.is_a?(Hash)
       super()
@@ -42,7 +36,7 @@ class Blacklight::Solr::Request < ActiveSupport::HashWithIndifferentAccess # rub
     self[:json][:query] ||= { bool: { bool_operator => [] } }
     self[:json][:query][:bool][bool_operator] ||= []
 
-    if self['q']
+    if self['q'].present?
       self[:json][:query][:bool][:must] ||= []
       self[:json][:query][:bool][:must] << self['q']
       delete 'q'

data/lib/blacklight/solr/response/facets.rb

@@ -229,7 +229,7 @@ module Blacklight::Solr::Response::Facets
 
     blacklight_config.facet_fields.select { |_k, v| v.query }.each_with_object({}) do |(field_name, facet_field), hash|
       salient_facet_queries = facet_field.query.map { |_k, x| x[:fq] }
-      items = facet_queries.slice(*salient_facet_queries).reject { |_value, hits| hits.zero? }.map do |value, hits|
+      items = facet_queries.select { |k, _v| salient_facet_queries.include?(k) }.reject { |_value, hits| hits.zero? }.map do |value, hits|
         salient_fields = facet_field.query.select { |_key, val| val[:fq] == value }
         key = ((salient_fields.keys if salient_fields.respond_to? :keys) || salient_fields.first).first
         Blacklight::Solr::Response::Facets::FacetItem.new(value: key, hits: hits, label: facet_field.query[key][:label])
@@ -250,7 +250,7 @@ module Blacklight::Solr::Response::Facets
 
     salient_facet_queries = facet_field.query.map { |_k, x| x[:fq] }
 
-    relevant_facet_data = self['facets'].slice(*salient_facet_queries).reject { |_key, data| data['count'].zero? }
+    relevant_facet_data = self['facets'].select { |k, _v| salient_facet_queries.include?(k) }.reject { |_key, data| data['count'].zero? }
 
     relevant_facet_data.map do |key, data|
       salient_fields = facet_field.query.select { |_key, val| val[:fq] == key }

data/lib/blacklight/solr/response.rb

@@ -64,10 +64,8 @@ class Blacklight::Solr::Response < ActiveSupport::HashWithIndifferentAccess
     case value
     when Hash
       value.each { |k, v| value[k] = force_to_utf8(v) }
-      value
     when Array
       value.each { |v| force_to_utf8(v) }
-      value
     when String
       if value.encoding == Encoding::UTF_8
         value
@@ -75,8 +73,7 @@ class Blacklight::Solr::Response < ActiveSupport::HashWithIndifferentAccess
         Blacklight.logger&.warn "Found a non utf-8 value in Blacklight::Solr::Response. \"#{value}\" Encoding is #{value.encoding}"
         value.dup.force_encoding('UTF-8')
       end
-    else
-      value
     end
+    value
   end
 end