Merge branch 'main' into revert_facet_search_builder

jrochkind · jrochkind · commit 3de4fb429630 · 2025-11-19T14:20:31.000-05:00
diff --git a/.github/matrix.json b/.github/matrix.json
@@ -1,65 +1,51 @@
 {
   "ruby": ["3.4"],
-  "rails_version": ["7.1.5.1", "7.2.2.1"],
+  "rails_version": ["8.1.1"],
   "bootstrap_version": [null],
   "view_component_version": ["~> 4.0"],
   "api": [null],
-  "additional_engine_cart_rails_options": [""],
+  "additional_engine_cart_rails_options": ["--css=bootstrap"],
   "additional_name": [""],
   "include": [
     {
-      "ruby": "3.4",
-      "rails_version": "8.1.0",
-      "additional_engine_cart_rails_options": "--css=bootstrap"
-    },
-    {
-      "ruby": "3.4",
-      "rails_version": "8.1.0",
+      "rails_version": "8.1.1",
       "additional_engine_cart_rails_options": "--css=bootstrap --js=esbuild",
       "additional_name": "| esbuild"
     },
     {
-      "ruby": "3.4",
-      "rails_version": "8.0.3",
+      "rails_version": "8.0.4",
       "additional_engine_cart_rails_options": "--css=bootstrap",
       "view_component_version": "~> 3.0",
       "additional_name": "ViewComponent 3"
     },
     {
       "ruby": "3.3",
-      "rails_version": "8.0.3",
+      "rails_version": "8.0.4",
       "additional_engine_cart_rails_options": "--css=bootstrap"
+      "additional_name": "| Rails 8.0 + Ruby 3.3"
     },
     {
-      "ruby": "3.3",
-      "rails_version": "8.0.3",
+      "ruby": "3.4",
+      "rails_version": "8.0.4",
       "additional_engine_cart_rails_options": "--css=bootstrap --js=esbuild",
       "additional_name": "| esbuild"
     },
     {
       "ruby": "3.2",
-      "rails_version": "7.1.5.1",
+      "rails_version": "8.0.4",
       "solr_version": "8.11.2",
-      "additional_name": "| Solr 8.11.2"
-    },
-    {
-      "ruby": "3.3",
-      "rails_version": "7.1.5.1",
-      "additional_name": "| Propshaft",
-      "additional_engine_cart_rails_options": "-a propshaft --css=bootstrap"
+      "additional_name": "| Solr 8.11.2 and Ruby 3.2"
     },
     {
-      "ruby": "3.3",
-      "rails_version": "7.1.5.1",
+      "rails_version": "8.1.1",
       "api": "true",
       "additional_engine_cart_rails_options": "--api --skip-yarn",
       "additional_name": "| API"
     },
     {
-      "ruby": "3.3",
-      "rails_version": "7.2.2.1",
+      "rails_version": "7.2.3",
       "additional_engine_cart_rails_options": "-a propshaft --css=bootstrap --js=esbuild",
-      "additional_name": "| Propshaft, esbuild"
+      "additional_name": "| Rails 7.2 + Propshaft, esbuild"
     }
   ]
 }
diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ Blacklight assumes a modern browser with support for [Baseline 2023](https://web
 
 ## Dependencies
 
-* [Ruby](https://www.ruby-lang.org/) 3.1+
-* [Ruby on Rails](https://rubyonrails.org/) 6.1+
+* [Ruby](https://www.ruby-lang.org/) 3.2+
+* [Ruby on Rails](https://rubyonrails.org/) 7.2+
 
 Blacklight aims to support the currently [supported versions of Ruby](https://www.ruby-lang.org/en/downloads/branches/) and the [supported versions of Ruby on Rails](https://guides.rubyonrails.org/maintenance_policy.html).  We aim to keep our [test configuration](blob/main/.github/workflows/ruby.yml) up to date with these supported versions.
 
diff --git a/app/components/blacklight/facets/filters_component.rb b/app/components/blacklight/facets/filters_component.rb
@@ -3,7 +3,7 @@
 module Blacklight::Facets
   class FiltersComponent < Blacklight::Component
     # @param [Blacklight::FacetFieldPresenter] presenter
-    def initialize(presenter:, classes: 'facet-filters card card-body bg-light p-3 mb-3 border-0',
+    def initialize(presenter:, classes: 'facet-filters mt-1 mb-3',
                    suggestions_component: Blacklight::Facets::SuggestComponent,
                    index_navigation_component: Blacklight::Facets::IndexNavigationComponent)
       @presenter = presenter
diff --git a/app/components/blacklight/facets/suggest_component.html.erb b/app/components/blacklight/facets/suggest_component.html.erb
@@ -1,12 +1,17 @@
-<label class="form-label" for="facet_suggest_<%= key %>">
-  <%= I18n.t('blacklight.search.facets.suggest.label', field_label: label) %>
-</label>
-<%= text_field_tag "facet_suggest_#{key}",
-  nil,
-  class: "facet-suggest form-control mb-3",
-  data: {
-    facet_field: key,
-    facet_search_context: helpers.search_facet_path(id: key)
-  },
-  placeholder: I18n.t('blacklight.search.form.search.placeholder')
-%>
+<div class="input-group">
+  <label class="input-group-text" for="facet_suggest_<%= key %>">
+    <%= I18n.t('blacklight.search.facets.suggest.label', field_label: label.downcase.pluralize) %>
+  </label>
+  <%= search_field_tag "facet_suggest_#{key}",
+    nil,
+    class: "facet-suggest form-control",
+    data: {
+      facet_field: key,
+      facet_search_context: helpers.search_facet_path(id: key)
+    },
+    placeholder: I18n.t('blacklight.search.facets.suggest.placeholder')
+  %>
+  <span class="input-group-text">
+    <%= render Blacklight::Icons::SearchComponent.new %>
+  </span>
+</div>
diff --git a/app/javascript/blacklight-frontend/checkbox_submit.js b/app/javascript/blacklight-frontend/checkbox_submit.js
@@ -10,7 +10,7 @@
        attribute (HTML5-style doc-*) that contains the id/primary key
        of the object in question -- used by plugin for a unique value for
        DOM id's.
-  Uses HTML for a checkbox compatible with Bootstrap 4.
+  Uses HTML for a checkbox compatible with Bootstrap.
    new CheckboxSubmit(document.querySelector('form.something')).render()
 */
 export default class CheckboxSubmit {
@@ -36,7 +36,7 @@ export default class CheckboxSubmit {
     }).then((json) => {
       this.labelTarget.removeAttribute('disabled')
       this.checkboxTarget.removeAttribute('disabled')
-      // For accessibility return keyboard focus 
+      // For accessibility return keyboard focus
       // back to the checkbox after form submission
       this.checkboxTarget.focus()
       this.updateStateFor(!this.checked)
diff --git a/app/javascript/blacklight-frontend/facet_suggest.js b/app/javascript/blacklight-frontend/facet_suggest.js
@@ -16,10 +16,13 @@ const FacetSuggest = async (e) => {
 
     // Drop facet.page so a filtered suggestion list will always start on page 1
     url.searchParams.delete('facet.page');
+    // add our queryFragment for facet filtering
+    url.searchParams.append('query_fragment', queryFragment);
+
     const facetSearchParams = url.searchParams.toString();
     const basePathComponent = url.pathname.split('/')[1];
 
-    const urlToFetch = `/${basePathComponent}/facet_suggest/${facetField}/${queryFragment}?${facetSearchParams}`;
+    const urlToFetch = `/${basePathComponent}/facet_suggest/${facetField}?${facetSearchParams}`;
 
     const response = await fetch(urlToFetch);
     if (response.ok) {
diff --git a/app/services/blacklight/search_service.rb b/app/services/blacklight/search_service.rb
@@ -22,8 +22,10 @@ def search_state_class
       @search_state.class
     end
 
-    # a solr query method
-    # @yield [search_builder] optional block yields configured SearchBuilder, caller can modify or create new SearchBuilder to be used. Block should return SearchBuilder to be used.
+    # Fetch query results from solr
+    # @yield [search_builder] optional block yields configured SearchBuilder,  caller can modify or create new
+    #                         SearchBuilder to be used. Block should return SearchBuilder to be used.
+    #                         This is used in blacklight_range_limit
     # @return [Blacklight::Solr::Response] the solr response object
     def search_results
       builder = search_builder.with(search_state)
diff --git a/lib/blacklight/configuration.rb b/lib/blacklight/configuration.rb
@@ -47,7 +47,6 @@ def initialized_default_configuration?
       property :header_component, default: Blacklight::HeaderComponent
       property :full_width_layout, default: false
 
-      # bootstrap_version may be set to 4 or 5
       bootstrap_version = ENV['BOOTSTRAP_VERSION'].presence || "5"
       property :bootstrap_version, default: /(\d)(?:\.\d){0,2}/.match(bootstrap_version)[1].to_i
 
diff --git a/lib/blacklight/routes/searchable.rb b/lib/blacklight/routes/searchable.rb
@@ -18,7 +18,7 @@ def call(mapper, _options = {})
         mapper.get "opensearch"
         mapper.get 'suggest', as: 'suggest_index'
         mapper.get "facet/:id", action: 'facet', as: 'facet'
-        mapper.get "facet_suggest/:id/(:query_fragment)", action: 'facet', as: 'facet_suggest', defaults: { only_values: true }
+        mapper.get "facet_suggest/:id", action: 'facet', as: 'facet_suggest', defaults: { only_values: true }
       end
     end
   end
diff --git a/lib/blacklight/search_builder.rb b/lib/blacklight/search_builder.rb
@@ -59,6 +59,7 @@ def where(conditions)
 
     ##
     # Append additional processor chain directives
+    # This is used in blacklight_range_limit
     def append(*addl_processor_chain)
       params_will_change!
       builder = self.class.new(processor_chain + addl_processor_chain, scope)
diff --git a/lib/blacklight/solr/search_builder_behavior.rb b/lib/blacklight/solr/search_builder_behavior.rb
@@ -1,18 +1,25 @@
 # frozen_string_literal: true
 
 module Blacklight::Solr
+  # This depends on being imported into a class that extends AbstractSearchBuilder
   module SearchBuilderBehavior
     extend ActiveSupport::Concern
 
     included do
       self.default_processor_chain = [
-        :default_solr_parameters, :add_search_field_default_parameters,
-        :add_query_to_solr, :add_facet_fq_to_solr,
-        :add_facetting_to_solr, :add_solr_fields_to_query, :add_paging_to_solr,
-        :add_sorting_to_solr, :add_group_config_to_solr,
-        :add_adv_search_clauses, :add_facets_for_advanced_search_form,
-        :add_facet_paging_to_solr, :add_facet_suggestion_parameters,
+        :default_solr_parameters,
+        :add_search_field_default_parameters,
+        :add_query_to_solr,
+        :add_facet_fq_to_solr,
+        :add_facetting_to_solr,
+        :add_solr_fields_to_query,
+        :add_paging_to_solr,
+        :add_sorting_to_solr,
+        :add_group_config_to_solr,
         :add_adv_search_clauses,
+        :add_facets_for_advanced_search_form,
+        :add_facet_paging_to_solr,
+        :add_facet_suggestion_parameters,
         :add_additional_filters
       ]
     end
@@ -234,8 +241,6 @@ def add_solr_fields_to_query solr_parameters
     # copy paging params from BL app over to solr, changing
     # app level per_page and page to Solr rows and start.
     def add_paging_to_solr(solr_params)
-      rows(solr_params[:rows] || 10) if rows.nil?
-
       solr_params[:rows] = rows
 
       solr_params[:start] = start if start.nonzero?
diff --git a/lib/generators/blacklight/templates/catalog_controller.rb b/lib/generators/blacklight/templates/catalog_controller.rb
@@ -12,7 +12,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
   # rescue_from Blacklight::Exceptions::InvalidRequest, with: :my_handling_method
 
   configure_blacklight do |config|
-    ## Specify the style of markup to be generated (may be 4 or 5)
+    ## Specify the style of markup to be generated
     # config.bootstrap_version = 5
     #
     ## Class for sending and receiving requests from a search index
diff --git a/spec/components/blacklight/facets/filters_component_spec.rb b/spec/components/blacklight/facets/filters_component_spec.rb
@@ -22,7 +22,7 @@
     let(:component) { described_class.new(presenter: presenter) }
 
     it 'draws default classes' do
-      expect(page).to have_css(".facet-filters.card.card-body.bg-light.p-3.mb-3.border-0")
+      expect(page).to have_css(".facet-filters.mt-1.mb-3")
     end
   end
 
diff --git a/spec/components/blacklight/facets/suggest_component_spec.rb b/spec/components/blacklight/facets/suggest_component_spec.rb
@@ -37,7 +37,7 @@
     with_request_url "/catalog/facet/language_facet" do
       rendered = render_inline component
       label = rendered.css('label').first
-      expect(label.text.strip).to eq 'Filter Language'
+      expect(label.text.strip).to eq 'Filter languages'
 
       id_in_label_for = label.attribute('for').text
       expect(id_in_label_for).to eq('facet_suggest_language_facet')
diff --git a/spec/features/facets_spec.rb b/spec/features/facets_spec.rb
@@ -112,6 +112,15 @@
       expect(page).to have_css 'a.facet-select', count: 2
     end
 
+    it 'can show suggestions including a period', :js do
+      visit '/catalog/facet/subject_ssim'
+      fill_in 'facet_suggest_subject_ssim', with: 'iran.'
+
+      expect(page).to have_css '.facet-suggestions'
+      expect(page).to have_link 'Iran. Vizārat-i Kishvar'
+      expect(page).to have_css 'a.facet-select', count: 1
+    end
+
     it 'shows the user facet suggestions that are relevant to their q param', :js do
       visit '/catalog/facet/subject_ssim?q=tibet&search_field=all_fields'
       fill_in 'facet_suggest_subject_ssim', with: 'la'
