Merge remote-tracking branch 'upstream/master' into configurable_footer_logos

Author: eilmiv

app/assets/stylesheets/application.scss

@@ -1111,3 +1111,7 @@ td.day .calendar-text {
   display: flex;
   justify-content: center;
 }
+
+.tag-topic, .tag-operation {
+  text-decoration: none;
+}

app/helpers/materials_helper.rb

@@ -71,17 +71,15 @@ def display_attribute(resource, attribute, show_label: true, title: nil, markdow
     ].any?
 
     value = resource.send(attribute)
-    if markdown
-      value = render_markdown(value)
-    end
+    value = render_markdown(value) if markdown
     if value.present?
-      if list
-        value = value.map do |v|
-          html_escape(block_given? ? yield(v) : v)
-        end
-      else
-        value = html_escape(block_given? ? yield(value) : value)
-      end
+      value = if list
+                value.map do |v|
+                  html_escape(block_given? ? yield(v) : v)
+                end
+              else
+                html_escape(block_given? ? yield(value) : value)
+              end
     end
     string = "<p class=\"#{attribute}#{show_label ? ' no-spacing' : ''}\">"
     unless value.blank? || value.try(:strip) == 'License Not Specified'
@@ -135,18 +133,31 @@ def embed_youtube(material)
   def keywords_and_topics(resource, limit: nil)
     tags = []
 
-    %i[scientific_topic_names operation_names keywords].each do |field|
-      tags |= resource.send(field) if resource.respond_to?(field)
+    if resource.respond_to?(:scientific_topics)
+      tags += resource.scientific_topics.map do |term|
+        content_tag(:span, class: 'label label-info tag-topic') do
+          content_tag(:i, '', class: 'fa fa-flask') + ' ' + term.preferred_label
+        end
+      end
     end
 
-    limit_exceeded = limit && (tags.length > limit)
-    tags = tags.first(limit) if limit
+    if resource.respond_to?(:operations)
+      tags += resource.operations.map do |term|
+        content_tag(:span, class: 'label label-info tag-operation') do
+          content_tag(:i, '', class: 'fa fa-cogs') + ' ' + term.preferred_label
+        end
+      end
+    end
 
-    elements = tags.map do |tag|
-      content_tag(:span, tag, class: 'label label-info')
+    if resource.respond_to?(:keywords)
+      tags += resource.keywords.map do |tag|
+        content_tag(:span, tag, class: 'label label-info tag-keyword')
+      end
     end
-    elements << '&hellip;' if limit_exceeded
 
-    elements.join(' ').html_safe
+    limit_exceeded = limit && (tags.length > limit)
+    tags = tags.first(limit) if limit
+    tags << '&hellip;'.html_safe if limit_exceeded
+    safe_join(tags, ' ')
   end
 end

app/views/common/_extra_metadata.html.erb

@@ -63,7 +63,9 @@
 <%= display_people(resource, :contributors) if resource.respond_to?(:contributors) %>
 <%= display_attribute(resource, :remote_created_date) if resource.respond_to?(:remote_created_date) %>
 <%= display_attribute(resource, :remote_updated_date) if resource.respond_to?(:remote_updated_date) %>
-<%= display_attribute(resource, :scientific_topics) { |values| values.map { |x| x.preferred_label }.join(', ') } %>
+<%= display_attribute(resource, :scientific_topics) { 
+  |values| safe_join(values.map { |x| link_to(x.preferred_label, x.uri, target: '_blank') }, ', ') 
+} %>
 
 <% if resource.is_a?(LearningPath) %>
   <%= display_attribute(resource, :status) { |value| material_status_title_for_label(value) } %>
@@ -73,5 +75,7 @@
 <% end %>
 
 <% if resource.respond_to?(:operations) -%>
-  <%= display_attribute(resource, :operations) { |values| values.map { |x| x.preferred_label }.join(', ') } %>
+  <%= display_attribute(resource, :operations) { 
+    |values| safe_join(values.map { |x| link_to(x.preferred_label, x.uri, target: '_blank') }, ', ') 
+  } %>
 <% end %>

db/migrate/20260220152727_migrate_material_people.rb

@@ -1,4 +1,8 @@
+require_relative '../migration_helper'
+
 class MigrateMaterialPeople < ActiveRecord::Migration[7.2]
+  include MigrationHelper
+
   class Person < ActiveRecord::Base; end unless defined?(Person)
 
   def up
@@ -22,34 +26,4 @@ def down
     end
     puts
   end
-
-  private
-
-  def array_to_people(resource, column_name, role)
-    return unless resource.respond_to?(:read_attribute)
-    # Get the raw array from database
-    people_array = resource.read_attribute(column_name)
-    return if people_array.blank?
-
-    people_array.each do |person_name|
-      next if person_name.blank?
-      orcid = nil
-      name = person_name.gsub(/\s*\(?(orcid: )?(https?:\/\/orcid\.org\/)?(\d\d\d\d-\d\d\d\d-\d\d\d\d-\d\d\d[\dxX])[ \)]*/) do |_|
-        orcid = $3
-        ''
-      end.strip
-
-      Person.find_or_create_by!(full_name: name, orcid: orcid, resource: resource, role: role)
-    end
-  end
-
-  def people_to_array(resource, column_name, role)
-    arr = Person.where(resource: resource, role: role).map do |person|
-      name = person.full_name
-      name += " (#{person.orcid})" if person.orcid
-      name
-    end
-
-    resource.update_column(column_name, arr)
-  end
 end

db/migrate/20260303163441_migrate_workflow_people.rb

@@ -1,4 +1,8 @@
+require_relative '../migration_helper'
+
 class MigrateWorkflowPeople < ActiveRecord::Migration[7.2]
+  include MigrationHelper
+
   class Person < ActiveRecord::Base; end unless defined?(Person)
 
   def up
@@ -22,34 +26,4 @@ def down
     end
     puts
   end
-
-  private
-
-  def array_to_people(resource, column_name, role)
-    return unless resource.respond_to?(:read_attribute)
-    # Get the raw array from database
-    people_array = resource.read_attribute(column_name)
-    return if people_array.blank?
-
-    people_array.each do |person_name|
-      next if person_name.blank?
-      orcid = nil
-      name = person_name.gsub(/\s*\(?(orcid: )?(https?:\/\/orcid\.org\/)?(\d\d\d\d-\d\d\d\d-\d\d\d\d-\d\d\d[\dxX])[ \)]*/) do |_|
-        orcid = $3
-        ''
-      end.strip
-
-      Person.find_or_create_by!(full_name: name, orcid: orcid, resource: resource, role: role)
-    end
-  end
-
-  def people_to_array(resource, column_name, role)
-    arr = Person.where(resource: resource, role: role).map do |person|
-      name = person.full_name
-      name += " (#{person.orcid})" if person.orcid
-      name
-    end
-
-    resource.update_column(column_name, arr)
-  end
 end

db/migrate/20260303163452_migrate_learning_path_people.rb

@@ -1,4 +1,8 @@
+require_relative '../migration_helper'
+
 class MigrateLearningPathPeople < ActiveRecord::Migration[7.2]
+  include MigrationHelper
+
   class Person < ActiveRecord::Base; end unless defined?(Person)
 
   def up
@@ -22,34 +26,4 @@ def down
     end
     puts
   end
-
-  private
-
-  def array_to_people(resource, column_name, role)
-    return unless resource.respond_to?(:read_attribute)
-    # Get the raw array from database
-    people_array = resource.read_attribute(column_name)
-    return if people_array.blank?
-
-    people_array.each do |person_name|
-      next if person_name.blank?
-      orcid = nil
-      name = person_name.gsub(/\s*\(?(orcid: )?(https?:\/\/orcid\.org\/)?(\d\d\d\d-\d\d\d\d-\d\d\d\d-\d\d\d[\dxX])[ \)]*/) do |_|
-        orcid = $3
-        ''
-      end.strip
-
-      Person.find_or_create_by!(full_name: name, orcid: orcid, resource: resource, role: role)
-    end
-  end
-
-  def people_to_array(resource, column_name, role)
-    arr = Person.where(resource: resource, role: role).map do |person|
-      name = person.full_name
-      name += " (#{person.orcid})" if person.orcid
-      name
-    end
-
-    resource.update_column(column_name, arr)
-  end
 end

db/migration_helper.rb

@@ -0,0 +1,30 @@
+module MigrationHelper
+  def array_to_people(resource, column_name, role)
+    return unless resource.respond_to?(:read_attribute)
+    # Get the raw array from database
+    people_array = resource.read_attribute(column_name)
+    return if people_array.blank?
+
+    people_array.each do |person_name|
+      next if person_name.blank?
+      orcid = nil
+      name = person_name.gsub(/\s*\(?(orcid: )?(https?:\/\/orcid\.org\/)?(\d\d\d\d-\d\d\d\d-\d\d\d\d-\d\d\d[\dxX])[ \)]*/) do |_|
+        orcid = $3
+        ''
+      end.strip
+
+      p = Person.find_or_initialize_by(full_name: name, orcid: orcid, resource: resource, role: role)
+      p.save!(validate: false) if p.new_record?
+    end
+  end
+
+  def people_to_array(resource, column_name, role)
+    arr = Person.where(resource: resource, role: role).map do |person|
+      name = person.full_name
+      name += " (#{person.orcid})" if person.orcid
+      name
+    end
+
+    resource.update_column(column_name, arr)
+  end
+end