blacklight 7.26.0 → 7.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61a8ce6dc6b7186a9facb02e2862cd9ab252992fd16ac8f3cfb52bb0dc414a0b
-  data.tar.gz: 8fca956b142ab7f1c446858320df1247bed718197ab499e826eb663406db95d9
+  metadata.gz: 5943737d0e65f97d49929bd5e1698de5f42a3cea352150f56e2417834ef307ea
+  data.tar.gz: e2ddfa33c4e1cf788a22084e9465acad0a530ea9d714e820c91805f09a8a2b80
 SHA512:
-  metadata.gz: 175534daee84446996871538ece0c562194b485d53b801cb8ab839569fe36c712d94c7629623dc5e32d4e58993d82bc4f899669dbdfaf30de5447235236728f4
-  data.tar.gz: 53c10ab08c741669511f9e77ea1d948968fc0b635b16a883c5c055ebeab45dfd9d7ab295838049f5ff27328f40bb66e06f919a28c649b4c3a89595c49812f176
+  metadata.gz: 2d8f7cfb29344d217c4f8f1929fa9ac422567b59ab47d893ccea78f425be5524f75e1456f19fc3bfc25b7211f17b152f7de0a02733bfe4c9bb7f9fd0b6044219
+  data.tar.gz: 6219cde27cd67bfb826532d2b08b6d50a720104a12525251dc79b59a35bb9be0ba5f776f5d6b2e09a3fcbecf410445ba827d4ba85b9106c00a52fe7424aea8f0

data/VERSION

@@ -1 +1 @@
-7.26.0
+7.26.1

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -120,6 +120,21 @@
     text-align: right;
     width: 5em;
   }
+
+  .facet-checkbox {
+    display: table-cell;
+    width: 1.25rem;
+    vertical-align: top;
+  }
+
+  .label-and-count {
+    display: table;
+    width: 100%;
+  }
+
+  .label-and-count label {
+    display: table-row;
+  }
 }
 
 .facet-extended-list {

data/app/components/blacklight/advanced_search_form_component.html.erb

@@ -1,4 +1,4 @@
-<% if constraints.present? %>
+<% if constraints? %>
   <div class="constraints well search_history">
     <h4><%= t 'blacklight.advanced_search.form.search_context' %></h4>
     <% constraints.each do |constraint| %>
@@ -11,8 +11,8 @@
   <%= render_hash_as_hidden_fields(@params) %>
 
   <div class="input-criteria">
-    <div class="query-criteria">
-      <h2 class="query-criteria-heading">
+    <div class="query-criteria mb-4">
+      <h2 class="query-criteria-heading h3 mb-4">
         <%= t('blacklight.advanced_search.form.query_criteria_heading_html', select_menu: default_operator_menu) %>
       </h2>
 
@@ -23,28 +23,32 @@
       </div>
     </div>
 
-    <div class="limit-criteria">
-      <h2 class="limit-criteria-heading"><%= t('blacklight.advanced_search.form.limit_criteria_heading_html')%></h2>
+    <% if search_filter_controls? %>
+      <div class="limit-criteria mb-4">
+        <h2 class="limit-criteria-heading h3"><%= t('blacklight.advanced_search.form.limit_criteria_heading_html')%></h2>
 
-      <div id="advanced_search_facets" class="limit_input">
-        <div class="advanced-facet-limits panel-group">
-          <% search_filter_controls.each do |control| %>
-            <%= control %>
-          <% end %>
+        <div id="advanced_search_facets" class="limit_input row">
+          <div class="advanced-facet-limits panel-group col-md-9 offset-md-3">
+            <% search_filter_controls.each do |control| %>
+              <%= control %>
+            <% end %>
+          </div>
         </div>
       </div>
-    </div>
+    <% end %>
   </div>
 
-  <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label') %>
-  <div class="form-group row">
-    <div class="col-sm-offset-3 col-sm-4">
-      <%= sort_fields_select %>
+  <% if sort_fields_select %>
+    <div class="form-group row mb-4">
+      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), class: 'col-md-3 col-form-label text-md-right' %>
+      <div class="col">
+        <%= sort_fields_select %>
+      </div>
     </div>
-  </div>
+  <% end %>
 
   <div class="form-group row">
-    <div class="submit-buttons col-sm-offset-3 col-sm-9">
+    <div class="submit-buttons col-md-9 offset-md-3">
       <%= submit_tag t('blacklight.advanced_search.form.search_btn_html'), class: 'btn btn-primary advanced-search-submit', id: "advanced-search-submit" %>
       <%= button_tag t('blacklight.advanced_search.form.start_over_html'), type: 'reset', class: 'btn btn-link advanced-search-start-over' %>
     </div>

data/app/components/blacklight/advanced_search_form_component.rb

@@ -31,7 +31,9 @@ module Blacklight
 
     def sort_fields_select
       options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
-      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-control sort-select")
+      return unless options.any?
+
+      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-control sort-select w-auto")
     end
 
     private
@@ -41,7 +43,7 @@ module Blacklight
         search_field_control do
           fields_for('clause[]', i, include_id: false) do |f|
             content_tag(:div, class: 'form-group advanced-search-field row') do
-              f.label(:query, field.display_label('search'), class: "col-sm-3 col-form-label") +
+              f.label(:query, field.display_label('search'), class: "col-md-3 col-form-label text-md-right") +
                 content_tag(:div, class: 'col-sm-9') do
                   f.hidden_field(:field, value: field.key) +
                     f.text_field(:query, value: query_for_search_clause(field.key), class: 'form-control')
@@ -62,12 +64,16 @@ module Blacklight
     end
 
     def initialize_constraints
-      constraint do
-        params = helpers.search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
+      params = helpers.search_state.params_for_search.except :page, :f_inclusive, :q, :search_field, :op, :index, :sort
+
+      adv_search_context = helpers.search_state.reset(params)
 
-        adv_search_context = helpers.search_state.reset(params)
+      constraints_text = render(Blacklight::ConstraintsComponent.for_search_history(search_state: adv_search_context))
 
-        Blacklight::ConstraintsComponent.for_search_history(search_state: adv_search_context)
+      return if constraints_text.blank?
+
+      constraint do
+        constraints_text
       end
     end
 

data/app/components/blacklight/facet_field_checkboxes_component.html.erb

@@ -13,7 +13,8 @@
 
           <span class="label-and-count">
             <%= label_tag "f_inclusive_#{@facet_field.key}_#{idx}" do %>
-              <%= presenter.label %>
+              <span class="facet-label"><%= presenter.label %></span>
+              <span class="facet-count"><%= t('blacklight.search.facets.count', number: number_with_delimiter(presenter.hits)) %></span>
             <% end %>
           <span>
         </li>

data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml

@@ -17,6 +17,7 @@
   </updateHandler>
 
   <!-- solr lib dirs -->
+  <lib dir="${solr.install.dir:../../../..}/contrib/modules/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.26.0
+  version: 7.26.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-20 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails