Merge to master: Release 2.4.9 - Multilingual display and search & new Concept page design

Gemfile

@@ -54,6 +54,7 @@ gem 'flamegraph'
 gem 'graphql-client'
 gem 'haml', '~> 5.1'
 gem 'i18n'
+gem 'rails-i18n', '~> 7.0.0'
 gem 'iconv'
 gem 'multi_json'
 gem 'mysql2', '0.5.3'
@@ -73,6 +74,8 @@ gem 'turnout'
 gem 'will_paginate', '~> 3.0'
 
 gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development'
+gem "flag-icons-rails", "~> 3.4"
+gem "iso-639", "~> 0.3.6"
 
 
 group :staging, :production, :appliance do
@@ -120,3 +123,4 @@ end
 
 gem "net-ftp", "~> 0.2.0", require: false
 gem "net-http"
+gem 'inline_svg'

Gemfile.lock

@@ -129,6 +129,8 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
+    css_parser (1.14.0)
+      addressable
     cube-ruby (0.0.3)
     daemons (1.4.1)
     dalli (3.2.4)
@@ -155,6 +157,8 @@ GEM
       multipart-post (~> 2)
     faraday-net_http (2.1.0)
     ffi (1.15.5)
+    flag-icons-rails (3.4.6.1)
+      sass-rails
     flamegraph (0.9.5)
     globalid (1.1.0)
       activesupport (>= 5.0)
@@ -170,6 +174,8 @@ GEM
       haml (>= 4.0)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
+    htmlbeautifier (1.4.2)
+    htmlentities (4.3.4)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
@@ -180,9 +186,10 @@ GEM
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.6.0)
-    irb (1.6.4)
-      reline (>= 0.3.0)
-    jquery-rails (4.5.1)
+    irb (1.7.4)
+      reline (>= 0.3.6)
+    iso-639 (0.3.6)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -197,6 +204,19 @@ GEM
     loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    lookbook (1.5.5)
+      actioncable
+      activemodel
+      css_parser
+      htmlbeautifier (~> 1.3)
+      htmlentities (~> 4.3.4)
+      listen (~> 3.0)
+      railties (>= 5.0)
+      redcarpet (~> 3.5)
+      rouge (>= 3.26, < 5.0)
+      view_component (> 2.0, < 4)
+      yard (~> 0.9.25)
+      zeitwerk (~> 2.5)
     lz4-ruby (0.3.3)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
@@ -210,6 +230,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.1)
     minitest (5.18.0)
     msgpack (1.7.0)
     multi_json (1.15.0)
@@ -277,6 +298,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
+    rails-i18n (7.0.6)
+      i18n (>= 0.7, < 2)
+      railties (>= 6.0.0, < 8)
     rails_autolink (1.1.8)
       actionview (> 3.1)
       activesupport (> 3.1)
@@ -339,6 +363,8 @@ GEM
     ruby_parser (3.20.0)
       sexp_processor (~> 4.16)
     rubyzip (2.3.2)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -418,6 +444,7 @@ GEM
     zeitwerk (2.6.8)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -437,17 +464,21 @@ DEPENDENCIES
   dalli
   debug
   ed25519 (>= 1.2, < 2.0)
+  flag-icons-rails (~> 3.4)
   flamegraph
   graphql-client
   haml (~> 5.1)
   html2haml
   i18n
   iconv
   importmap-rails
+  inline_svg
+  iso-639 (~> 0.3.6)
   jquery-rails
   jquery-ui-rails
   jsbundling-rails
   listen
+  lookbook (~> 1.5.5)
   multi_json
   mysql2 (= 0.5.3)
   net-ftp (~> 0.2.0)
@@ -461,6 +492,7 @@ DEPENDENCIES
   puma (~> 5.0)
   rack-mini-profiler
   rails (= 7.0.3)
+  rails-i18n (~> 7.0.0)
   rails_autolink
   rdoc
   recaptcha (~> 5.9.0)
@@ -484,4 +516,4 @@ DEPENDENCIES
   will_paginate (~> 3.0)
 
 BUNDLED WITH
-   2.3.23
+   2.4.12

app/assets/javascripts/application.js

@@ -31,7 +31,6 @@
 //= require_tree ./components
 //= require ontologies
 //= require projects
-//= require tooltipster.bundle.min
 //= require application_esbuild
 customElements.define('data-table-loader', DataTableLoader );
 customElements.define('data-table', DataTable );

app/assets/javascripts/bp_search.js.erb

@@ -293,6 +293,8 @@ function currentSearchParams() {
     params.require_definition = jQuery("#search_require_definition").is(":checked");
     params.exact_match = jQuery("#search_exact_match").is(":checked");
     params.categories = jQuery("#search_categories").val() || "";
+    params.lang = jQuery("#select_search_language").val() || "";
+
     return params;
 }
 
@@ -325,7 +327,8 @@ function performSearch() {
         includeNonProduction = jQuery("#search_include_non_production").is(":checked"),
         includeOnlyDefinitions = jQuery("#search_require_definition").is(":checked"),
         exactMatch = jQuery("#search_exact_match").is(":checked"),
-        categories = jQuery("#search_categories").val() || "";
+        categories = jQuery("#search_categories").val() || "",
+        language = jQuery("#select_search_language").val() || "";
 
     // Set the list of search words to be blacklisted for the ontology ownership algorithm
     blacklistSearchWordsArr = query.split(/\s+/);
@@ -336,6 +339,7 @@ function performSearch() {
         url: determineHTTPS(jQuery(document).data().bp.config.rest_url) + "/search",
         data: {
             q: query,
+            lang: language,
             include_properties: includeProps,
             include_views: includeViews,
             obsolete: includeObsolete,

app/assets/stylesheets/application.css.scss.erb

@@ -20,6 +20,7 @@
  *= require thickbox
  *= require select2
  *= require trumbowyg
+ *= require flag-icon
  *= require theme-variables
  */
 

app/assets/stylesheets/bioportal.scss

@@ -1,3 +1,8 @@
+.turbo-progress-bar {
+  height: 5px;
+  background-color: var(--admin-color);
+}
+
 a{
   text-decoration: none !important;
 }

app/assets/stylesheets/concepts.scss

@@ -18,7 +18,7 @@
   }
 }
 
-.concept_details td:nth-child(1) {
+.concept_details td:nth-child(2) {
   white-space: nowrap;
 }
 
@@ -31,3 +31,119 @@ div.synonym-change-request {
 div.synonym-change-request button {
   padding: 0px;
 }
+.nav-link.active{
+  border-radius: 5px;
+}
+.concepts-general-details{
+  width: 870px;
+  border-radius: 5px;
+  border: 1px solid #DFDFDF;
+}
+.concepts-nav-item{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.concepts-nav-item a{
+  margin: 12px 24px;
+  color: #888888 !important;
+  cursor: pointer;
+}
+.concepts-tabs-container{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.concepts-tabs{ 
+  display: flex;
+  justify-content: space-between;
+  width: 589px;
+}
+.concepts-active-tab a{
+  font-weight: 600;
+  color: var(--primary-color) !important;
+}
+.concepts-active-tab hr{
+  margin: 0;
+  border: 1px solid var(--primary-color);
+  border-radius: 5px;
+  display: block !important;
+  width: 100%;
+}
+.concepts-nav-item hr{
+  margin: 0;
+  display: none;
+}
+#concepts-header-line{
+  margin: 0;
+}
+.concepts-json{
+    width: 32px;
+    height: 32px;
+    border: 1px solid var(--primary-color);
+    border-radius: 16px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: absolute;
+    right: 40px;
+    transition: background-color ease 0.3s;
+}
+.concepts-json:hover{
+  background-color: var(--primary-color);
+
+}
+.concepts-json:hover svg path{
+  fill: white;
+}
+.concepts-content{
+  border-collapse: collapse;
+  width: 100%;
+  border-spacing: 0;
+
+}
+.concepts-content td{
+  padding: 12px 24px;
+  vertical-align: top;
+}
+.concepts-content tr:nth-child(odd) {
+  background-color: #FAFAFA;
+}
+
+.concepts-content td:first-child {
+  color: #888888;
+  width: 220px;
+}
+.concepts-content td:first-child {
+  color: #888888;
+  width: 220px;
+}
+.concepts-content a{
+  text-decoration: underline;
+  color: #888888;
+}
+.concepts-content div{
+  margin-bottom: 5px;
+}
+.concepts-raw-data{
+  margin-top: 20px;
+  border-radius: 5px;
+  border: 1px solid #DFDFDF;
+
+}
+.concepts-raw-title{
+  display: flex;
+  justify-content: space-between;
+  padding: 12px 24px;
+  color: #888888;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 400;
+}
+.concepts-raw-title div{
+  padding: 10px 0px;
+}
+#details_content{
+  margin-top: 15px;
+}