Merge branch 'master' into tess-yml-style

Author: kennethrioja

Gemfile.lock

@@ -198,16 +198,16 @@ GEM
     eventbrite_sdk (3.6.0)
       rest-client (~> 2.0)
     execjs (2.8.1)
-    faraday (2.13.1)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
     faraday-multipart (1.1.0)
       multipart-post (~> 2.0)
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     ffi (1.15.5)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
@@ -263,7 +263,7 @@ GEM
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
-    json (2.12.2)
+    json (2.18.1)
     json-canonicalization (1.0.0)
     json-jwt (1.16.6)
       activesupport (>= 4.2)
@@ -381,8 +381,8 @@ GEM
       bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
     nested_form (0.3.2)
-    net-http (0.6.0)
-      uri
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     net-http-persistent (4.0.6)
       connection_pool (~> 2.2, >= 2.2.4)
     net-imap (0.5.8)
@@ -396,7 +396,7 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
-    nokogiri (1.18.9)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     numerizer (0.1.1)
@@ -461,7 +461,7 @@ GEM
     pundit (2.3.1)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (2.2.20)
+    rack (2.2.22)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-oauth2 (2.2.0)
@@ -780,7 +780,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     unicode-types (1.10.0)
-    uri (1.0.4)
+    uri (1.1.1)
     useragent (0.16.11)
     validate_email (0.1.6)
       activemodel (>= 3.0)

app/assets/javascripts/application.js

@@ -277,6 +277,9 @@ document.addEventListener("turbolinks:load", function(e) {
     LearningPaths.init();
 
     $('.tess-expandable').each(function () {
+        if (this.dataset.origHeight) {
+            return;
+        }
         var limit = this.dataset.heightLimit || 300;
 
         if (this.clientHeight > limit) {
@@ -286,32 +289,11 @@ document.addEventListener("turbolinks:load", function(e) {
             this.dataset.origHeight = this.clientHeight;
             this.style.maxHeight = '' + limit + 'px';
             this.classList.add('tess-expandable-closed');
-            var btn = $('<a href="#" class="tess-expandable-btn">Show more</a>');
+            const btn = $('<a href="#" class="tess-expandable-btn">Show more</a>');
             btn.insertAfter($(this));
         }
     });
 
-    $(document).on('click', '.tess-expandable-btn', function (event) {
-        event.preventDefault();
-        var div = this.parentElement.querySelector('.tess-expandable');
-        var maxHeight = parseInt(div.dataset.origHeight) + 80;
-        var limit = parseInt(div.dataset.heightLimit || "300");
-
-        if (div.classList.contains('tess-expandable-closed')) {
-            div.classList.add('tess-expandable-open');
-            div.classList.remove('tess-expandable-closed');
-            div.style.maxHeight = '' + maxHeight + 'px';
-            this.innerHTML = 'Show less';
-        } else {
-            div.classList.remove('tess-expandable-open');
-            div.classList.add('tess-expandable-closed');
-            div.style.maxHeight = '' + limit + 'px';
-            this.innerHTML = 'Show more';
-        }
-
-        return false;
-    });
-
     $('.faq .question dt').click(function () {
         var button = $(this).find('.expand');
         var sign = button.text();
@@ -380,6 +362,36 @@ $(document).on('click', '[href="#activity_log"]', function () {
     return false;
 });
 
+$(document).on('click', '.tess-expandable-btn', function (event) {
+    event.preventDefault();
+    let div = this.previousElementSibling;
+
+    if (!div || !div.classList.contains('tess-expandable')) {
+        div = this.parentElement.querySelector('.tess-expandable');
+    }
+
+    if (!div) {
+        return false;
+    }
+
+    const maxHeight = parseInt(div.dataset.origHeight) + 80;
+    const limit = parseInt(div.dataset.heightLimit || "300");
+
+    if (div.classList.contains('tess-expandable-closed')) {
+        div.classList.add('tess-expandable-open');
+        div.classList.remove('tess-expandable-closed');
+        div.style.maxHeight = '' + maxHeight + 'px';
+        this.innerHTML = 'Show less';
+    } else {
+        div.classList.remove('tess-expandable-open');
+        div.classList.add('tess-expandable-closed');
+        div.style.maxHeight = '' + limit + 'px';
+        this.innerHTML = 'Show more';
+    }
+
+    return false;
+});
+
 // sticky-navbar feature
 document.addEventListener('turbolinks:load', function () {
 

app/assets/javascripts/source_filters.js

@@ -0,0 +1,36 @@
+var SourceFilters = {
+    lastId: function () {
+        var existing_list_item_ids = $(".source-filter-form").map(function (i, c) { return $(c).data("id-in-filter-list") });
+        if (existing_list_item_ids.length == 0) return 0;
+        return Math.max.apply(null, existing_list_item_ids) + 1;
+    },
+
+    add: function () {
+        var new_form = $($('#source-filter-template').clone().html().replace(/REPLACE_ME/g, SourceFilters.lastId()));
+        new_form.appendTo('#source-filter-list');
+
+        return false; // Stop form being submitted
+    },
+
+    addBlockFilter: function () {
+        var new_form = $($('#source-filter-template').clone().html().replace(/REPLACE_ME/g, SourceFilters.lastId()).replace(/allow/, 'block'));
+        new_form.appendTo('#source-block-list');
+
+        return false; // Stop form being submitted
+    },
+
+    delete: function () {
+        $(this).parents('.source-filter-form').fadeOut().find("input[name$='[_destroy]']").val("true");
+    }
+};
+
+document.addEventListener("turbolinks:load", function () {
+    $('#source-filters')
+        .on('click', '#add-source-filter-btn', SourceFilters.add)
+        .on('click', '#add-source-filter-btn-label', SourceFilters.add)
+        .on('click', '.delete-source-filter-btn', SourceFilters.delete);
+    $('#source-block-filters')
+        .on('click', '#add-source-block-filter-btn', SourceFilters.addBlockFilter)
+        .on('click', '#add-source-block-filter-btn-label', SourceFilters.addBlockFilter)
+        .on('click', '.delete-source-filter-btn', SourceFilters.delete);
+});

app/assets/stylesheets/application.scss

@@ -30,6 +30,7 @@
 @import "curators";
 @import "events";
 @import "external-resources";
+@import "sources";
 @import "footer";
 @import "forms";
 @import "headers";

app/assets/stylesheets/sources.scss

@@ -0,0 +1,9 @@
+.source-filter-form {
+    display: flex;
+    gap: 1em;
+    margin-bottom: 4px;
+
+    label {
+        margin-right: 4px;
+    }
+}

app/controllers/orcid_controller.rb

@@ -1,4 +1,5 @@
 class OrcidController < ApplicationController
+  before_action :orcid_auth_enabled
   before_action :authenticate_user!
   before_action :set_oauth_client, only: [:authenticate, :callback]
 
@@ -43,4 +44,10 @@ def set_oauth_client
       host: config[:host].presence || (Rails.env.production? ? 'orcid.org' : 'sandbox.orcid.org')
     )
   end
+
+  def orcid_auth_enabled
+    unless TeSS::Config.orcid_authentication_enabled?
+      raise ActionController::RoutingError.new('Feature not enabled')
+    end
+  end
 end

app/controllers/sources_controller.rb

@@ -1,6 +1,6 @@
 class SourcesController < ApplicationController
-  before_action :set_source, except: [:index, :new, :create, :check_exists]
-  before_action :set_content_provider, except: [:index, :check_exists]
+  before_action :set_source, except: %i[index new create check_exists]
+  before_action :set_content_provider, except: %i[index check_exists]
   before_action :set_breadcrumbs
 
   include SearchableIndex
@@ -65,8 +65,8 @@ def check_exists
       end
     else
       respond_to do |format|
-        format.html { render :nothing => true, :status => 200, :content_type => 'text/html' }
-        format.json { render json: {}, :status => 200, :content_type => 'application/json' }
+        format.html { render nothing: true, status: 200, content_type: 'text/html' }
+        format.json { render json: {}, status: 200, content_type: 'application/json' }
       end
     end
   end
@@ -75,6 +75,7 @@ def check_exists
   # PATCH/PUT /sources/1.json
   def update
     authorize @source
+
     respond_to do |format|
       if @source.update(source_params)
         @source.create_activity(:update, owner: current_user) if @source.log_update_activity?
@@ -94,8 +95,10 @@ def destroy
     @source.create_activity :destroy, owner: current_user
     @source.destroy
     respond_to do |format|
-      format.html { redirect_to policy(Source).index? ? sources_path : content_provider_path(@content_provider),
-                                notice: 'Source was successfully deleted.' }
+      format.html do
+        redirect_to policy(Source).index? ? sources_path : content_provider_path(@content_provider),
+                    notice: 'Source was successfully deleted.'
+      end
       format.json { head :no_content }
     end
   end
@@ -106,7 +109,7 @@ def test
     @source.test_job_id = job_id
 
     respond_to do |format|
-      format.json { render json: { id: job_id }}
+      format.json { render json: { id: job_id } }
     end
   end
 
@@ -150,11 +153,11 @@ def set_content_provider
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def source_params
-    permitted = [:url, :method, :token, :default_language, :enabled]
+    permitted = %i[url method token default_language enabled source_filters]
     permitted << :approval_status if policy(@source || Source).approve?
     permitted << :content_provider_id if policy(Source).index?
 
-    params.require(:source).permit(permitted)
+    params.require(:source).permit(permitted, source_filters_attributes: %i[id mode property value _destroy])
   end
 
   def set_breadcrumbs
@@ -164,7 +167,7 @@ def set_breadcrumbs
       add_breadcrumb 'Sources', content_provider_path(@content_provider, anchor: 'sources')
 
       if params[:id]
-        add_breadcrumb @source.title, content_provider_source_path(@content_provider, @source) if (@source && !@source.new_record?)
+        add_breadcrumb @source.title, content_provider_source_path(@content_provider, @source) if @source && !@source.new_record?
         add_breadcrumb action_name.capitalize.humanize, request.path unless action_name == 'show'
       elsif action_name != 'index'
         add_breadcrumb action_name.capitalize.humanize, request.path
@@ -173,5 +176,4 @@ def set_breadcrumbs
       super
     end
   end
-
 end

app/controllers/trainers_controller.rb

@@ -24,10 +24,11 @@ def index
   # GET /trainers/1.json
 
   def show
+    @bioschemas = @trainer.user.registrations.flat_map(&:to_bioschemas)
     respond_to do |format|
+      format.html
       format.json
       format.json_api { render json: @trainer }
-      format.html
     end
   end
 
@@ -45,5 +46,4 @@ def trainer_params
                                     { :expertise_technical => [] }, { :interest => [] }, { :activity => [] },
                                     { :fields => [] }, { :social_media => [] })
   end
-
-end
+end

app/controllers/users_controller.rb

@@ -39,6 +39,7 @@ def invitees
   # GET /users/1
   # GET /users/1.json
   def show
+    @bioschemas = @user.registrations.flat_map(&:to_bioschemas)
     respond_to do |format|
       format.html
       format.json

app/helpers/events_helper.rb

@@ -5,8 +5,8 @@
 module EventsHelper
   def events_info
     I18n.t('info.events.description',
-           link: link_to(I18n.t('info.events.link'),
-                         registering_resources_path(anchor: 'automatic')))
+           link: I18n.t('info.events.link'),
+           url: registering_resources_path(anchor: 'automatic'))
   end
 
   def google_calendar_export_url(event)