Merge branch 'master' into feature/rdnl_scraper

Author: fbacall

app/controllers/collaborations_controller.rb

@@ -38,7 +38,7 @@ def get_resource
       if name.end_with?('_id')
         c = name.chomp('_id').classify.constantize rescue NameError
         if c.method_defined?(:collaborations)
-          @resource = c.method_defined?(:friendly) ? c.friendly.find(value) : c.find(value)
+          @resource = c.respond_to?(:friendly) ? c.friendly.find(value) : c.find(value)
         end
       end
     end

app/controllers/events_controller.rb

@@ -67,6 +67,7 @@ def show
       format.json
       format.json_api { render json: @event }
       format.ics { send_data @event.to_ical, type: 'text/calendar', disposition: 'attachment', filename: "#{@event.slug}.ics" }
+      format.jsonld { render plain: @bioschemas.first.to_json }
     end
   end
 

app/controllers/materials_controller.rb

@@ -35,6 +35,7 @@ def show
       format.html
       format.json
       format.json_api { render json: @material }
+      format.jsonld { render plain: @bioschemas.first.to_json }
     end
   end
 

app/models/event.rb

@@ -115,7 +115,7 @@ class Event < ApplicationRecord
   has_one :llm_interaction, inverse_of: :event, dependent: :destroy
   accepts_nested_attributes_for :llm_interaction, allow_destroy: true
   has_one :edit_suggestion, as: :suggestible, dependent: :destroy
-  has_one :link_monitor, as: :lcheck, dependent: :destroy
+  has_one :link_monitor, as: :lcheck, dependent: :destroy, inverse_of: :link_checkable
   has_many :collection_items, as: :resource
   has_many :collections, through: :collection_items
   has_many :event_materials, dependent: :destroy

app/models/link_monitor.rb

@@ -1,5 +1,5 @@
 class LinkMonitor < ApplicationRecord
-  belongs_to :link_checkable, polymorphic: true, foreign_key: :lcheck_id, foreign_type: :lcheck_type
+  belongs_to :link_checkable, polymorphic: true, foreign_key: :lcheck_id, foreign_type: :lcheck_type, inverse_of: :link_monitor
   before_create :set_initial_date
   after_commit :reindex_resource, on: :update
 
@@ -50,6 +50,6 @@ def status_changed?
   def reindex_resource
     return unless TeSS::Config.solr_enabled
     return unless status_changed?
-    link_checkable.solr_index
+    link_checkable.solr_index if link_checkable&.respond_to?(:solr_index)
   end
 end

app/views/events/_form.html.erb

@@ -109,7 +109,7 @@
 
   <!-- Field: Topics -->
   <% if !TeSS::Config.feature['disabled'].include? 'topics' %>
-    <%= f.autocompleter :scientific_topics, url: edam_topics_path, template: 'autocompleter/term', label: 'Topics',
+    <%= f.autocompleter :scientific_topics, url: edam_topics_path, template: 'autocompleter/term',
                         id_field: :uri, label_field: :preferred_label, input_html: { title: t('events.hints.topics') } %>
   <% end %>
 
@@ -149,7 +149,7 @@
   <!-- Field: Content Provider -->
   <%= f.input :content_provider_id, label: 'Content provider (where the event metadata is obtained from)',
               collection: current_user.get_editable_providers, label_method: :title, value_method: :id, include_blank: true,
-              field_lock: true %>
+              field_lock: true, input_html: { title: t('events.hints.providers') } %>
 
   <!-- Field: Materials -->
   <%= f.autocompleter :materials, input_html: { title: t('events.hints.materials') }, url: materials_path %>

app/views/materials/_form.html.erb

@@ -13,7 +13,7 @@
   <% # Required Fields    -%>
 
   <!-- Field: Title -->
-  <%= f.input :title, as: :string, field_lock: true, input_html: { title: t('materials.hints.title'), placeholder: t('materials.hints.title') } %>
+  <%= f.input :title, as: :string, field_lock: true, input_html: { title: t('materials.hints.title') } %>
 
   <!-- Field: URL -->
   <%= render partial: 'common/url_checker',
@@ -64,7 +64,7 @@
 
   <!-- Field: Provider -->
   <%= f.input :content_provider_id, collection: current_user.get_editable_providers, label_method: :title, value_method: :id,
-              include_blank: true, field_lock: true, label: t('materials.hints.providers'),
+              include_blank: true, field_lock: true, input_html: { title: t('materials.hints.providers') },
               visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
 
   <!-- Field: Authors -->

config/initializers/mime_types.rb

@@ -4,3 +4,4 @@
 # Mime::Type.register "text/richtext", :rtf
 
 Mime::Type.register 'application/vnd.api+json', :json_api
+Mime::Type.register 'application/ld+json', :jsonld, ['application/vnd.schemaorg.ld+json']

config/locales/en.yml

@@ -581,14 +581,16 @@ en:
     retention: "Your information will be retained by %{site_name} until you choose to remove it, you delete your account, or the %{site_name} service ceases to exist."
     code: "%{site_name} adheres to the <a href='https://www.geant.net/uri/dataprotection-code-of-conduct/v1'> GÉANT Data Protection Code of Conduct for Service Providers in EU/EEA </a>"
     controller: "The data controller for %{site_name} is The University of Manchester."
-    post: "<strong>The %{site_name} Team</strong><br/>Room 1.17 c/o School of Computer Science,<br/>Kilburn Building,<br/>Oxford Road,<br/>Manchester,<br/>M13 9PL"
+    post: "<strong>The TeSS Team</strong><br/>Room 2.86 c/o School of Computer Science,<br/>Kilburn Building,<br/>Oxford Road,<br/>Manchester,<br/>M13 9PL"
   events:
     hints:
-      address: 'Where is this event being held?'
+      address: 'Physical location of the event if its being conducted Face-to-face.'
       capacity: >
         Provide the total number (cap) of individuals that can attend the training event.
         Leave blank if there is no limit.
-      contact: ''
+      contact: >
+        The individual responsible for communication regarding the training material, typically including 
+        name, affiliation, email address, and an ORCID identifier if possible.
       cost_basis: 'Select the basis by which costs, if any, are applied.'
       cost_value: 'Input the cost of the training event.'
       cost_currency: 'Select the currency associated with the cost.'
@@ -599,65 +601,87 @@ en:
       end: 'When does the event end?'
       event_type: 'Select the most appropriate event type for the training event.'
       fields: 'Select Fields of Research to better classify your event.'
-      hosts: ''
+      hosts: 'Institution/Organisation where the event will be held.'
       keywords: "Provide words or terms that clearly identify the training event's topics."
-      language: 'Language of instruction'
+      language: 'The language in which the training/seminar/lecture will be delivered. Select from the list of available options.'
       materials: 'Add any training materials that are associated with the training event.'
       objectives: 'What knowledge, skills, or abilities should your audience gain from completing the training?'
-      organizer: ''
+      organizer: 'Institution/Organisation or the individual coordinating to organise the event.'
       prerequisites: 'What understanding or knowledge does the audience need to have covered before the training event?'
       recognition: 'Provide a description of any qualifications, awards, certificates, diplomas, or other
         educational credentials that will be awarded on successful completion of the training event.'
       requirements: 'Indicate the technical requirements needed to participate in the training event.'
-      sponsors: 'Who sponsored, or funded the event?'
+      sponsors: 'Institution/Organisation or funding bodies that funded that event.'
       start: 'When does the event start?'
       subtitle: 'Include a subtitle to add context for your intended audience.'
       targets: 'Indicate the type of audience for which the training event is intended.'
       topics: 'Select the Fields of Research (FoR) codes that the training covers.'
       timezone: 'Select the appropriate timezone'
       title: 'Add a title for your training event.'
-      url: 'Enter a valid URL for the event landing page.'
+      url: 'Location where the event and its details are advertised on the internet.'
+      providers: The organisation providing the event metadata.
     prompts:
       language: 'Select a language...'
     long: 'Long events'
     pick_date: 'Pick a range of dates for a better collection of events.'
   materials:
     hints:
       authors: >
-        Add individuals and organisations involved in the preparation, creation or presentation of the published work.
+        Individuals who made substantial intellectual or technical contributions to the 
+        conception, design, execution of the training material.
       contact: >
-        Include the first name, last name and contact details of the person or organisation that can be contacted about
-        the training material.
-      contributors: 'Add individual and organisations that contributed to the training material.'
+        The individual responsible for communication regarding the training material, typically including 
+        name, affiliation, email address, and an ORCID identifier if possible.
+      contributors: >
+        Individuals or entities who provided specific assistance, technical input, data, or materials to the work 
+        but may not meet the full criteria for authorship.
       date_created: 'Add the date that the training material was created.'
       date_modified: 'Add the date that the training material was last modified.'
       date_published: 'Add the date that the training material was published.'
-      description: 'Provide a textual description of your training material, for additional context.'
+      description: >
+        A short, informative summary that outlines the purpose, scope, key topic and of the training material. 
+        It should help the learners and instructors understand the content and relevance of the training before engaging with it.
       difficulty: 'Indicate the learners expected level of competency in the topic covered by the material.'
-      doi: 'Include a DOI if one exists for the training material.'
-      events: ''
+      doi: >
+        Digital Object Identifier. 
+        A unique, persistent alphanumeric string assigned to the training material 
+        that provides a permanent link to its location for long-term accessibility and citation tracking.
+      events: >
+        Workshops, seminars, conferences, summer or winter schools that contribute to or disseminate the training.
       fields: 'Select Fields of Research to better classify your material.'
       keywords: "Provide words or terms that clearly identify the training material's topics."
-      licence: 'Select the licence for the training material.'
+      licence: >
+        The most appropriate license that specifies the terms under which your training material and dataset can be used, 
+        modified, and distributed. 
+        Various options of licenses, for example, Creative Commons License are available to choose from. 
       objectives: >
-        Describe the knowledge, skills or abilities that students should acquire throught the completion or use of the
-        training material.
+        Clearly defined, measurable statements describing the specific knowledge, skills a learner should acquire 
+        after completing the training course.
       other_types: 'Enter the types of resources that are not included on the above list.'
       part_of: 'Describe the larger service of training to which this material belongs.'
       prerequisites: >
-        What prior understanding or knowledge does your audience need to have on the topics covered in the training
-        material?
-      providers: ''
+        The foundational knowledge, skills, or competencies that a learner or user must possess 
+        before engaging with the training content.
+      providers: >
+        The organisation, institution, or individual responsible for providing, and maintaining the training material.
       resources: 'Are there any external resources that relate to the is training material?'
-      status: 'Indicate the current status of the training material.'
+      status: >
+        The current state or stage of the training material indicating whether it is 
+        Active, Under development, or Archived.
       subsets: 'Add identifier URLs or DOIs for each subset of the training material.'
       syllabus: 'Describe the syllabus or provide an overview of the topics covered.'
       targets: 'Indicate the type of audience intended to use your training material.'
       time: 'What is the estimated time it takes to work through this resource in hours?'
-      title: 'Add a title for your training material.'
-      resource_type: 'Select the type of resource that best matches the training material. '
+      title: >
+        A concise sentence that clearly indicates the topic of the training material. 
+        It should provide context and help learners understand what the material will cover.
+      resource_type: >
+        The predominant category that describes the kind of learning material, 
+        for example, a presentation, video, handout, publication, poster.
       url: 'Preferred URL to direct people to your training material landing page.'
-      version: 'Indicate the current version of the training material.'
+      version: >
+        A specific iteration or release of the training material document, labeled to track updates 
+        (for example, v1.0, v2.1).
       visible: 'Whether this material should be shown or hidden from the materials page.'
   learning_paths:
     hints:
@@ -684,7 +708,8 @@ en:
       part_of: 'Describe the larger service of training to which this learning path belongs.'
       prerequisites: >
         What prior understanding or knowledge does your audience need to have on the topics covered in the learning path?
-      providers: ''
+      providers: >
+        The organisation, institution, or individual responsible for providing, and maintaining the learning path.
       resources: 'Are there any external resources that relate to the is learning path?'
       status: 'Indicate the current status of the learning path.'
       subsets: 'Add identifier URLs or DOIs for each subset of the learning path.'

docs/kubernetes-helm-chart.md

@@ -2,4 +2,4 @@
 
 TeSS can be run using Kubernetes / Helm chart for production.
 
-Find [TeSS Helm chart repository](https://github.com/ElixirTeSS/TeSS_Helm_chart) as well as the [deploy instructions](https://github.com/ElixirTeSS/TeSS_Helm_chart/blob/main/README.md).
+Find [TeSS Helm chart repository](https://github.com/ElixirTeSS/tess-helm-chart) as well as the [deploy instructions](https://github.com/ElixirTeSS/tess-helm-chart/blob/main/README.md).