- Use session_s for facets instead of session_t (avoids stemming issues with facets)

- Adjust layout of search results 'claw'
- Add padding to search results partials
- Replace 'X' on applied filters with a less objectionable looking version of the character (WIP)

Author: j-corry

app/helpers/application_helper.rb

@@ -85,7 +85,7 @@ def filter_field_name(field)
       subtype_ses: 'Subtype',
       legislature_ses: 'House',
       date_dt: 'Date',
-      session_t: 'Session',
+      session_s: 'Session',
       department_ses: 'Department',
       department_t: 'Department',
       answeringDept_ses: 'Department',

app/services/search_data.rb

@@ -254,7 +254,7 @@ def type_facets
 
   def ordered_facet_fields
     # used to extract Solr returned facet data in the correct order for display
-    %w[type_sesrollup legislature_ses date_year date_month session_t department_ses member_ses primaryMember_ses answeringMember_ses legislativeStage_ses legislationTitle_ses subject_ses publisher_ses]
+    %w[type_sesrollup legislature_ses date_year date_month session_s department_ses member_ses primaryMember_ses answeringMember_ses legislativeStage_ses legislationTitle_ses subject_ses publisher_ses]
   end
 
   def sort_facets(facet_field)

app/services/solr_search.rb

@@ -18,7 +18,7 @@ def self.facet_fields
       'legislature_ses',
       'date_year',
       'date_month',
-      'session_t',
+      'session_s',
       'department_ses',
       'member_ses',
       'primaryMember_ses',

app/views/content_type_objects/fragments/_search_claw.html.erb

@@ -3,11 +3,22 @@
     <div class="col-12">
       <div class="row justify-content-between">
         <div class="col-auto align-self-center">
-          <% unless object.timestamp.blank? %>
-            <%= object.timestamp[:value] %>
-          <% end %>
+          <div class="row">
+            <div class="col">
+              <% unless object.timestamp.blank? %>
+                <%= object.timestamp[:value] %>
+              <% end %>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col">
+              <% unless object.object_uri.blank? %>
+                <%= object.object_uri[:value] %>
+              <% end %>
+            </div>
+          </div>
         </div>
-        <div class="col-auto" data-controller="clipboard">
+        <div class="col-auto align-self-center" data-controller="clipboard">
           <% unless object.indexing_link.blank? %>
             <%= link_to 'Indexing', object.indexing_link, target: :_blank, class: 'btn-sm' %>
           <% end %>
@@ -26,13 +37,6 @@
           <% end %>
         </div>
       </div>
-      <div class="row">
-        <div class="col">
-          <% unless object.object_uri.blank? %>
-            <%= object.object_uri[:value] %>
-          <% end %>
-        </div>
-      </div>
     </div>
   </div>
 </div>

app/views/search/_applied_filters.html.erb

@@ -10,9 +10,9 @@
                   <%= filter_field_name(filter.first) %>
                 </span>
                 <span class="flex-spacer"></span>
-                <span class="filter-link">
-                  <%= link_to sanitize("&#x2717;"), url_for(remove_filter_url(request.params, filter.first, filter_value)), class: 'modifiable-link' %>
-                </span>
+                <a href="<%= url_for(remove_filter_url(request.params, filter.first, filter_value)) %>" class="modifiable-link">
+                X
+                </a>
               </div>
               <div class="bottom-row">
                 <div class="filter-name">

app/views/search/index.html.erb

@@ -53,7 +53,7 @@
         <div class="col-3" data-controller="expand-facet">
           <%= render 'applied_filters' %>
           <%= render 'search/results/facets/type_facet' %>
-          <% @search_data.facets.select { |h| ["legislature_ses", "session_t"].include?(h.dig(:field_name)) }.each do |facet_field| %>
+          <% @search_data.facets.select { |h| ["legislature_ses", "session_s"].include?(h.dig(:field_name)) }.each do |facet_field| %>
             <%= render 'filter_section', facet_field: format_facets(facet_field) %>
           <% end %>
           <% @search_data.facets.select { |h| ["date_year", "date_month", "department_ses", "member_ses", "primaryMember_ses", "answeringMember_ses", "legislativeStage_ses", "legislationTitle_ses", "subject_ses", "publisher_ses"].include?(h.dig(:field_name)) }.each do |facet_field| %>

app/views/search/results/_bill.html.erb

@@ -1,11 +1,11 @@
-<div class="result-item py-2">
-  <div class="row">
+<div class="result-item py-3">
+  <div class="row py-1">
     <div class="col">
       <%= link_to(format_object_title(object.object_title, @ses_data), object_show_url(object: object.object_uri[:value])) %>
     </div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col primary-person">
       <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_parties %>
     </div>
@@ -16,7 +16,7 @@
     </div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col type">
       <%= render 'search/results/item_details/type', type: object.object_name %>
     </div>
@@ -40,7 +40,7 @@
 </div>
 
 <div <%= 'hidden' unless params[:show_detailed] == "true" %>>
-  <div class="row">
+  <div class="row py-1">
     <div class="col commons-library-location">
       <%= render 'search/results/item_details/commons_library_location', location: object.commons_library_location unless object.commons_library_location.blank? %>
     </div>
@@ -50,7 +50,7 @@
   </div>
 </div>
 
-<div class="row">
+<div class="row py-1">
   <div class="col significant-date">
     <%= render 'search/results/item_details/date', date: object.standard_date %>
   </div>

app/views/search/results/_church_of_england_measure.html.erb

@@ -1,11 +1,11 @@
-<div class="result-item py-2">
-  <div class="row title">
+<div class="result-item py-3">
+  <div class="row py-1 title">
     <div class="col">
       <%= link_to(format_object_title(object.object_title, @ses_data), object_show_url(object: object.object_uri[:value])) %>
     </div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col type">
       <%= render 'search/results/item_details/type', type: object.object_name %>
     </div>
@@ -22,7 +22,7 @@
   <div <%= 'hidden' unless params[:show_detailed] == "true" %>>
     <%= render 'search/results/item_details/subjects', subjects: object.subjects unless object.subjects.blank? %>
 
-    <div class="row">
+    <div class="row py-1">
       <div class="col commons-library-location">
         <%= render 'search/results/item_details/commons_library_location', location: object.commons_library_location unless object.commons_library_location.blank? %>
       </div>
@@ -31,7 +31,7 @@
       </div>
     </div>
 
-    <div class="row">
+    <div class="row py-1">
       <div class="col significant-date">
         <%= render 'search/results/item_details/date', date: object.standard_date %>
       </div>

app/views/search/results/_command_paper.html.erb

@@ -1,11 +1,11 @@
-<div class="result-item py-2">
-  <div class="row title">
+<div class="result-item py-3">
+  <div class="row py-1 title">
     <div class="col">
       <%= link_to(format_object_title(object.object_title, @ses_data), object_show_url(object: object.object_uri[:value])) %>
     </div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col primary-person">
       <%= render 'search/results/item_details/laid_by', laid_by: object.member_name, label: 'Laid by' %>
     </div>
@@ -16,7 +16,7 @@
     </div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col type">
       <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
     </div>
@@ -31,15 +31,15 @@
 </div>
 
 <div <%= 'hidden' unless params[:show_detailed] == "true" %>>
-  <div class="row">
+  <div class="row py-1">
     <div class="col legislative-stage">
     </div>
     <div class="col procedure">
       <%= render 'search/results/item_details/paper_procedure', procedure: object.paper_procedure %>
     </div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col specific-date-1">
       <%= render 'search/results/item_details/date_laid', date_laid: object.date_laid %>
     </div>
@@ -50,7 +50,7 @@
     <div class="col specific-date-4"></div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col coming-into-force">
       <%= render 'search/results/item_details/coming_into_force', notes: object.coming_into_force, date: object.coming_into_force_date %>
     </div>
@@ -65,7 +65,7 @@
   <%= render 'search/results/item_details/subjects', subjects: object.subjects unless object.subjects.blank? %>
 
   <% unless object.commons_library_location.blank? && object.lords_library_location.blank? %>
-    <div class="row">
+    <div class="row py-1">
       <div class="col commons-library-location">
         <%= render 'search/results/item_details/commons_library_location', location: object.commons_library_location unless object.commons_library_location.blank? %>
       </div>
@@ -76,7 +76,7 @@
   <% end %>
 </div>
 
-<div class="row">
+<div class="row py-1">
   <div class="col significant-date">
     <%= render 'search/results/item_details/date', date: object.standard_date %>
   </div>

app/views/search/results/_committee_proceeding.html.erb

@@ -1,5 +1,5 @@
-<div class="result-item py-2">
-  <div class="row title">
+<div class="result-item py-3">
+  <div class="row py-1 title">
     <div class="col">
       <%= link_to(format_object_title(object.object_title, @ses_data), object_show_url(object: object.object_uri[:value])) %>
     </div>
@@ -12,7 +12,7 @@
     <%= render 'search/results/item_details/description', description: object.abstract_text, full_text: false %>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col primary-person">
       <%= render 'search/results/item_details/lead_members', lead_members: object.lead_members, label: "Lead member" %>
     </div>
@@ -24,7 +24,7 @@
     </div>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col type">
       <%= render 'search/results/item_details/type', type: object.object_name %>
     </div>
@@ -35,7 +35,7 @@
   </div>
 
   <div <%= 'hidden' unless params[:show_detailed] == "true" %>>
-    <div class="row">
+    <div class="row py-1">
       <div class="col legislative-stage">
         <%= render 'search/results/item_details/legislative_stage', legislative_stage: object.legislative_stage %>
       </div>
@@ -54,7 +54,7 @@
     <%= render 'search/results/item_details/subjects', subjects: object.subjects unless object.subjects.blank? %>
   </div>
 
-  <div class="row">
+  <div class="row py-1">
     <div class="col significant-date">
       <%= render 'search/results/item_details/date', date: object.standard_date %>
     </div>