Merge pull request #1053 from ElixirTeSS/keyword-limit

Limit keywords to 20, and only display first 10 on index pages

app/helpers/materials_helper.rb

@@ -139,10 +139,14 @@ def keywords_and_topics(resource, limit: nil)
       tags |= resource.send(field) if resource.respond_to?(field)
     end
 
+    limit_exceeded = limit && (tags.length > limit)
     tags = tags.first(limit) if limit
 
-    tags.map do |tag|
+    elements = tags.map do |tag|
       content_tag(:span, tag, class: 'label label-info')
-    end.join(' ').html_safe
+    end
+    elements << '&hellip;' if limit_exceeded
+
+    elements.join(' ').html_safe
   end
 end

app/models/collection.rb

@@ -27,6 +27,7 @@ class Collection < ApplicationRecord
   after_commit :index_items, if: :title_previously_changed?
 
   validates :title, presence: true
+  validates :keywords, length: { maximum: 20 }
 
   clean_array_fields(:keywords)
   update_suggestions(:keywords)

app/models/content_provider.rb

@@ -32,8 +32,8 @@ class ContentProvider < ApplicationRecord
 
   # Validate the URL is in correct format via valid_url gem
   validates :url, url: true
-
   validates :content_provider_type, presence: true, inclusion: { in: PROVIDER_TYPE }
+  validates :keywords, length: { maximum: 20 }
 
   clean_array_fields(:keywords)
 

app/models/event.rb

@@ -138,6 +138,7 @@ class Event < ApplicationRecord
   validates :longitude, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180, allow_nil: true }
   # validates :duration, format: { with: /\A[0-9][0-9]:[0-5][0-9]\z/, message: "must be in format HH:MM" }, allow_blank: true
   validates :presence, inclusion: { in: presences.keys, allow_blank: true }
+  validates :keywords, length: { maximum: 20 }
   validate :allowed_url
   clean_array_fields(:keywords, :fields, :event_types, :target_audience,
                      :eligibility, :host_institutions, :sponsors)

app/models/learning_path.rb

@@ -75,6 +75,7 @@ class LearningPath < ApplicationRecord
   after_validation :normalize_order
 
   validates :title, :description, presence: true
+  validates :keywords, length: { maximum: 20 }
 
   clean_array_fields(:keywords, :contributors, :authors, :target_audience)
   update_suggestions(:keywords, :contributors, :authors, :target_audience)

app/models/learning_path_topic.rb

@@ -22,6 +22,7 @@ class LearningPathTopic < ApplicationRecord
   after_validation :normalize_order
 
   validates :title, presence: true
+  validates :keywords, length: { maximum: 20 }
 
   clean_array_fields(:keywords)
   update_suggestions(:keywords)

app/models/material.rb

@@ -103,6 +103,7 @@ class Material < ApplicationRecord
   validates :title, :description, :url, presence: true
   validates :url, url: true
   validates :other_types, presence: true, if: Proc.new { |m| m.resource_type.include?('other') }
+  validates :keywords, length: { maximum: 20 }
 
   clean_array_fields(:keywords, :fields, :contributors, :authors,
                      :target_audience, :resource_type, :subsets)

app/models/workflow.rb

@@ -62,6 +62,7 @@ class Workflow < ApplicationRecord
   auto_strip_attributes :title, squish: false
 
   validates :title, presence: true
+  validates :keywords, length: { maximum: 20 }
 
   clean_array_fields(:keywords, :contributors, :authors, :target_audience)
 

app/views/materials/_material.html.erb

@@ -36,7 +36,7 @@
 
       <div class="font-size-lg"><%= display_difficulty_level(material) %></div>
 
-      <%= keywords_and_topics(material) %>
+      <%= keywords_and_topics(material, limit: 10) %>
     </div>
 
     <%= item_comment(collection_item) if collection_item %>

test/controllers/materials_controller_test.rb

@@ -1541,4 +1541,21 @@ class MaterialsControllerTest < ActionController::TestCase
     assert_select 'strong', text: 'Next topic:', count: 0
     assert_select 'span.empty', text: 'End of learning path'
   end
+
+  test 'should limit displayed keywords on index page' do
+    keywords = 10.times.map { |i| "keyword_#{i}" }
+    @material.keywords = keywords + ['extra_keyword']
+    @material.save!
+
+    with_settings(solr_enabled: true) do
+      Material.stub(:search_and_filter, MockSearch.new([@material])) do
+        get :index
+        assert_response :success
+        assert_includes assigns(:materials), @material
+        assert_select '.label', text: 'keyword_3'
+        assert_select '.label', text: 'keyword_9'
+        assert_select '.label', text: 'extra_keyword', count: 0
+      end
+    end
+  end
 end

test/models/event_test.rb

@@ -745,4 +745,16 @@ class EventTest < ActiveSupport::TestCase
     empty_mix = Event.from_varied_providers([], 10)
     assert_empty empty_mix
   end
+
+  test 'validates keywords length' do
+    event = events(:one)
+    keywords = 20.times.map { |i| "keyword_#{i}" }
+    event.keywords = keywords
+    assert event.valid?
+
+    event.keywords = keywords + ['extra_keyword']
+
+    refute event.valid?
+    assert event.errors.added?(:keywords, :too_long, count: 20)
+  end
 end