Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into development

Author: briri

app/controllers/concerns/paginable.rb

@@ -126,13 +126,12 @@ def refine_query(scope)
     scope = scope.search(@args[:search]) if @args[:search].present?
     # Can raise NoMethodError if the scope does not define a search method
     if @args[:sort_field].present?
-      unless @args[:sort_field][SORT_COLUMN_FORMAT]
-        raise ArgumentError, "sort_field param looks unsafe"
-      end
+      frmt = @args[:sort_field][SORT_COLUMN_FORMAT]
+      raise ArgumentError, "sort_field param looks unsafe" unless frmt
 
       # Can raise ActiveRecord::StatementInvalid (e.g. column does not
       # exist, ambiguity on column, etc)
-      scope = scope.order(@args[:sort_field].to_sym => sort_direction)
+      scope = scope.order(@args[:sort_field].to_sym => sort_direction.to_s)
     end
     if @args[:page] != "ALL"
       # Can raise error if page is not a number
@@ -142,7 +141,6 @@ def refine_query(scope)
   end
 
   def sort_direction
-    @args = @args.with_indifferent_access
     @sort_direction ||= SortDirection.new(@args[:sort_direction])
   end
 

app/helpers/identifier_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module IdentifierHelper
+
+  def id_for_display(id:, with_scheme_name: true)
+    return _("None defined") if id.new_record? || id.value.blank?
+
+    without = id.value_without_scheme_prefix
+    prefix = with_scheme_name ? id.identifier_scheme.description + ": " : ""
+    return prefix + id.value unless without != id.value && !without.starts_with?("http")
+
+    link_to "#{prefix} #{without}", id.value, class: "has-new-window-popup-info"
+  end
+
+end

app/models/concerns/date_rangeable.rb

@@ -16,7 +16,8 @@ def date_range?(term:)
     def by_date_range(field, term)
       date = Date.parse(term) if term[0..1].match(/[0-9]{2}/).present?
       date = Date.parse("1st #{term}") unless date.present?
-      where("#{table_name}.#{field} BETWEEN ? AND ?", date, date.end_of_month)
+      query = "%{table}.%{field} BETWEEN ? AND ?" % { table: table_name, field: field }
+      where(query, date, date.end_of_month)
     end
 
   end

app/presenters/identifier_presenter.rb

@@ -23,17 +23,6 @@ def scheme_by_name(name:)
     schemes.select { |scheme| scheme.name.downcase == name.downcase }
   end
 
-  def id_for_display(id:, with_scheme_name: true)
-    return _("None defined") if id.new_record? || id.value.blank?
-
-    without = id.value_without_scheme_prefix
-    prefix = with_scheme_name ? id.identifier_scheme.description + ": " : ""
-    return prefix + id.value unless without != id.value && !without.starts_with?("http")
-
-    "<a href=\"#{id.value}\" class=\"has-new-window-popup-info\"> " \
-      "#{prefix} #{without}</a>"
-  end
-
   private
 
   def load_schemes

app/views/org_admin/users/edit.html.erb

@@ -58,9 +58,8 @@
 
     <% if @user.identifiers.present? %>
       <h2>Identifiers</h2>
-      <% presenter = IdentifierPresenter.new(identifiable: @user) %>
       <% presenter.identifiers.each do |identifier| %>
-        <p><%= presenter.id_for_display(id: identifier, with_scheme_name: true).html_safe %></p>
+        <p><%= id_for_display(id: identifier, with_scheme_name: true) %></p>
       <% end %>
     <% end %>
 

app/views/orgs/_external_identifiers.html.erb

@@ -17,7 +17,7 @@
         <div class="form-group col-xs-10">
           <% id = presenter.id_for_scheme(scheme: scheme) %>
           <span class="bold"><%= scheme.description %>:</span>
-          <%= presenter.id_for_display(id: id).html_safe %>
+          <%= id_for_display(id: id) %>
         </div>
       </div>
     <% end %>
@@ -62,7 +62,7 @@
       <div class="form-group col-xs-10">
         <% id = presenter.id_for_scheme(scheme: scheme) %>
         <span class="bold"><%= scheme.description %>:</span>
-        <%= presenter.id_for_display(id: id).html_safe %>
+        <%= id_for_display(id: id) %>
       </div>
     </div>
   <% end %>

app/views/paginable/contributors/_index.html.erb

@@ -38,9 +38,8 @@
             <%= contributor.org&.name %>
             <% ror = contributor.org.identifier_for_scheme(scheme: ror_scheme) %>
             <% if ror.present? %>
-              <% id_presenter = IdentifierPresenter.new(identifiable: contributor.org) %>
               <br/>
-              <%= id_presenter.id_for_display(id: ror).html_safe %>
+              <%= id_for_display(id: ror) %>
             <% end %>
           <% end %>
         </td>

app/views/plans/_project_details.html.erb

@@ -100,7 +100,7 @@
         identifier = id_presenter.id_for_scheme(scheme: scheme)
         %>
         <div class="col-md-8">
-          <li><%= id_presenter.id_for_display(id: identifier).html_safe %></li>
+          <li><%= id_for_display(id: identifier) %></li>
         </div>
       <% end %>
     </ul>

app/views/super_admin/users/edit.html.erb

@@ -70,7 +70,7 @@
       <h2>Identifiers</h2>
       <% presenter = IdentifierPresenter.new(identifiable: @user) %>
       <% presenter.identifiers.each do |identifier| %>
-        <p><%= presenter.id_for_display(id: identifier, with_scheme_name: true).html_safe %></p>
+        <p><%= id_for_display(id: identifier, with_scheme_name: true) %></p>
       <% end %>
     <% end %>
 

package.json

@@ -33,6 +33,10 @@
     "bootstrap-select": "^1.13.18",
     "chart.js": "^2.9.3",
     "core-js": "^3.6.5",
+    "eslint": "^7.1.0",
+    "eslint-config-airbnb-base": "^14.1.0",
+    "eslint-loader": "^4.0.2",
+    "eslint-plugin-import": "^2.21.1",
     "jquery": "^3.5.1",
     "jquery-ui": "^1.12.1",
     "jquery-ui-sass": "^0.0.1",
@@ -42,12 +46,8 @@
     "rails-erb-loader": "^5.5.2",
     "regenerator-runtime": "^0.13.5",
     "timeago.js": "^4.0.2",
-    "tinymce": "^4.9.10",
-    "turbolinks": "^5.2.0",
-    "eslint": "^7.1.0",
-    "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.21.1"
+    "tinymce": "4.9.10",
+    "turbolinks": "^5.2.0"
   },
   "devDependencies": {
     "eslint": "^7.1.0",