Merge pull request #179 from ukparliament/development

Development merge

app/helpers/application_helper.rb

@@ -138,6 +138,12 @@ def apply_filter_url(params, filter_name, filter_value)
     params.except(:page).merge(filter: params.dig(:filter).nil? ? { filter_name => [filter_value] } : params.dig(:filter).merge(filter_name => [filter_value, params.dig(:filter, filter_name)].compact.flatten))
   end
 
+  def replace_filter_url(params, filter_name, filter_value)
+    # used for year-month filters; performs the additional step of removing year filters first
+    adjusted_params = params.except(:filter, :year)
+    apply_filter_url(adjusted_params, filter_name, filter_value)
+  end
+
   def year_filter
     params.dig(:filter, :year)
   end

app/models/search_data.rb

@@ -188,19 +188,17 @@ def facet_ses_ids
   end
 
   def years
-    # extract years from returned facet data
     year_buckets = search&.dig(:data, "facets", "year", "buckets")
-    return if year_buckets.blank?
+    return [] if year_buckets.blank?
 
     year_buckets.sort_by { |h| h["val"] }.uniq.reverse
   end
 
-  def months
-    # extract months from returned facet data
-    month_buckets = search.dig(:data, "facets", "month", "buckets")
-    return if month_buckets.blank?
+  def months(year_string)
+    month_buckets = search&.dig(:data, "facets", "month", "buckets")
+    return [] if month_buckets.blank?
 
-    month_buckets.sort_by { |h| h["val"] }.uniq
+    month_buckets.select { |m| m['val'].first(4) == year_string }.sort_by { |h| h["val"] }.uniq
   end
 
   def hierarchy_data
@@ -273,4 +271,18 @@ def session_facets
   def sort_facets(facet_field)
     facet_field.sort_by { |h| h["count"] }.reverse
   end
+
+  def single_data_year?
+    data_years.size == 1
+  end
+
+  def data_years
+    return [] unless search
+
+    date_facet = search.dig(:data, 'facets', 'date_dt')
+
+    return [] if date_facet.blank?
+
+    date_facet.dig("buckets").map { |b| b.dig("val").to_date.strftime("%Y") }.uniq
+  end
 end

app/models/solr_search.rb

@@ -247,12 +247,21 @@ def facet_hash
       ret['year'] = {
         "type": "range",
         "field": "date_dt",
-        "start": "1500-01-01T00:00:00Z",
+        # "start": "1500-01-01T00:00:00Z",
         "end": "#{Date.today.strftime("%Y-%m-%d")}T23:59:59Z",
         "gap": "+1YEAR",
         "mincount": 1,
         "limit": 100
       }
+      ret['month'] = {
+        "type": "range",
+        "field": "date_dt",
+        # "start": "1500-01-01T00:00:00Z",
+        "end": "#{Date.today.strftime("%Y-%m-%d")}T23:59:59Z",
+        "gap": "+1MONTH",
+        "mincount": 0,
+        "domain": { excludeTags: 'month' }
+      }
     end
 
     SolrSearch.sessions.each do |session|

app/views/search/_applied_filters.html.erb

@@ -1,7 +1,7 @@
 <% unless request.params.dig(:filter).blank? %>
   <section class="applied-filters">
     <div class="applied-filter-container">
-      <% request.params.dig(:filter).sort.each do |filter| %>
+      <% request.params.dig(:filter).sort.uniq.each do |filter| %>
         <% filter.last.sort.each do |filter_value| %>
           <div class="filter-wrapper">
             <div class="filter">

app/views/search/results/facets/_date_facet.html.erb

@@ -6,9 +6,26 @@
           <strong>Date</strong>
         </div>
         <div class="facets">
-          <% @search_data.months.each_with_index do |month, index| %>
+          <% @search_data.months(year).each_with_index do |month, index| %>
             <div>
-              <%= link_to("#{month['val'].to_date.strftime("%B")} #{year} (#{month['count']})", url_for(apply_filter_url(request.params, "month", year + "-#{index + 1}")), class: "menu-link modifiable-link") %>
+              <%= link_to_unless(request.params.dig(:filter, "month")&.include?(month['val'].to_date.strftime("%Y-%-m")), "#{month['val'].to_date.strftime("%B")} #{year} (#{month['count']})", url_for(replace_filter_url(request.params, "month", year + "-#{index + 1}")), class: "menu-link modifiable-link") %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </section>
+  <% end %>
+<% elsif @search_data.single_data_year? %>
+  <% @search_data.data_years.each do |year| %>
+    <section class="facet">
+      <div>
+        <div>
+          <strong>Date</strong>
+        </div>
+        <div class="facets">
+          <% @search_data.months(year).each_with_index do |month, index| %>
+            <div>
+              <%= link_to_unless(request.params.dig(:filter, "month")&.include?(month['val'].to_date.strftime("%Y-%-m")), "#{month['val'].to_date.strftime("%B")} #{year} (#{month['count']})", url_for(replace_filter_url(request.params, "month", year + "-#{index + 1}")), class: "menu-link modifiable-link") %>
             </div>
           <% end %>
         </div>

coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "line": 81.33
+    "line": 81.51
   }
 }