ELIXIR-specific changes

* Add keywords to event index. Use labels to display
* Add CSV format for elearning index
* Don't display website until user has signed in 10 times
* Don't display unverified users in index
* Honeypot field

Author: fbacall

app/controllers/application_controller.rb

@@ -159,4 +159,8 @@ def configure_permitted_parameters
   def allow_embedding
     response.headers.delete 'X-Frame-Options'
   end
+
+  def disable_pagination
+    params[:per_page] = 2 ** 10
+  end
 end

app/controllers/materials_controller.rb

@@ -5,6 +5,7 @@ class MaterialsController < ApplicationController
                                         add_term reject_term add_data reject_data]
   before_action :set_breadcrumbs
   before_action :set_learning_path_navigation, only: :show
+  before_action :disable_pagination, only: :index, if: lambda { |controller| controller.request.format.csv? }
 
   include SearchableIndex
   include ActionView::Helpers::TextHelper
@@ -22,6 +23,7 @@ def index
     respond_to do |format|
       format.html { render elearning ? 'elearning_materials/index' : 'index' }
       format.json
+      format.csv { render 'elearning_materials/index' } if elearning
       format.json_api { render({ json: @materials }.merge(api_collection_properties)) }
     end
   end

app/controllers/tess_devise/registrations_controller.rb

@@ -25,7 +25,8 @@ def update_resource(resource, params)
 
   # Pinched from https://github.com/plataformatec/devise/wiki/How-To:-Use-Recaptcha-with-Devise
   def check_captcha
-    if !Rails.application.config.secrets.recaptcha[:sitekey].blank? && !verify_recaptcha
+    if (Rails.application.config.secrets.recaptcha[:sitekey].present? && !verify_recaptcha) ||
+      params.dig('user', 'website').present?
       self.resource = resource_class.new sign_up_params
       respond_with_navigational(resource) { render :new }
     end

app/controllers/users_controller.rb

@@ -14,7 +14,11 @@ class UsersController < ApplicationController
   # GET /users.json
   def index
     @users = User.visible
-    @users = @users.with_query(params[:q].chomp('*')) if params[:q].present?
+    if params[:q].present?
+      @users = @users.with_query(params[:q].chomp('*'))
+    elsif !(current_user&.is_admin? || current_user&.is_curator?)
+      @users = @users.verified
+    end
     @users = @users.paginate(page: params[:page], per_page: 50)
 
     respond_to do |format|
@@ -26,7 +30,7 @@ def index
 
   # GET/invitees
   def invitees
-    if current_user.is_admin? || current_user.is_curator?
+    if current_user&.is_admin? || current_user&.is_curator?
       @users = User.invited
       respond_to do |format|
         format.html

app/models/user.rb

@@ -385,6 +385,10 @@ def has_role_in_any_space?(role)
     space_roles.where(key: role).any?
   end
 
+  def show_website?
+    sign_in_count > 10
+  end
+
   protected
 
   def reassign_resources(new_owner = User.get_default_user)

app/views/devise/registrations/new.html.erb

@@ -29,10 +29,17 @@
 
         <%= f.input :email, required: true %>
 
+        <div style="opacity: 0; height: 0; overflow: hidden">
+          <div class="form-group website required user_website">
+            <label class="control-label website" for="user_website"><abbr title="required">*</abbr> Website</label>
+            <input class="form-control string website required" type="text" value="" name="user[website]" id="user_website">
+          </div>
+        </div>
+
         <%= f.input :publicize_email, as: :boolean, label: 'Make my email publicly visible' %>
 
         <%= f.input :password, required: true, input_html: { autocomplete: 'off' },
-                    hint: "(#{@minimum_password_length} characters minimum)" if @minimum_password_length %>
+                    hint: @minimum_password_length ? "(#{@minimum_password_length} characters minimum)" : nil %>
 
         <%= f.input :password_confirmation, required: true, input_html: { autocomplete: 'off' } %>
 

app/views/elearning_materials/index.csv.erb

@@ -0,0 +1,20 @@
+<%
+  fields = [:id, :title, :url, :description, :keywords, :resource_type, :other_types, :scientific_topics, :operations, :fields, :external_resources, :doi, :licence, :version, :status, :contact, :contributors, :authors, :difficulty_level, :target_audience, :prerequisites, :syllabus, :learning_objectives, :subsets, :date_created, :date_modified, :date_published, :created_at, :updated_at].freeze
+%>
+<%= (['TeSS URL'] + fields.map { |f| Material.human_attribute_name(f) }).to_csv(row_sep: nil) %>
+<% @index_resources.each do |material| %>
+<%= ([material_url(material)] + fields.map do |f|
+  value = material.send(f)
+  value = value.map do |v|
+    case v
+    when OntologyTerm
+      v.label
+    when ExternalResource
+      v.url
+    else
+      v
+    end
+  end.join(', ') if value.respond_to?(:each)
+  value
+end).to_csv(row_sep: nil).html_safe %>
+<% end %>

app/views/events/_event.html.erb

@@ -46,6 +46,8 @@
           <i class="icon icon-md <%= event.presence %>-event-icon"></i>
           <span class="muted"><%= t("activerecord.attributes.event.presence.#{event.presence}") %></span>
         </p>
+
+        <%= keywords_and_topics(event) %>
       </div>
       <% if TeSS::Config.site.fetch('show_provider_logo_in_event', false) && event.content_provider&.image&.url.present? %>
         <div>

app/views/users/show.html.erb

@@ -36,14 +36,16 @@
         <% end %>
       </p>
 
-      <p>
-        <strong><%= model_class.human_attribute_name(:website) %></strong><br/>
-        <% if @user.profile.website.blank? %>
-          <span class="empty">None specified</span>
-        <% else %>
-          <%= link_to @user.profile.website, @user.profile.website, rel: 'nofollow', target: '_blank' %>
-        <% end %>
-      </p>
+      <% if @user.show_website? || (current_user&.is_admin? || current_user&.is_curator?) %>
+        <p>
+          <strong><%= model_class.human_attribute_name(:website) %></strong><br/>
+          <% if @user.profile.website.blank? %>
+            <span class="empty">None specified</span>
+          <% else %>
+            <%= link_to @user.profile.website, @user.profile.website, rel: 'nofollow', target: '_blank' %>
+          <% end %>
+        </p>
+      <% end %>
 
       <p>
         <strong>ORCID</strong><br/>

test/controllers/materials_controller_test.rb

@@ -1604,4 +1604,18 @@ class MaterialsControllerTest < ActionController::TestCase
       assert_equal plant_space, assigns(:material).space
     end
   end
+
+  test 'should get e-learning index as csv' do
+    with_settings(solr_enabled: true, feature: { elearning_materials: true }) do
+      Material.stub(:search_and_filter, MockSearch.new(Material.all)) do
+        get :index, params: { resource_type: 'e-learning', format: :csv }
+
+        assert_response :success
+      end
+    end
+
+    csv = CSV.parse(@response.body, headers: true)
+    assert_equal Material.count, csv.length
+    assert csv.any? { |row| row[0] == material_url(@material) }
+  end
 end