Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge to master: Release 3.0.0 - OntoPortal federation #753

Merged
merged 29 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6fe5693
Feature: Federate browse page (#621)
syphax-bouazzouni Sep 11, 2024
1ac4633
Feature: Add portals configuration tooltip in homepage (#744)
syphax-bouazzouni Sep 19, 2024
ff62471
Fix: localize a forgoten text in the annotator page (#757)
muhammedBkf Sep 23, 2024
3ec8d1c
Fix : Add language-specific anchors to footer section links and the c…
muhammedBkf Sep 29, 2024
5ade600
Feature: Add `Details` sub-tab and API cotextual button in Properties…
muhammedBkf Sep 30, 2024
47c8848
Feature: Allow multiple parentCategories (#772)
Bilelkihal Oct 11, 2024
bbe9fd7
Fix: browse page white page issue (#774)
syphax-bouazzouni Oct 14, 2024
ef836ce
Feature: Implement federation for the search page (#739)
Bilelkihal Oct 14, 2024
7eb8d76
Feature: Add federation portals status check (#769)
Bilelkihal Oct 22, 2024
e8df167
Fix: federated browse page not updating the categories when portals …
Bilelkihal Oct 23, 2024
ea3526a
Feature: Add federation results counts grouped by portal (#778)
Bilelkihal Oct 23, 2024
dc448c9
fix issue after merging federation PRs
Bilelkihal Oct 23, 2024
c52b5c8
Feature: Add canonical portal for duplicate ontologies (#770)
Bilelkihal Oct 24, 2024
18a4cac
Fix: slices homepage metrics count (#775)
syphax-bouazzouni Oct 24, 2024
227f563
Fix: put back category chip component alias to group chip component (…
Bilelkihal Oct 25, 2024
817c1f5
Fix: Summary page scroll up auto multiple times (#781)
Bilelkihal Oct 25, 2024
45cdb79
Merge branch 'master' into development
syphax-bouazzouni Oct 26, 2024
a69658d
Feature: Add enable/disable federation option (#780)
Bilelkihal Oct 26, 2024
d83e304
Fix: Jump to infinit loading after search federation work (#782)
Bilelkihal Oct 26, 2024
fea0612
Fix: Include views in ontologies selector of search page (#784)
Bilelkihal Oct 26, 2024
e3a2ba2
Update Gemfile.lock
syphax-bouazzouni Oct 28, 2024
8bf8a9d
Fix: disabled federation browse page state
syphax-bouazzouni Oct 28, 2024
e5387e5
Fix: project page ontologies not selected (#790)
Bilelkihal Oct 30, 2024
1aa8d38
fix collection tree issue by including MultiLanguagesHelper to make s…
Bilelkihal Oct 30, 2024
70f0e4d
Fix: ontologies selector localization text and add "[view]" of the vi…
Bilelkihal Oct 30, 2024
1e4b809
Fix: update select_language_label helper to select f no english foun…
syphax-bouazzouni Oct 30, 2024
d67ba52
Fix: clean concepts controller code to improve tree view performance …
Bilelkihal Oct 30, 2024
e616842
Fix: Disable slices not hiding the slices section in the home page (…
syphax-bouazzouni Oct 30, 2024
f1773c1
Feature: update concept mappings table UI (#798)
Bilelkihal Oct 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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'
Expand Down
84 changes: 46 additions & 38 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -620,6 +627,7 @@ DEPENDENCIES
simplecov-cobertura
sprockets-rails
stimulus-rails
string-similarity
terser
turbo-rails
tzinfo-data
Expand Down
2 changes: 2 additions & 0 deletions app/assets/stylesheets/application.css.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
19 changes: 19 additions & 0 deletions app/assets/stylesheets/browse.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/components/chip_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading