Fix: Some bugs in the pre-release 2.7.4 including internationalisatio…

…n and code cleaning (#554) * remove old no more used controller * correct the casing of the imported stimulus controller * remove the internationalization of template string the search components * update internationilaztion helper to add the class method version * clean the include of internationalisation helper in some files * remove unused helper * remove the switch from the metadata curator * update the search input stimulus controller to add searchEndpoint value * clean some old usage to jquery chosen to prepare its total removal * fix project index edit button translation missing * handle the case of corrupted agents in the landscape * catch the missing translation in the overided internationalization * fix duplicated translations * complete missing translations and clean the en.yml file * complete and clean the fr.yml file * fix translation upcasing * fix internationlization not displayed well as sanitized * re-write the french translations * add edit submission french translations
ontoportal-lirmm · Mar 29, 2024 · 4f26969 · 4f26969
1 parent 597a832
commit 4f26969
Show file tree

Hide file tree

Showing 49 changed files with 404 additions and 922 deletions.
diff --git a/app/assets/javascripts/bp_landscape.js b/app/assets/javascripts/bp_landscape.js
@@ -432,13 +432,6 @@ $(document).mouseup(function (e)
   }
 });
 
-jQuery(document).ready(function() {
-  "use strict";
-  // enable selected search
-  jQuery("#selected_relations").chosen({
-    search_contains: true
-  });
-})
 
 // Hide more properties pie div on load to let the pie lib the time to get the parent div size (to size the pie chart)
 window.onload = function() {

diff --git a/app/assets/javascripts/bp_mappings.js.erb b/app/assets/javascripts/bp_mappings.js.erb
@@ -71,8 +71,6 @@ jQuery(document).ready(function(){
   updateMappingCount();
   updateMappingDeletePermissions();
 
-  jQuery("#search_ontologies").chosen({search_contains: true, width:"100%"});
-
   // Handle visualization changes
   jQuery("#display_options input").on("click", function(e, button){
     var selectedOnt = jQuery("#search_ontologies").val();

diff --git a/app/assets/stylesheets/components/input_field.scss b/app/assets/stylesheets/components/input_field.scss
@@ -34,9 +34,3 @@
   margin-top: 5px;
 }
 
-
-.chosen-container {
-  padding: 0;
-  border-radius: 5px;
-}
-
diff --git a/app/components/agent_search_input_component/agent_search_input_component.html.haml b/app/components/agent_search_input_component/agent_search_input_component.html.haml
@@ -6,6 +6,6 @@
   - s.template do
     %a{href: "LINK", class: "search-content", 'data-turbo-frame': '_self'}
       %p.search-element.home-searched-ontology
-        = t('components.name_identifiers')
+        NAME(ACRONYM)
       %p.home-result-type
-        = t('components.type')
+        TYPE
diff --git a/app/components/ontology_search_input_component/ontology_search_input_component.html.haml b/app/components/ontology_search_input_component/ontology_search_input_component.html.haml
@@ -6,6 +6,6 @@
   - s.template do
     %a{href: "LINK", class: "search-content", 'data-turbo-frame': '_top'}
       %p.search-element.home-searched-ontology
-        = t('components.name_acronym')
+        NAME(ACRONYM)
       %p.home-result-type
-        = t('components.type')
+        TYPE
diff --git a/app/components/ontology_subscribe_button_component.rb b/app/components/ontology_subscribe_button_component.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class OntologySubscribeButtonComponent < ViewComponent::Base
-  include ApplicationHelper
+  include InternationalisationHelper
   def initialize(id: '', ontology_id:, subscribed:, user_id:, count: 0, link: 'javascript:void(0);')
     super
     @id = id

diff --git a/app/components/search_input_component/search_input_component_controller.js b/app/components/search_input_component/search_input_component_controller.js
@@ -10,7 +10,8 @@ export default class extends Controller {
         itemLinkBase: String,
         idKey: String,
         cache: {type: Boolean, default: true},
-        selectedItem: Number
+        selectedItem: Number,
+        searchEndpoint: {type: String, default: '/search'}
     }
 
     connect() {
@@ -91,7 +92,7 @@ export default class extends Controller {
         const inputValue = this.#inputValue();
         let results_list = []
         if (inputValue.length > 0) {
-            this.buttonTarget.href = `/search?q=${inputValue}`;
+            this.buttonTarget.href = `${this.searchEndpointValue}?q=${inputValue}`;
             this.actionLinks.forEach(action => {
                 const content = action.querySelector('p')
                 content.innerHTML = inputValue

diff --git a/app/controllers/annotator_controller.rb b/app/controllers/annotator_controller.rb
@@ -59,17 +59,17 @@ def annotator_results(uri)
       @json_link = json_link(uri, api_params)
       @rdf_link = "#{@json_link}&format=rdf"
       @results_table_header = [
-        "Class", "Ontology", "Contexts"
+        t('annotator.class'), t('annotator.ontology'), t('annotator.context')
       ]
       if params[:fast_context]
-        @results_table_header += ['Negation', 'Experiencer', 'Temporality', 'Certainty']
+        @results_table_header += [t('annotator.negation'), t('annotator.experiencer'), t('annotator.temporality'), t('annotator.certainty')]
       end
       @direct_results = 0
       @parents_results = 0
       if params[:score].nil? || params[:score].eql?('none')
         params[:score] = nil
       else
-        @results_table_header.push('Score')
+        @results_table_header.push(t('annotator.score'))
       end
       annotations = LinkedData::Client::HTTP.get(uri, api_params)
       @ontologies = get_simplified_ontologies_hash

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -16,7 +16,11 @@ class ApplicationController < ActionController::Base
   include InternationalisationHelper
 
   before_action :set_locale
-
+
+  def self.t(*args)
+    InternationalisationHelper.t(*args)
+  end
+
   # Sets the locale based on the locale cookie or the value returned by detect_locale.
   def set_locale    
     I18n.locale = cookies[:locale] || detect_locale
@@ -714,10 +718,6 @@ def request_lang
     helpers.request_lang
   end
 
-  def self.t(*args)
-    I18n.t(*args)
-  end
-
   private
   def not_found_record(exception)
     @error_message = exception.message

diff --git a/app/controllers/concepts_controller.rb b/app/controllers/concepts_controller.rb
@@ -166,7 +166,7 @@ def details
     ontology_not_found(params[:ontology]) if @ontology.nil?
 
     @concept = @ontology.explore.single_class({full: true}, CGI.unescape(params[:conceptid]))
-    concept_not_found(CGI.unescape(params[:conceptid])) if @concept.nil?
+    concept_not_found(CGI.unescape(params[:conceptid])) if @concept.nil? || @concept.errors
     @container_id = params[:modal] ? 'application_modal_content' : 'concept_details'
 
     if params[:styled].eql?("true")

diff --git a/app/controllers/landscape_controller.rb b/app/controllers/landscape_controller.rb
@@ -237,7 +237,7 @@ def index
           organizations_list = Array(sub.send(org_attr.to_s))
 
           organizations_list.each do |org|
-            org_str = org.name || org.to_s
+            org_str = org.name || org.to_s rescue org.to_s
             org_uri = nil
             # Check if the organization is actually an URL
             if org_str =~ /\A#{URI::regexp}\z/

diff --git a/app/controllers/precache_controller.rb b/app/controllers/precache_controller.rb
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -160,8 +160,9 @@ def destroy
   def project_params
     p = params.require(:project).permit(:name, :acronym, :institution, :contacts, { creator:[] }, :homePage,
                                         :description, { ontologyUsed:[] })
-    p[:creator].reject!(&:blank?)
-    p[:ontologyUsed].reject!(&:blank?)
+
+    p[:creator]&.reject!(&:blank?)
+    p[:ontologyUsed]&.reject!(&:blank?)
     p.to_h
   end
 

diff --git a/app/controllers/recommender_controller.rb b/app/controllers/recommender_controller.rb
@@ -1,7 +1,7 @@
 class RecommenderController < ApplicationController
   layout :determine_layout
   include ApplicationHelper
-  include InternationalisationHelper
+
   # REST_URI is defined in application_controller.rb
   RECOMMENDER_URI = "/recommender"
 

diff --git a/app/helpers/admin/licenses_helper.rb b/app/helpers/admin/licenses_helper.rb
@@ -2,12 +2,11 @@ module Admin::LicensesHelper
 
   def license_notification(license)
     days = license.days_remaining
-
     if (days == 0)
-      msg = (t(".license_expired") << " " << t(".license_contact")).html_safe
+      msg = (t("admin.licenses.license_notification.license_expired") << " " << t("admin.licenses.license_notification.license_contact")).html_safe
       notification = tag.div msg, class: "alert alert-danger mt-3", role: "alert"
     elsif license.is_trial?
-      msg = (t(".license_trial", count: days) << " " << t(".license_obtain") << " " << t(".license_contact")).html_safe
+      msg = (t("admin.licenses.license_notification.license_trial", count: days) << " " << t("admin.licenses.license_notification.license_obtain") << " " << t("admin.licenses.license_notification.license_contact")).html_safe
       notification = tag.div msg, class: "alert alert-info mt-3", role: "alert"
     end
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -540,7 +540,7 @@ def attribute_enforced_values(attr)
   def prefix_properties(concept_properties)
     modified_properties = {}
 
-    concept_properties.each do |key, value|
+    concept_properties&.each do |key, value|
       if value.is_a?(Hash) && value.key?(:key)
         key_string = value[:key].to_s
         next if key_string.include?('metadata')
@@ -582,7 +582,7 @@ def hide_advanced_options_button(text: nil, init: nil)
 
   def insert_sample_text_button(text)
     content_tag(:div, class:'insert-sample-text-button') do
-      content_tag(:div, class: 'button', 'data-action': 'click->sample-text#annotator_recommender', 'data-sample-text': t("sample_text")) do
+      content_tag(:div, class: 'button', 'data-action': 'click->sample-text#annotator_recommender', 'data-sample-text': t("annotator.sample_text")) do
         content_tag(:div, text, class: 'text') +
         inline_svg_tag('icons/arrow-curved-up.svg')
       end
@@ -596,9 +596,6 @@ def empty_state(text)
     end
   end
 
-  def list_to_string(list)
-    list&.join(',') || ''
-  end
 
   def ontologies_selector(id:, label: nil, name: nil, selected: nil)
     content_tag(:div) do

diff --git a/app/helpers/inputs_helper.rb b/app/helpers/inputs_helper.rb
@@ -9,13 +9,16 @@ def text_input(name:, value:nil, label: nil, disabled: false, help: nil, error_m
                                          data: data)
   end
 
-  def select_input(name:, values:, id: nil, label: nil, selected: nil, multiple: false, help: nil, open_to_add: false, required: false,  data: {})
+  def select_input(name:, values:, id: nil, label: nil, selected: nil, multiple: false, help: nil, open_to_add: false, required: false,
+                   placeholder: nil,
+                   data: {})
     render Input::SelectComponent.new(label: input_label(label, name), id: id || name, name: name, value: values,
                                       selected: selected,
                                       multiple: multiple,
                                       helper_text: help,
                                       open_to_add_values: open_to_add,
                                       required: required,
+                                      placeholder:  placeholder,
                                       data: data)
   end
 

diff --git a/app/helpers/internationalisation_helper.rb b/app/helpers/internationalisation_helper.rb
@@ -1,31 +1,43 @@
 module InternationalisationHelper
 
-  #Implement logic to make the term 'ontology' configurable throughout the portal, allowing it to be replaced with the variable $RESOURCE_TERM
-  def t(*args)
-    translation = I18n.t(*args).downcase
+  # Implement logic to make the term 'ontology' configurable throughout the portal,
+  # allowing it to be replaced with the variable $RESOURCE_TERM
+  def self.t(*args)
+    return I18n.t(*args) unless $RESOURCE_TERM
+
+    begin
+      original_translation = I18n.t(*args)
+      downcase_translation = original_translation.downcase
+    rescue StandardError => e
+      return e.message
+    end
+
     term = I18n.t("resource_term.ontology")
     plural_term = I18n.t("resource_term.ontology_plural")
     single_term = I18n.t("resource_term.ontology_single")
     resource = I18n.t("resource_term.#{$RESOURCE_TERM}")
     resources = I18n.t("resource_term.#{$RESOURCE_TERM}_plural")
     a_resource = I18n.t("resource_term.#{$RESOURCE_TERM}_single")
 
-    if translation.include?(term) && resource
+    if downcase_translation.include?(term) && resource
       replacement = resource.capitalize
-      replacement = resource if translation.include?(term)
-      if translation.include?(single_term)
+      replacement = resource if downcase_translation.include?(term)
+      if downcase_translation.include?(single_term)
         term = single_term
         replacement = a_resource
       end
-      translation.gsub(term, replacement)
-
-    elsif translation.include?(plural_term) && resources
+      original_translation.gsub(term, replacement)
+    elsif downcase_translation.include?(plural_term) && resources
       replacement = resources.capitalize
-      replacement = resources if translation.include?(plural_term)
-      translation.gsub(plural_term, replacement)
+      replacement = resources if downcase_translation.include?(plural_term)
+      original_translation.gsub(plural_term, replacement)
     else
       I18n.t(*args)
     end
   end
 
+  def t(*args)
+    InternationalisationHelper.t(*args)
+  end
+
 end
diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb
@@ -54,6 +54,8 @@ def private_ontology_icon(is_private)
   end
   def browse_filter_section_label(key)
     labels = {
+      categories: t('ontologies.categories'),
+      groups: t('ontologies.groups'),
       hasFormalityLevel: t('ontologies.formality_levels'),
       isOfType: t('ontologies.ontology_types'),
       naturalLanguage: t('ontologies.natural_languages')

diff --git a/app/helpers/submission_inputs_helper.rb b/app/helpers/submission_inputs_helper.rb
@@ -246,7 +246,7 @@ def contact_input(label: '', name: t('submission_inputs.contact'), show_help: tr
 
       render NestedFormInputsComponent.new(object_name: 'contact', default_empty_row: true) do |c|
         c.header do
-          content_tag(:div, label: t('submission_inputs.contact_name', name: name), class: 'w-50') + content_tag(:div, t('submission_inputs.contact_email', name: name), class: 'w-50')
+          content_tag(:div, name.blank? ? '' : t('submission_inputs.contact_name', name: name), class: 'w-50') + content_tag(:div, name.blank? ? '' : t('submission_inputs.contact_email', name: name), class: 'w-50')
         end
 
         c.template do