Merge pull request #131 from MITLibraries/filter-bugfix

Make new aggregations searchable

Author: jazairi

app/models/enhancer.rb

@@ -2,7 +2,9 @@ class Enhancer
   attr_accessor :enhanced_query
 
   QUERY_PARAMS = %i[q citation contentType contributors fundingInformation identifiers locations subjects title].freeze
-  FILTER_PARAMS = %i[sourceFilter contentTypeFilter].freeze
+  FILTER_PARAMS = %i[contentTypeFilter contributorsFilter formatFilter languagesFilter literaryFormFilter sourceFilter
+                     subjectsFilter].freeze
+
   # accepts all params as each enhancer may require different data
   def initialize(params)
     @enhanced_query = {}

app/models/query_builder.rb

@@ -3,7 +3,8 @@ class QueryBuilder
 
   RESULTS_PER_PAGE = 20
   QUERY_PARAMS = %w[q citation contributors fundingInformation identifiers locations subjects title].freeze
-  FILTER_PARAMS = %i[sourceFilter contentTypeFilter].freeze
+  FILTER_PARAMS = %i[contentTypeFilter contributorsFilter formatFilter languagesFilter literaryFormFilter sourceFilter
+                     subjectsFilter].freeze
 
   def initialize(enhanced_query)
     @query = {}

app/models/timdex_search.rb

@@ -12,10 +12,15 @@ class TimdexSearch < TimdexBase
       $locations: String
       $subjects: String
       $title: String
-      $sourceFilter: [String!]
       $index: String
       $from: String
       $contentTypeFilter: [String!]
+      $contributorsFilter: [String!]
+      $formatFilter: [String!]
+      $languagesFilter: [String!]
+      $literaryFormFilter: String
+      $sourceFilter: [String!]
+      $subjectsFilter: [String!]
     ) {
       search(
         searchterm: $q
@@ -26,10 +31,15 @@ class TimdexSearch < TimdexBase
         locations: $locations
         subjects: $subjects
         title: $title
-        sourceFilter: $sourceFilter
         index: $index
         from: $from
         contentTypeFilter: $contentTypeFilter
+        contributorsFilter: $contributorsFilter
+        formatFilter: $formatFilter
+        languagesFilter: $languagesFilter
+        literaryFormFilter: $literaryFormFilter
+        sourceFilter: $sourceFilter
+        subjectsFilter: $subjectsFilter
       ) {
         hits
         records {

app/views/search/_filter.html.erb

@@ -1,17 +1,17 @@
 <% return if values.blank? %>
 
 <div class="category">
-  <button class="filter-label <%= 'expanded' if @enhanced_query[category.to_sym].present? || first == true %>"
+  <button class="filter-label <%= 'expanded' if @enhanced_query[category].present? || first == true %>"
           onclick="toggleFilter(this)"><%= nice_labels[category] || category %></button>
   <div class="filter-options">
     <ul class="category-terms list-unbulleted">
     <% values.each do |term| %>
       <li class="term">
         <% if filter_applied?(@enhanced_query[category.to_sym], term['key']) %>
-          <a href="<%= results_path(remove_filter(@enhanced_query, category.to_sym, term['key'])) %>" class="applied">
+          <a href="<%= results_path(remove_filter(@enhanced_query, category, term['key'])) %>" class="applied">
           <span class="sr">Remove applied filter?</span>
         <% else %>
-          <a href="<%= results_path(add_filter(@enhanced_query, category.to_sym, term['key'])) %>">
+          <a href="<%= results_path(add_filter(@enhanced_query, category, term['key'])) %>">
         <% end %>
           <span class="name"><%= term['key'] %></span>
           <span class="count"><%= term['docCount'] %> <span class="sr">records</span></span>