From efab330226c945aa1c6b6f9e25df4c6a8445480f Mon Sep 17 00:00:00 2001
From: Jane Sandberg <js7389@princeton.edu>
Date: Tue, 22 Oct 2024 09:36:52 -0700
Subject: [PATCH] Incorporate feedback from review

* Make this feature opt-in.  You can add suggest: true to your facet config in the catalog controller to start using it.
* Use text_field_tag
---
 .../search/facet_suggest_input.html.erb       | 14 +++++------
 .../blacklight/search/facet_suggest_input.rb  |  4 ++++
 .../search/facet_suggest_input_spec.rb        | 18 ++++++++++++--
 spec/features/facets_spec.rb                  | 24 ++++++++++++-------
 4 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/app/components/blacklight/search/facet_suggest_input.html.erb b/app/components/blacklight/search/facet_suggest_input.html.erb
index a947961186..80e4e2f037 100644
--- a/app/components/blacklight/search/facet_suggest_input.html.erb
+++ b/app/components/blacklight/search/facet_suggest_input.html.erb
@@ -1,9 +1,9 @@
-<label for="facet-suggest-<%= facet.key %>">
+<label for="facet_suggest_<%= facet.key %>">
   <%= I18n.t('blacklight.search.facets.suggest.label', field_label: presenter&.label) %>
 </label>
-<input class="facet-suggest form-control"
-       id="facet-suggest-<%= facet.key %>"
-       data-facet-field="<%= facet.key %>"
-       name="facet_suggest_<%= facet.key %>"
-       placeholder="<%= I18n.t('blacklight.search.form.search.placeholder') %>">
-</input>
+<%= text_field_tag "facet_suggest_#{facet.key}",
+  nil,
+  class: "facet-suggest form-control",
+  data: {facet_field: facet.key},
+  placeholder: I18n.t('blacklight.search.form.search.placeholder')
+%>
diff --git a/app/components/blacklight/search/facet_suggest_input.rb b/app/components/blacklight/search/facet_suggest_input.rb
index c82e939b18..c3ab350334 100644
--- a/app/components/blacklight/search/facet_suggest_input.rb
+++ b/app/components/blacklight/search/facet_suggest_input.rb
@@ -11,6 +11,10 @@ def initialize(facet:, presenter:)
       private
 
       attr_accessor :facet, :presenter
+
+      def render?
+        facet&.suggest
+      end
     end
   end
 end
diff --git a/spec/components/blacklight/search/facet_suggest_input_spec.rb b/spec/components/blacklight/search/facet_suggest_input_spec.rb
index fcc7a5ae62..dea3ffe4e0 100644
--- a/spec/components/blacklight/search/facet_suggest_input_spec.rb
+++ b/spec/components/blacklight/search/facet_suggest_input_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::Search::FacetSuggestInput, type: :component do
-  let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet' }
+  let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet', suggest: true }
   let(:presenter) { instance_double(Blacklight::FacetFieldPresenter) }
 
   before do
@@ -26,8 +26,22 @@
     expect(label.text.strip).to eq 'Filter Language'
 
     id_in_label_for = label.attribute('for').text
-    expect(id_in_label_for).to eq('facet-suggest-language_facet')
+    expect(id_in_label_for).to eq('facet_suggest_language_facet')
 
     expect(rendered.css('input').first.attribute('id').text).to eq id_in_label_for
   end
+
+  context 'when the facet is explicitly configured to suggest: false' do
+    let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet', suggest: false }
+    it 'does not display' do
+      expect(render_inline(described_class.new(facet: facet, presenter: presenter)).to_s).to eq ''
+    end
+  end
+
+  context 'when the facet is not explicitly configured with a suggest key' do
+    let(:facet) { Blacklight::Configuration::FacetField.new key: 'language_facet' }
+    it 'does not display' do
+      expect(render_inline(described_class.new(facet: facet, presenter: presenter)).to_s).to eq ''
+    end
+  end
 end
diff --git a/spec/features/facets_spec.rb b/spec/features/facets_spec.rb
index 912f82082d..fa6ce642c3 100644
--- a/spec/features/facets_spec.rb
+++ b/spec/features/facets_spec.rb
@@ -100,15 +100,23 @@
   end
 
   describe 'Facet modal' do
-    it 'allows the user to filter a long list of facet values', :js do
-      visit '/catalog/facet/subject_ssim'
-      expect(page).to have_no_link 'Old age' # This is on the second page of facet values
-      expect(page).to have_css 'a.facet-select', count: 20
-
-      fill_in 'facet_suggest_subject_ssim', with: "ag"
+    context 'when configured' do
+      before do
+        enabled = CatalogController.blacklight_config.dup
+        enabled.facet_fields[:subject_ssim].merge!({suggest: true})
+        allow(CatalogController).to receive(:blacklight_config).and_return enabled
+      end
 
-      expect(page).to have_link 'Old age'
-      expect(page).to have_css 'a.facet-select', count: 2
+      it 'allows the user to filter a long list of facet values', :js do
+        visit '/catalog/facet/subject_ssim'
+        expect(page).to have_no_link 'Old age' # This is on the second page of facet values
+        expect(page).to have_css 'a.facet-select', count: 20
+  
+        fill_in 'facet_suggest_subject_ssim', with: "ag"
+  
+        expect(page).to have_link 'Old age'
+        expect(page).to have_css 'a.facet-select', count: 2
+      end
     end
   end
 end