Bugfix to make advanced search "facet query" fields work, e.g., Date …

VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

app/controllers/search_history_controller.rb

@@ -2,6 +2,4 @@
 
 class SearchHistoryController < ApplicationController
   include Blacklight::SearchHistory
-
-  helper BlacklightAdvancedSearch::RenderConstraintsOverride
 end

app/models/default_local_search_builder.rb

@@ -9,6 +9,5 @@ class DefaultLocalSearchBuilder < SearchBuilder
                                      author_boost
                                      subjects_boost
                                      add_document_ids_query
-                                     facetize_advanced_search_fields
                                      add_solr_debug]
 end

app/models/default_trln_search_builder.rb

@@ -9,6 +9,5 @@ class DefaultTrlnSearchBuilder < SearchBuilder
                                      author_boost
                                      subjects_boost
                                      add_document_ids_query
-                                     facetize_advanced_search_fields
                                      add_solr_debug]
 end

lib/trln_argon/argon_search_builder.rb

@@ -9,7 +9,6 @@
 require 'trln_argon/argon_search_builder/subjects_boost'
 require 'trln_argon/argon_search_builder/wildcard_char_strip'
 require 'trln_argon/argon_search_builder/share_bookmarks'
-require 'trln_argon/argon_search_builder/advanced_search_cleanup'
 
 module TrlnArgon
   # Shared SearchBuilder behaviors concerning record rollup,
@@ -26,6 +25,5 @@ module ArgonSearchBuilder
     include SubjectsBoost
     include WildcardCharStrip
     include ShareBookmarks
-    include AdvancedSearchCleanup
   end
 end

lib/trln_argon/controller_override.rb

@@ -120,12 +120,13 @@ module ControllerOverride
           'facet.field' => [TrlnArgon::Fields::AVAILABLE_FACET.to_s,
                             TrlnArgon::Fields::ACCESS_TYPE_FACET.to_s,
                             TrlnArgon::Fields::RESOURCE_TYPE_FACET.to_s,
-                            TrlnArgon::Fields::LANGUAGE_FACET.to_s],
+                            TrlnArgon::Fields::LANGUAGE_FACET.to_s,
+                            TrlnArgon::Fields::DATE_CATALOGED_FACET.to_s],
           'f.resource_type_f.facet.limit' => -1, # return all resource type values
           'f.language_f.facet.limit' => -1, # return all language facet values
+          'f.date_cataloged_dt.facet.limit' => -1, # return all date facet values
           'facet.limit' => -1, # return all facet values
-          'facet.sort' => 'index', # sort by byte order of values
-          'facet.query' => ''
+          'facet.sort' => 'index' # sort by byte order of values
         }
 
         config.index.title_field = TrlnArgon::Fields::TITLE_MAIN.to_s
@@ -253,9 +254,8 @@ module ControllerOverride
                                         'last_three_months' => { label: I18n.t('trln_argon.new_title_ranges.now_minus_three_months'),
                                                                  fq: "#{TrlnArgon::Fields::DATE_CATALOGED_FACET}:[NOW-3MONTH/DAY TO NOW]" } },
                                label: TrlnArgon::Fields::DATE_CATALOGED_FACET.label,
-                               limit: true
-        #                      Hide Advanced search New Titles facet until it's fixed
-        #                      advanced_search_component: TrlnArgon::AdvancedSearchFacetFieldComponent
+                               limit: true,
+                               advanced_search_component: TrlnArgon::AdvancedSearchFacetFieldComponent
 
         # hierarchical facet configuration
         config.facet_display ||= {}

lib/trln_argon/view_helpers.rb

@@ -3,10 +3,6 @@ module ViewHelpers
     autoload :BlacklightHelperBehavior, 'trln_argon/view_helpers/blacklight_helper_behavior'
     autoload :CatalogHelperBehavior, 'trln_argon/view_helpers/catalog_helper_behavior'
     autoload :HierarchyHelper, 'trln_argon/view_helpers/hierarchy_helper'
-    # autoload :RenderConstraintsHelperBehavior,
-    #          'trln_argon/view_helpers/render_constraints_helper_behavior'
-    autoload :SearchHistoryConstraintsHelperBehavior,
-             'trln_argon/view_helpers/search_history_constraints_helper_behavior'
     autoload :TrlnArgonHelper, 'trln_argon/view_helpers/trln_argon_helper'
   end
 end

lib/trln_argon/view_helpers/render_constraints_helper_behavior.rb

@@ -1,8 +1,6 @@
 module TrlnArgon
   module ViewHelpers
     module RenderConstraintsHelperBehavior
-      # include BlacklightAdvancedSearch::RenderConstraintsOverride
-
       # handles a special case only in TRLN
       def render_constraints_query(my_params = params)
         if my_params[:doc_ids].nil?

spec/lib/trln_argon/controller_override_spec.rb

@@ -32,12 +32,13 @@ class ControllerOverrideTestClass < CatalogController
         'facet.field' => [TrlnArgon::Fields::AVAILABLE_FACET.to_s,
                           TrlnArgon::Fields::ACCESS_TYPE_FACET.to_s,
                           TrlnArgon::Fields::RESOURCE_TYPE_FACET.to_s,
-                          TrlnArgon::Fields::LANGUAGE_FACET.to_s],
+                          TrlnArgon::Fields::LANGUAGE_FACET.to_s,
+                          TrlnArgon::Fields::DATE_CATALOGED_FACET.to_s],
+        'f.date_cataloged_dt.facet.limit' => -1,
         'f.resource_type_f.facet.limit' => -1,
         'f.language_f.facet.limit' => -1,
         'facet.limit' => -1,
-        'facet.sort' => 'index',
-        'facet.query' => ''
+        'facet.sort' => 'index'
       )
     end
   end