Merge pull request #753 from ontoportal-lirmm/development

Merge to master: Release 3.0.0 - OntoPortal federation
ontoportal-lirmm · Oct 31, 2024 · 6e99168 · 6e99168
2 parents c5826d3 + f1773c1
commit 6e99168
Show file tree

Hide file tree

Showing 96 changed files with 1,837 additions and 836 deletions.
diff --git a/Gemfile b/Gemfile
@@ -88,6 +88,9 @@ gem 'view_component', '~> 2.72'
 # Pagination library for Rails
 gem 'will_paginate', '~> 3.0'
 
+# String similarity, used by federated search to rank results
+gem 'string-similarity'
+
 # Render SVG files in Rails views
 gem 'inline_svg'
 
@@ -97,9 +100,9 @@ gem 'iso-639', '~> 0.3.6'
 gem 'countries', '~> 5.7'
 
 # Custom API client
-gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'master'
-
+gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development'
 # Ruby 2.7.8 pinned gems (to remove when migrating to Ruby >= 3.0)
+
 gem 'ffi', '~> 1.16.3'
 gem 'net-ftp', '~> 0.2.0', require: false
 gem 'net-http', '~> 0.3.2'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,17 +1,19 @@
 GIT
   remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git
-  revision: 24fb2549f7b69841e052491439bc8375ed5acfd9
-  branch: master
+  revision: 7423b46ff6fa7e5ef0f1d36548f7c04466939f71
+  branch: development
   specs:
     ontologies_api_client (2.2.0)
-      activesupport
+      activesupport (~> 7.0.4)
       excon
       faraday
       faraday-excon (~> 2.0.0)
       faraday-multipart
       lz4-ruby
       multi_json
       oj
+      parallel
+      request_store
       spawnling (= 2.1.5)
 
 GEM
@@ -145,20 +147,21 @@ GEM
     crass (1.0.6)
     css_parser (1.17.1)
       addressable
+    csv (3.3.0)
     dalli (3.2.8)
     date (3.3.4)
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    deepl-rb (2.5.3)
+    deepl-rb (3.0.2)
     diff-lcs (1.5.1)
     docile (1.4.1)
     domain_name (0.6.20240107)
     ed25519 (1.3.0)
     erubi (1.13.0)
     erubis (2.7.0)
-    excon (0.111.0)
-    execjs (2.9.1)
+    excon (0.112.0)
+    execjs (2.10.0)
     faraday (2.0.1)
       faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
@@ -176,7 +179,7 @@ GEM
       sass-rails
     globalid (1.2.1)
       activesupport (>= 6.1)
-    graphql (2.3.14)
+    graphql (2.3.19)
       base64
       fiber-storage
     graphql-client (0.23.0)
@@ -203,7 +206,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.7)
       domain_name (~> 0.5)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.37)
       activesupport (>= 4.0.2)
@@ -217,18 +220,19 @@ GEM
       terminal-table (>= 1.5.1)
     i18n-tasks-csv (1.1)
       i18n-tasks (~> 0.9)
-    importmap-rails (2.0.1)
+    importmap-rails (2.0.3)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.14.0)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    iso-639 (0.3.6)
+    iso-639 (0.3.8)
+      csv
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -237,15 +241,15 @@ GEM
       railties (>= 3.2.16)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
-    json (2.7.2)
-    json-jwt (1.16.6)
+    json (2.7.4)
+    json-jwt (1.16.7)
       activesupport (>= 4.2)
       aes_key_wrap
       base64
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
-    jwt (2.8.2)
+    jwt (2.9.3)
       base64
     language_server-protocol (3.17.0.3)
     launchy (3.0.1)
@@ -262,7 +266,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.1)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lookbook (1.5.5)
@@ -287,12 +291,13 @@ GEM
     marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.1.0)
-    mime-types (3.5.2)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0903)
+    mime-types-data (3.2024.1001)
     mini_mime (1.1.5)
     minitest (5.25.1)
-    msgpack (1.7.2)
+    msgpack (1.7.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.4.1)
@@ -302,7 +307,7 @@ GEM
       time
     net-http (0.3.2)
       uri
-    net-imap (0.4.16)
+    net-imap (0.4.17)
       date
       net-protocol
     net-pop (0.1.2)
@@ -315,9 +320,9 @@ GEM
       net-ssh (>= 5.0.0, < 8.0.0)
     net-smtp (0.5.0)
       net-protocol
-    net-ssh (7.2.3)
+    net-ssh (7.3.0)
     netrc (0.11.0)
-    newrelic_rpm (9.13.0)
+    newrelic_rpm (9.14.0)
     nio4r (2.7.3)
     nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
@@ -328,7 +333,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    oj (3.16.5)
+    oj (3.16.6)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (2.1.2)
@@ -338,8 +343,8 @@ GEM
     omniauth-github (2.0.1)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
-    omniauth-google-oauth2 (1.1.3)
-      jwt (>= 2.0)
+    omniauth-google-oauth2 (1.2.0)
+      jwt (>= 2.9)
       oauth2 (~> 2.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.8)
@@ -369,10 +374,10 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (5.1.1)
-    puma (5.6.8)
+    puma (5.6.9)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.9)
+    rack (2.2.10)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
@@ -422,19 +427,21 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
+    request_store (1.7.0)
+      rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.7)
-    rouge (4.3.0)
-    rspec-core (3.13.1)
+    rexml (3.3.9)
+    rouge (4.4.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (7.0.1)
@@ -446,7 +453,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.66.1)
+    rubocop (1.67.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -487,7 +494,7 @@ GEM
     simplecov-cobertura (2.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.13.0)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     snaky_hash (2.0.1)
       hashie
@@ -500,33 +507,33 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    sshkit (1.23.1)
+    sshkit (1.23.2)
       base64
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
       ostruct
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
+    string-similarity (2.1.0)
     stringio (3.1.1)
     temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.3)
+    terser (1.2.4)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.4.0)
     time (0.4.0)
       date
     timeout (0.4.1)
-    turbo-rails (2.0.6)
+    turbo-rails (2.0.11)
       actionpack (>= 6.0.0)
-      activejob (>= 6.0.0)
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     uri (0.13.1)
     version_gem (1.1.4)
     view_component (2.83.0)
@@ -538,7 +545,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.23.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -620,6 +627,7 @@ DEPENDENCIES
   simplecov-cobertura
   sprockets-rails
   stimulus-rails
+  string-similarity
   terser
   turbo-rails
   tzinfo-data

diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
@@ -58,7 +58,9 @@
 @import "agent_tooltip";
 @import "content_finder";
 @import "tools";
+@import "portal_configuration";
 @import "taxonomy";
+@import "federation";
 
 /* Bootstrap and Font Awesome */
 @import "bootstrap";

diff --git a/app/assets/stylesheets/browse.scss b/app/assets/stylesheets/browse.scss
@@ -451,6 +451,25 @@
   margin-top: 10px;
 }
 
+.browse-federation-input-chips{
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 15px 15px 15px;
+  div {
+    flex-grow: 1;
+  }
+
+  label{
+    display: grid;
+  }
+}
+.browse-federation-input-chip-container{
+  p{
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+  }
+}
 
 @media only screen and (max-width: 1250px) {
   .browse-first-row {

diff --git a/app/assets/stylesheets/components/chip_button.scss b/app/assets/stylesheets/components/chip_button.scss
@@ -10,6 +10,7 @@
 }
 .chip-button-component-container {
   display: inline-block;
+  text-wrap: nowrap !important;
 }
 .chip-button-component-container svg path{
   fill: var(--primary-color);