Release 7.x backports

app/components/blacklight/document/action_component.html.erb

@@ -3,7 +3,7 @@
               url,
               id: @id,
               class: @link_classes,
-              data: {}.merge(({ blacklight_modal: "trigger" } if @action.modal != false) || {}) %>
+              data: {}.merge(({ blacklight_modal: "trigger", turbo: false } if @action.modal != false) || {}) %>
 <% else %>
   <%= helpers.render(partial: @action.partial || @action.name.to_s, locals: { document: @document, document_action_config: @action }.merge(@options)) %>
 <% end %>

app/models/search_builder.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class SearchBuilder < Blacklight::SearchBuilder
+  include Blacklight::Solr::SearchBuilderBehavior
+end

app/views/catalog/_search_results.html.erb

@@ -12,8 +12,7 @@
 <% end %>
 
 <% content_for(:container_header) do -%>
-  <h1 class="sr-only visually-hidden top-content-title"><%= t('blacklight.search.header') %></h1>
-
+  <%= render 'search_results_header' %>
   <%= render 'constraints' %>
 <% end %>
 

app/views/catalog/_search_results_header.html.erb

@@ -0,0 +1 @@
+<h1 class="sr-only visually-hidden top-content-title"><%= t('blacklight.search.header') %></h1>

lib/blacklight.rb

@@ -60,11 +60,7 @@ def self.default_configuration
   end
 
   def self.connection_config
-    Blacklight::RuntimeRegistry.connection_config ||= begin
-      raise "The #{::Rails.env} environment settings were not found in the blacklight.yml config" unless blacklight_yml[::Rails.env]
-
-      blacklight_yml[::Rails.env].symbolize_keys
-    end
+    Blacklight::RuntimeRegistry.connection_config ||= blacklight_yml[::Rails.env]&.symbolize_keys if blacklight_yml?
   end
 
   def self.connection_config=(value)
@@ -86,7 +82,7 @@ def self.blacklight_yml
     require 'yaml'
 
     return @blacklight_yml if @blacklight_yml
-    unless File.exist?(blacklight_config_file)
+    unless blacklight_yml?
       raise "You are missing a configuration file: #{blacklight_config_file}. Have you run \"rails generate blacklight:install\"?"
     end
 
@@ -113,6 +109,10 @@ def self.blacklight_yml
     @blacklight_yml
   end
 
+  def self.blacklight_yml?
+    File.exist?(blacklight_config_file)
+  end
+
   def self.logger
     @logger ||= begin
       ::Rails.logger if defined? Rails && Rails.respond_to?(:logger)

lib/generators/blacklight/templates/catalog_controller.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+
+# Blacklight controller that handles searches and document requests
 class <%= controller_name.classify %>Controller < ApplicationController
 
   include Blacklight::Catalog

lib/generators/blacklight/templates/solr_document.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+
+# Represent a single document returned from Solr
 class <%= model_name.classify %>
   include Blacklight::Solr::Document