Feature/latest materials on home

app/controllers/static_controller.rb

@@ -20,11 +20,19 @@ def home
 
     @resources = @resources.sort_by(&:created_at).reverse
 
-    @events = []
+    @events = set_upcoming_events
+    @materials = set_latest_materials
+  end
+
+  def showcase
+    @container_class = 'showcase-container container-fluid'
+  end
+
+  def set_upcoming_events
     n_events = TeSS::Config.site.dig('home_page', 'upcoming_events')
-    return unless n_events
+    return [] unless n_events
 
-    @events += Event.search_and_filter(
+    Event.search_and_filter(
       nil,
       '',
       { 'start' => "#{Date.tomorrow.beginning_of_day}/" },
@@ -33,7 +41,16 @@ def home
     ).results
   end
 
-  def showcase
-    @container_class = 'showcase-container container-fluid'
+  def set_latest_materials
+    n_materials = TeSS::Config.site.dig('home_page', 'latest_materials')
+    return [] unless n_materials
+
+    Material.search_and_filter(
+      nil,
+      '',
+      { 'max_age' => '1 month' },
+      sort_by: 'new',
+      per_page: 10 * n_materials
+    )&.results&.group_by(&:content_provider_id)&.map { |_p_id, p_materials| p_materials&.first }&.first(n_materials)
   end
 end

app/views/static/home.html.erb

@@ -52,3 +52,5 @@
 <%= render partial: 'static/home/promo_blocks' if TeSS::Config.site.dig('home_page', 'promo_blocks') %>
 
 <%= render partial: 'static/home/upcoming_events' if @events.present? %>
+
+<%= render partial: 'static/home/latest_materials' if @materials.present? %>

app/views/static/home/_latest_materials.erb

@@ -0,0 +1,11 @@
+<% cache(['home', 'latest_materials', @materials]) do %>
+  <section id="latest_materials">
+    <div class="tab-content">
+      <h2 class="text-center"><%= 'Latest materials' %></h2>
+      <ul class="tab-pane fade in active">
+        <%= render partial: 'common/masonry_grid', locals: { objects: @materials } %>
+      </ul>
+    </div>
+  </section>
+<% end %>
+

config/tess.example.yml

@@ -39,6 +39,7 @@ default: &default
       faq: # [who, how, why, embed, subscribe] # Questions/answers in config/en.yml: home > faq. Use empty array to hide section
       promo_blocks: false
       upcoming_events: # Number of events on home page. Leave blank to turn off
+      latest_materials: # Number of materials on home page. Leave blank to turn off
     # The order in which the tabs appear (if feature enabled)
     tab_order: ['about', 'events', 'materials', 'elearning_materials', 'workflows', 'collections', 'trainers', 'content_providers', 'nodes']
     # The tabs that should be collapsed under the "Directory" tab. Can be left blank to hide it.

test/controllers/static_controller_test.rb

@@ -229,4 +229,16 @@ class StaticControllerTest < ActionController::TestCase
       end
     end
   end
+
+  test 'should show latest materials' do
+    my_materials = [materials(:good_material), materials(:interpro)]
+    Material.stub(:search_and_filter, MockSearch.new(my_materials)) do
+      with_settings({ site: { home_page: { latest_materials: 5 } } }) do
+        get :home
+        assert_select 'section#latest_materials', count: 1
+        assert_select 'section#latest_materials h2', count: 1
+        assert_select 'section#latest_materials ul', count: 2
+      end
+    end
+  end
 end