Merge pull request #72 from MITLibraries/rdi-241-support-for-multivalue-facets

Support multivalue facets

Author: JPrevost

app/helpers/facet_helper.rb

@@ -1,8 +1,21 @@
 module FacetHelper
   def add_facet(query, facet, term)
-    new_query = query.clone
+    new_query = query.deep_dup
     new_query[:page] = 1
-    new_query[facet.to_sym] = term
+
+    # source is being treated as single value in facet application
+    # even though we allow OR-ing multiple sources via advanced search
+    # This might feel somewhat odd, but until we get feedback from UX this
+    # seems like the best solution as each record only has a single source
+    # in the data so there will never be a case to apply multiple in an AND
+    # which is all we support in facet application.
+    if new_query[facet].present? && facet != 'source'
+      new_query[facet] << term
+      new_query[facet].uniq!
+    else
+      new_query[facet] = [term]
+    end
+
     new_query
   end
 
@@ -14,7 +27,7 @@ def nice_labels
   end
 
   def remove_facet(query, facet)
-    new_query = query.clone
+    new_query = query.deep_dup
     new_query[:page] = 1
     new_query.delete facet.to_sym
     new_query

app/helpers/form_helper.rb

@@ -2,9 +2,9 @@ module FormHelper
   def source_checkbox(source, params)
     "<div class='field-subitem'>
       <label class='field-checkbox'>
-        <input type='checkbox' value='#{source}' name='source[]' class='source'#{if params[:source]&.include?(source)
-                                                                                   ' checked'
-                                                                                 end}>
+        <input type='checkbox' value='#{source.downcase}' name='source[]' class='source'#{if params[:source]&.include?(source.downcase)
+                                                                                            ' checked'
+                                                                                          end}>
         #{source}
       </label>
     </div>".html_safe

app/models/query_builder.rb

@@ -2,8 +2,8 @@ class QueryBuilder
   attr_reader :query
 
   RESULTS_PER_PAGE = 20
-  QUERY_PARAMS = %w[q citation contentType contributors fundingInformation identifiers locations subjects title].freeze
-  FILTER_PARAMS = [:source].freeze
+  QUERY_PARAMS = %w[q citation contributors fundingInformation identifiers locations subjects title].freeze
+  FILTER_PARAMS = %i[source contentType].freeze
 
   def initialize(enhanced_query)
     @query = {}
@@ -31,5 +31,6 @@ def extract_query(enhanced_query)
   def extract_filters(enhanced_query)
     # NOTE: ui and backend naming are not aligned so we can't loop here. we should fix in UI
     @query['sourceFacet'] = enhanced_query[:source]
+    @query['contentType'] = enhanced_query[:contentType]
   end
 end

test/helpers/facet_helper_test.rb

@@ -11,7 +11,7 @@ class FacetHelperTest < ActionView::TestCase
     expected_query = {
       page: 1,
       q: 'data',
-      contentType: 'dataset'
+      'contentType' => ['dataset']
     }
     assert_equal expected_query, add_facet(original_query, 'contentType', 'dataset')
   end
@@ -24,11 +24,39 @@ class FacetHelperTest < ActionView::TestCase
     expected_query = {
       page: 1,
       q: 'data',
-      contentType: 'dataset'
+      'contentType' => ['dataset']
     }
     assert_equal expected_query, add_facet(original_query, 'contentType', 'dataset')
   end
 
+  test 'add_facet can apply multiple values for each facet group' do
+    original_query = {
+      page: 3,
+      q: 'data',
+      'contentType' => ['still image']
+    }
+    expected_query = {
+      page: 1,
+      q: 'data',
+      'contentType' => ['still image', 'dataset']
+    }
+    assert_equal expected_query, add_facet(original_query, 'contentType', 'dataset')
+  end
+
+  test 'add_facet with source value overwrites existing sources' do
+    original_query = {
+      page: 3,
+      q: 'data',
+      'source' => ['source the first', 'source the second']
+    }
+    expected_query = {
+      page: 1,
+      q: 'data',
+      'source' => ['source the only']
+    }
+    assert_equal expected_query, add_facet(original_query, 'source', 'source the only')
+  end
+
   test 'nice_labels allows translation of machine categories to human readable headings' do
     needle = 'contentType'
     assert_equal 'Content types', nice_labels[needle]