blacklight 9.0.0.beta7 → 9.0.0.beta8

data/app/javascript/blacklight-frontend/modal.js

@@ -160,11 +160,14 @@ const Modal = (() => {
 
     // Make sure user-agent dismissal of html 'dialog', etc `esc` key, triggers
     // our hide logic, including events and scroll restoration.
-    modal.target().addEventListener('cancel', (e) => {
-      e.preventDefault(); // 'hide' will close the modal unless cancelled
+    const modalDom = modal.target();
+    if (modalDom) {
+      modal.target().addEventListener('cancel', (e) => {
+        e.preventDefault(); // 'hide' will close the modal unless cancelled
 
-      modal.hide();
-    });
+        modal.hide();
+      });
+    }
   };
 
   modal.hide = function (el) {

data/app/presenters/blacklight/document_presenter.rb

@@ -44,11 +44,11 @@ module Blacklight
     #
     # @return [String]
     def heading
-      return field_value(view_config.title_field) if view_config.title_field.is_a? Blacklight::Configuration::Field
+      return field_value(view_config.title_field, join: true).first if view_config.title_field.is_a? Blacklight::Configuration::Field
 
       fields = Array.wrap(view_config.title_field) + [configuration.document_model.unique_key]
       f = fields.lazy.map { |field| field_config(field) }.detect { |field_config| field_presenter(field_config).any? }
-      f ? field_value(f, except_operations: [Rendering::HelperMethod]) : ""
+      f ? field_value(f, except_operations: [Rendering::HelperMethod], join: true).first : ""
     end
 
     ##
@@ -58,12 +58,12 @@ module Blacklight
     # @see #document_heading
     # @return [String]
     def html_title
-      return field_value(view_config.html_title_field) if view_config.html_title_field.is_a? Blacklight::Configuration::Field
+      return field_value(view_config.html_title_field, join: true).first if view_config.html_title_field.is_a? Blacklight::Configuration::Field
 
       if view_config.html_title_field
         fields = Array.wrap(view_config.html_title_field) + [configuration.document_model.unique_key]
         f = fields.lazy.map { |field| field_config(field) }.detect { |field_config| field_presenter(field_config).any? }
-        field_value(f)
+        field_value(f, join: true).first
       else
         heading
       end
@@ -93,8 +93,9 @@ module Blacklight
     # @param [Configuration::Field] field_config
     # @param [Hash] options
     # @option options [String] :value
+    # @return [Array]
     def field_value field_config, options = {}
-      field_presenter(field_config, options).render
+      Array.wrap(field_presenter(field_config, options).render)
     end
 
     def thumbnail_presenter_class

data/app/presenters/blacklight/facet_field_presenter.rb

@@ -4,18 +4,18 @@ module Blacklight
   class FacetFieldPresenter
     attr_reader :facet_field, :display_facet, :view_context, :search_state
 
-    delegate :key, :suggest, to: :facet_field
+    delegate :key, to: :facet_field
     delegate :field_name, to: :display_facet
 
     # @param [Blacklight::Configuration::FacetField] facet_field
     # @param [Blacklight::Solr::Response::Facets::FacetField] display_facet
     # @param [#search_action_path,#facet_field_presenter] view_context
     # @param [Blacklight::SearchState] search_state
-    def initialize(facet_field, display_facet, view_context, search_state = view_context.search_state)
+    def initialize(facet_field, display_facet, view_context, search_state = nil)
       @facet_field = facet_field
       @display_facet = display_facet
       @view_context = view_context
-      @search_state = search_state
+      @search_state = search_state || view_context&.search_state
     end
 
     # @param [Blacklight::Solr::Response::Facets::FacetItem, String] facet_item
@@ -23,6 +23,13 @@ module Blacklight
       facet_field.item_presenter.new(facet_item, facet_field, view_context, key, search_state)
     end
 
+    # Is facet suggest feature configured on for this facet, or by global default.
+    #
+    # @return [Boolean]
+    def suggest?
+      !!(facet_field.suggest.nil? ? blacklight_config.default_facet_suggest : facet_field.suggest)
+    end
+
     def collapsed?
       !active? && facet_field.collapse
     end

data/app/presenters/blacklight/field_presenter.rb

@@ -33,9 +33,11 @@ module Blacklight
 
     delegate :key, :component, to: :field_config
 
-    # @return [String]
+    # @return [Array<String>]
     def render
-      Rendering::Pipeline.new(values, field_config, document, view_context, pipeline_steps, options).render
+      Array.wrap(
+        Rendering::Pipeline.new(values, field_config, document, view_context, pipeline_steps, options).render
+      )
     end
 
     # @return [Enumerable]

data/app/presenters/blacklight/rendering/abstract_step.rb

@@ -22,7 +22,13 @@ module Blacklight
       end
 
       def html?
-        options[:format].nil? || options[:format].to_s == 'html'
+        format.nil? || format.to_s == 'html'
+      end
+
+      def format
+        return options[:format] unless context.respond_to?(:search_state)
+
+        options[:format] || context.search_state&.params&.dig(:format)
       end
     end
   end

data/app/presenters/blacklight/rendering/join.rb

@@ -5,12 +5,11 @@ module Blacklight
     class Join < AbstractStep
       def render
         options = config.separator_options || {}
-        if values.one? || values.none?
-          next_step(values.first)
-        elsif !html?
-          next_step(values.to_sentence(options))
-        else
+
+        if join? && html? && values.many?
           next_step(values.map { |x| x.html_safe? ? x : html_escape(x) }.to_sentence(options).html_safe)
+        else
+          next_step(values)
         end
       end
 
@@ -19,6 +18,11 @@ module Blacklight
       def html_escape(*)
         ERB::Util.html_escape(*)
       end
+
+      # @return [Boolean]
+      def join?
+        options[:join] || config.join || config.separator_options
+      end
     end
   end
 end

data/app/presenters/blacklight/rendering/terminator.rb

@@ -4,7 +4,7 @@ module Blacklight
   module Rendering
     class Terminator < AbstractStep
       def render
-        values
+        Array.wrap values
       end
     end
   end

data/app/views/catalog/_show_main_content.html.erb

@@ -1,14 +1,18 @@
-<%= render blacklight_config.view_config(:show).document_header_component.new(document: @document, search_context: @search_context, search_session: search_session) %>
-<% @page_title = t('blacklight.search.show.title', document_title: document_presenter(@document).html_title, application_name: application_name).html_safe %>
+<%# locals: (presenter: nil) %>
+<% presenter ||= document_presenter(@document) %>
+
+<% @page_title = t('blacklight.search.show.title', document_title: presenter.html_title, application_name: application_name).html_safe %>
 <% content_for(:head) { render_link_rel_alternates } %>
 
-<% document_component = blacklight_config.view_config(:show).document_component -%>
-<%= render document_component.new(document: document_presenter(@document), component: :div, show: true, partials: blacklight_config.view_config(:show).partials) do |component| %>
+<%= render presenter.view_config.document_header_component.new(document: @document, search_context: @search_context, search_session: search_session) %>
+
+<% document_component = presenter.view_config.document_component -%>
+<%= render document_component.new(id: 'document', document: presenter, component: :div, show: true, partials: presenter.view_config.partials) do |component| %>
   <% component.with_title(as: 'h1', classes: '', link_to_document: false, actions: false) %>
   <% component.with_footer do %>
     <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
       <!-- COinS, for Zotero among others. -->
-      <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(document_presenter(@document).display_type) %>"></span>
+      <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(presenter.display_type) %>"></span>
     <% end %>
   <% end %>
 <% end %>

data/app/views/catalog/index.html.erb

@@ -11,7 +11,6 @@
 <% unless has_search_parameters? %>
   <%# if there are no input/search related params, display the "home" partial -%>
   <%= render 'home' %>
-  <%= render 'shared/sitelinks_search_box' %>
 <% else %>
   <%= render 'search_results' %>
 <% end %>

data/app/views/catalog/show.html.erb

@@ -1,6 +1,6 @@
-<%= render 'show_main_content' %>
+<% presenter = document_presenter(@document) %>
+<%= render 'show_main_content', presenter: presenter %>
 
 <% content_for(:sidebar) do %>
-  <% presenter = document_presenter(@document) %>
   <%= render presenter.view_config.sidebar_component.new(presenter: presenter) %>
 <% end %>

data/config/locales/blacklight.en.yml

@@ -11,7 +11,7 @@ en:
         sort_label: Sort results by
         start_over_html: Start over
         title: Advanced search
-      more_options: More options
+      more_options: Advanced search
       op:
         label: search operator
         must: all

data/lib/blacklight/component.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'view_component/version'
+
 module Blacklight
   class Component < ViewComponent::Base
     class << self

data/lib/blacklight/configuration/facet_field.rb

@@ -16,6 +16,8 @@ module Blacklight
     #   @return [Boolean] whether to show the facet to the user or not (very similar to the more generic if/unless)
     # @!attribute index_range
     #   @return [Enumerable] a list of facet prefixes (default: A-Z) to allow users to 'jump' to particular values
+    # @!attribute suggest
+    #   @return [Boolean] whether to display a suggest/autocomplete on the detailed facet view that allows users to filter facet values
     # @!attribute date
     #   @return [Symbol|Hash] the i18n localization option for a date or time value; used as the second parameter for the I18n.l method
     # @!attribute link_to_facet

data/lib/blacklight/configuration/view_config.rb

@@ -8,6 +8,14 @@ class Blacklight::Configuration
     #   @return [Class] document presenter class used by helpers and views
     # @!attribute document_component
     #   @return [Class] component class used to render a document; defaults to Blacklight::DocumentComponent
+    # @!attribute document_title_component
+    #   @return [Class] component class used to render a document title
+    # @!attribute document_metadata_component
+    #   @return [Class] component class used to render the document metadata
+    # @!attribute document_thumbnail_component
+    #   @return [Class] component class used to render a document thumbnail
+    # @!attribute document_embed_component
+    #   @return [Class] component class used to render a document embed
     # @!attribute title_field
     #   @return [String, Symbol] solr field to use to render a document title
     # @!attribute display_type_field
@@ -46,19 +54,33 @@ class Blacklight::Configuration
       end
     end
 
+    # Provide backwards compatibility with the configuration keys without the document_ prefix
+    def title_component(*) = document_title_component(*)
+    def metadata_component(*) = document_metadata_component(*)
+    def thumbnail_component(*) = document_thumbnail_component(*)
+    def embed_component(*) = document_embed_component(*)
+
+    def title_component=(value)
+      self.document_title_component = value
+    end
+
+    def metadata_component=(value)
+      self.document_metadata_component = value
+    end
+
+    def thumbnail_component=(value)
+      self.document_thumbnail_component = value
+    end
+
+    def embed_component=(value)
+      self.document_embed_component = value
+    end
+
     class Show < ViewConfig
       # @!attribute route
       #   @return [Hash] Default route parameters for 'show' requests.
       #     Set this to a hash with additional arguments to merge into the route,
       #     or set `controller: :current` to route to the current controller.
-
-      def document_presenter_class
-        super || Blacklight::ShowPresenter
-      end
-
-      def to_h
-        super.merge(document_presenter_class: document_presenter_class)
-      end
     end
 
     class Index < ViewConfig
@@ -69,14 +91,6 @@ class Blacklight::Configuration
       #      see Blacklight::Catalog#additional_response_formats for information about the OpenStruct data
       # @!attribute collection_actions
       #   @return [String, Symbol]
-
-      def document_presenter_class
-        super || Blacklight::IndexPresenter
-      end
-
-      def to_h
-        super.merge(document_presenter_class: document_presenter_class)
-      end
     end
   end
 end

data/lib/blacklight/configuration.rb

@@ -73,7 +73,8 @@ module Blacklight
       # @!attribute json_solr_path
       # @since v7.34.0
       # @return [String] The url path (relative to the solr base url) to use when using Solr's JSON Query DSL (as with the advanced search)
-      property :json_solr_path, default: 'advanced'
+      # @note You can configure a separate custom 'advanced' requestHandler in solrconfig.xml if desired, but it isn't necessary; the default 'select' handler will work.
+      property :json_solr_path, default: 'select'
       # @!attribute document_unique_id_param
       # @since v5.2.0
       # @return [Symbol] The solr query parameter used for sending the unique identifiers for one or more documents
@@ -147,11 +148,15 @@ module Blacklight
       # @return [Blacklight::Configuration::ViewConfig::Index]
       property :index, default: ViewConfig::Index.new(
         # document presenter class used by helpers and views
-        document_presenter_class: nil,
+        document_presenter_class: Blacklight::IndexPresenter,
         # document presenter used for json responses
         json_presenter_class: Blacklight::JsonPresenter,
         # component class used to render a document
         document_component: Blacklight::DocumentComponent,
+        document_embed_component: nil,
+        document_metadata_component: Blacklight::DocumentMetadataComponent,
+        document_thumbnail_component: Blacklight::Document::ThumbnailComponent,
+        document_title_component: Blacklight::DocumentTitleComponent,
         sidebar_component: Blacklight::Search::SidebarComponent,
         dropdown_component: Blacklight::System::DropdownComponent,
         # solr field to use to render a document title
@@ -187,8 +192,9 @@ module Blacklight
       # @return [Blacklight::Configuration::ViewConfig::Show]
       property :show, default: ViewConfig::Show.new(
         # document presenter class used by helpers and views
-        document_presenter_class: nil,
+        document_presenter_class: Blacklight::ShowPresenter,
         document_component: Blacklight::DocumentComponent,
+        document_thumbnail_component: nil,
         show_tools_component: Blacklight::Document::ShowToolsComponent,
         show_header_tools_component: nil,
         document_header_component: Blacklight::Document::PageHeaderComponent,
@@ -269,6 +275,10 @@ module Blacklight
       # @since v5.10.0
       # @return [Integer]
       property :default_facet_limit, default: 10
+      # @!attribute default_facet_suggest
+      # @since v9.0.0
+      # @return [Boolean]
+      property :default_facet_suggest, default: true
       # @!attribute default_more_limit
       # @since v7.0.0
       # @return [Integer]
@@ -299,8 +309,13 @@ module Blacklight
 
       # @!attribute advanced_search
       # @since v7.15.0
-      # @return [#enabled]
-      property :advanced_search, default: OpenStruct.new(enabled: false)
+      # @return [OpenStructWithHashAccess] Configuration for advanced search, including:
+      #   enabled: (Boolean) whether advanced search is enabled
+      #   form_solr_parameters: (Hash) optional parameters to send to Solr for the advanced search
+      #                                form; can override values that are set automatically via the
+      #                                #copy_facet_field_config_to_advanced! method
+      property :advanced_search, default: OpenStructWithHashAccess.new(enabled: true,
+                                                                       form_solr_parameters: {})
 
       # @!attribute enable_search_bar_autofocus
       # @since v7.2.0
@@ -457,6 +472,42 @@ module Blacklight
       facet_fields.map { |_facet, opts| opts[:group] }.uniq
     end
 
+    # Use existing search field configs to automatically prepare fields for use
+    # by the advanced search form.
+    def copy_search_field_config_to_advanced!
+      search_fields.each_value do |field|
+        next if field.include_in_advanced_search == false
+        next if field.clause_params
+
+        field.clause_params = {}
+        field.clause_params[:edismax] = field.solr_parameters.dup || {}
+      end
+    end
+
+    # Use existing facet field configs to automatically prepare fields for use
+    # by the advanced search form. If more specific config is needed, e.g., to
+    # set the facet limit for one field to a value other than -1, it can be
+    # expressed in the configuration in advanced_search.form_solr_parameters
+    def copy_facet_field_config_to_advanced!
+      advanced_search.form_solr_parameters ||= {}
+      advanced_search.form_solr_parameters['facet.sort'] ||= 'count'
+      advanced_search.form_solr_parameters['facet.field'] ||= []
+
+      facet_fields.each_value do |field|
+        next if field.include_in_advanced_search == false
+        # Skip query-type and pivot facets that can't be requested via facet.field
+        next if field.query || field.pivot || field.range
+
+        # Add the facet field to the advanced search configuration
+        advanced_search.form_solr_parameters['facet.field'] << field.field unless
+          advanced_search.form_solr_parameters['facet.field'].include?(field.field)
+
+        # Set the facet field's limit to -1 to show ALL values in advanced search
+        advanced_search.form_solr_parameters["f.#{field.field}.facet.limit"] = -1 unless
+          advanced_search.form_solr_parameters["f.#{field.field}.facet.limit"]
+      end
+    end
+
     # Add any configured facet fields to the default solr parameters hash
     # @overload add_facet_fields_to_solr_request!
     #    add all facet fields to the solr request

data/lib/blacklight/search_state/pivot_filter_field.rb

@@ -102,7 +102,7 @@ module Blacklight
             end
             queries.uniq!
           end
-          [(queries - existing)]
+          [queries - existing]
         end
       end
 

data/lib/blacklight/solr/field_reflection_search_builder.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  class FieldReflectionSearchBuilder < SearchBuilder
+    self.default_processor_chain = [:add_params]
+
+    def add_params(request)
+      request.reverse_merge!({ fl: '*', 'json.nl' => 'map' })
+    end
+  end
+end

data/lib/blacklight/solr/repository.rb

@@ -7,8 +7,7 @@ module Blacklight::Solr
     # @param [String] id document's unique key value
     # @param [Hash] params additional solr query parameters
     def find id, params = {}
-      doc_params = params.reverse_merge(blacklight_config.default_document_solr_params)
-                         .merge(blacklight_config.document_unique_id_param => id)
+      doc_params = SingleDocSearchBuilder.new(self, id, params)
 
       solr_response = send_and_receive blacklight_config.document_solr_path || blacklight_config.solr_path, doc_params
       raise Blacklight::Exceptions::RecordNotFound if solr_response.documents.empty?
@@ -24,14 +23,14 @@ module Blacklight::Solr
 
     ##
     # Execute a search query against solr
-    # @param [Hash] params solr query parameters
+    # @param [Hash,Blacklight::SearchBuilder] params solr query parameters
     # @param [String] path solr request handler path
     def search pos_params = nil, path: nil, params: nil, **kwargs
       if pos_params
         Blacklight.deprecation.warn("Passing positional arguments to search() is deprecated. Use the params kwarg instead.")
       end
 
-      request_params = (params || pos_params).reverse_merge(kwargs).reverse_merge({ qt: blacklight_config.qt })
+      request_params = (params || pos_params || {}).reverse_merge(kwargs).reverse_merge({ qt: blacklight_config.qt })
 
       send_and_receive(path || default_search_path(request_params), request_params)
     end
@@ -47,7 +46,8 @@ module Blacklight::Solr
     # Gets a list of available fields
     # @return [Hash]
     def reflect_fields
-      send_and_receive('admin/luke', params: { fl: '*', 'json.nl' => 'map' })['fields']
+      doc_params = FieldReflectionSearchBuilder.new(self)
+      send_and_receive('admin/luke', doc_params)['fields']
     end
 
     ##

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -10,7 +10,7 @@ module Blacklight::Solr
         :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_adv_search_clauses, :add_facets_for_advanced_search_form,
         :add_additional_filters
       ]
     end
@@ -95,6 +95,13 @@ module Blacklight::Solr
     def add_adv_search_clauses(solr_parameters)
       return if search_state.clause_params.blank?
 
+      # We need to specify lucene as the top-level defType when using JSON Query DSL in Solr versions
+      # between 7.2.0 & 9.4.0. After 9.4.0 this is no longer necessary, but also not harmful to include.
+      solr_parameters[:defType] = 'lucene'
+
+      # Disable spellcheck, which doesn't work when using JSON Query DSL
+      solr_parameters[:spellcheck] = 'false'
+
       defaults = { must: [], must_not: [], should: [] }
       default_op = blacklight_params[:op]&.to_sym || :must
       solr_parameters[:mm] = 1 if default_op == :should && search_state.clause_params.values.any? { |clause| }
@@ -117,6 +124,16 @@ module Blacklight::Solr
       [op, field.clause_params.transform_values { |v| v.merge(query: clause[:query]) }]
     end
 
+    # Merge the advanced search form parameters into the solr parameters
+    # @param [Hash] solr_parameters the current solr parameters
+    # @return [Hash] the solr parameters with the additional advanced search form parameters
+    def add_facets_for_advanced_search_form(solr_parameters)
+      return unless search_state.controller&.action_name == 'advanced_search' &&
+                    blacklight_config.advanced_search[:form_solr_parameters]
+
+      solr_parameters.merge!(blacklight_config.advanced_search[:form_solr_parameters])
+    end
+
     ##
     # Add any existing facet limits, stored in app-level HTTP query
     # as :f, to solr as appropriate :fq query.
@@ -243,7 +260,7 @@ module Blacklight::Solr
 
     # Look up facet limit for given facet_field. Will look at config, and
     # if config is 'true' will look up from Solr @response if available. If
-    # no limit is avaialble, returns nil. Used from #add_facetting_to_solr
+    # no limit is available, returns nil. Used from #add_facetting_to_solr
     # to supply f.fieldname.facet.limit values in solr request (no @response
     # available), and used in display (with @response available) to create
     # a facet paginator with the right limit.

data/lib/blacklight/solr/single_doc_search_builder.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Blacklight::Solr
+  class SingleDocSearchBuilder < SearchBuilder
+    self.default_processor_chain = [:add_defaults, :add_qt, :add_unique_id]
+
+    def initialize(scope, id, other_params)
+      @other_params = other_params
+      @id = id
+      super(scope)
+    end
+
+    def add_defaults(request)
+      request.reverse_merge!(blacklight_config.default_document_solr_params).reverse_merge!(@other_params)
+    end
+
+    def add_qt(request)
+      request[:qt] ||= blacklight_config.document_solr_request_handler if blacklight_config.document_solr_request_handler
+    end
+
+    def add_unique_id(request)
+      request[blacklight_config.document_unique_id_param] = @id
+    end
+  end
+end

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -29,6 +29,13 @@ class <%= controller_name.classify %>Controller < ApplicationController
     #
     ## Should the raw solr document endpoint (e.g. /catalog/:id/raw) be enabled
     # config.raw_endpoint.enabled = false
+    #
+    ## Should advanced search be enabled
+    # config.advanced_search.enabled = true
+    #
+    ## Optional fine-tuning for advanced search, e.g., set different limits for
+    ## different facets.
+    # config.advanced_search.form_solr_parameters = {}
 
     ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = {
@@ -38,7 +45,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # solr path which will be added to solr base url before the other solr params.
     #config.solr_path = 'select'
     #config.document_solr_path = 'get'
-    #config.json_solr_path = 'advanced'
+    #config.json_solr_path = 'select'
 
     # items to show per page, each number in the array represent another option to choose from.
     #config.per_page = [10,20,50,100]
@@ -105,6 +112,12 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # :show may be set to false if you don't want the facet to be drawn in the
     # facet bar
     #
+    # Set :include_in_advanced_search to false for any search field or facet field
+    # that you want to exclude from appearing in the advanced search page.
+    #
+    # Set :include_in_simple_select to false for any search field you want to render
+    # in the Advanced Search page but exclude from the main search box scope selector.
+    #
     # Set :index_range to true if you want the facet pagination view to have facet prefix-based navigation.
     #  (useful when user clicks "more" on a large facet and wants to navigate alphabetically across a large set of results)
     # :index_range can be an array or range of prefixes that will be used to create the navigation (note: It is case sensitive when searching values)
@@ -121,7 +134,9 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     config.add_facet_field 'example_pivot_field',
                            label: 'Pivot Field',
-                           pivot: ['language_ssim', 'subject_geo_ssim', 'subject_ssim'], collapsing: true
+                           pivot: ['language_ssim', 'subject_geo_ssim', 'subject_ssim'],
+                           collapsing: true,
+                           include_in_advanced_search: false
 
     config.add_facet_field 'example_query_facet_field', label: 'Publish Date', :query => {
        :years_5 => { label: 'within 5 Years', fq: "pub_date_ssim:[#{Time.zone.now.year - 5 } TO *]" },
@@ -165,7 +180,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     config.add_show_field 'isbn_ssim', label: 'ISBN'
 
     # "fielded" search configuration. Used by pulldown among other places.
-    # For supported keys in hash, see rdoc for Blacklight::SearchFields
+    # For supported keys in hash, see rdoc for Blacklight::Configuration::SearchField
     #
     # Search fields will inherit the :qt solr request handler from
     # config[:default_solr_parameters], OR can specify a different one
@@ -208,7 +223,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     # Specifying a :qt only to show it's possible, and so our internal automated
     # tests can test it. In this case it's the same as
-    # config[:default_solr_parameters][:qt], so isn't actually neccesary.
+    # config[:default_solr_parameters][:qt], so isn't actually necessary.
     config.add_search_field('subject') do |field|
       field.qt = 'search'
       field.solr_parameters = {
@@ -218,6 +233,13 @@ class <%= controller_name.classify %>Controller < ApplicationController
       }
     end
 
+    # Set up a default advanced search configuration by using the current
+    # search_fields and facet_fields configs.
+    if config.advanced_search.enabled
+      config.copy_search_field_config_to_advanced!
+      config.copy_facet_field_config_to_advanced!
+    end
+
     # "sort results by" select (pulldown)
     # label in pulldown is followed by the name of the Solr field to sort by and
     # whether the sort is ascending or descending (it must be asc or desc