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

Feature: Align Bioportal and AgroPortal - part 5 - Better concept details view #28

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bd2b7ff
Merge branch 'upstream' into pr/align-bioportal-agroportal-part-4
syphax-bouazzouni Dec 17, 2024
d8316c4
fix visits chart for the axe y
syphax-bouazzouni Dec 17, 2024
d3a5653
add label ajax controller to fetch concept label using ajax
syphax-bouazzouni Dec 17, 2024
1d4a257
fix concept tree height and add a card
syphax-bouazzouni Dec 17, 2024
43dc0ef
add concept details component add related components
syphax-bouazzouni Dec 17, 2024
871d1a7
update concept mapping tab to be lazy loaded
syphax-bouazzouni Dec 17, 2024
8dc2898
migrate concept show to use Tabs component
syphax-bouazzouni Dec 17, 2024
9f5d159
migrate concept details to use ConceptDetails component
syphax-bouazzouni Dec 17, 2024
57bbb7b
add concept display of all languages option
syphax-bouazzouni Dec 17, 2024
1262119
fix a js bug in biomixer code
syphax-bouazzouni Dec 17, 2024
ab4d28d
add some helpers
syphax-bouazzouni Dec 17, 2024
37c4564
add scrolling the concept details block
syphax-bouazzouni Dec 17, 2024
99ffc02
make synonyms in one line and displayed as badges
syphax-bouazzouni Dec 17, 2024
00e070b
fix docker not running node by default in dev env
syphax-bouazzouni Jan 9, 2025
18435a1
add reveal component
syphax-bouazzouni Jan 9, 2025
b942e18
add show more or less component and use in concept details
syphax-bouazzouni Jan 9, 2025
580ecae
fix change request features in the concept details view
syphax-bouazzouni Jan 9, 2025
7d3480b
fix concept purl url not showing
syphax-bouazzouni Jan 9, 2025
70fe026
add the option to not show the language alert message for synonyms
syphax-bouazzouni Jan 9, 2025
1edc74c
fix synonym alert issue
syphax-bouazzouni Jan 23, 2025
94e43c9
fix the inconsistent display of custom properties to be always vertical
syphax-bouazzouni Jan 23, 2025
c5a753c
change Raw data title by All properties
syphax-bouazzouni Jan 23, 2025
29c9fb8
fix the issue with the edge case to see more
syphax-bouazzouni Jan 23, 2025
e6b785e
remove card border in the tree side
syphax-bouazzouni Jan 23, 2025
1e01e3d
fix the jump to alert style
syphax-bouazzouni Jan 23, 2025
2197d56
fix the badges issues when some are long and other small
syphax-bouazzouni Jan 23, 2025
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
119 changes: 60 additions & 59 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,15 @@ GEM
bcrypt_pbkdf (1.1.1)
bcrypt_pbkdf (1.1.1-arm64-darwin)
bcrypt_pbkdf (1.1.1-x86_64-darwin)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
bindex (0.8.1)
bootsnap (1.18.4)
msgpack (~> 1.2)
bootstrap (5.2.3)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.11.6, < 3)
sassc-rails (>= 2.0.0)
brakeman (6.2.2)
racc
brakeman (5.4.1)
bugsnag (6.27.1)
concurrent-ruby (~> 1.0)
builder (3.3.0)
Expand All @@ -117,19 +116,19 @@ GEM
capistrano (~> 3.0)
capistrano-passenger (0.2.1)
capistrano (~> 3.0)
capistrano-rails (1.6.3)
capistrano-rails (1.7.0)
capistrano (~> 3.1)
capistrano-bundler (>= 1.1, < 3)
capistrano-rbenv (2.2.0)
capistrano (~> 3.1)
sshkit (~> 1.3)
capistrano-yarn (2.0.2)
capistrano (~> 3.0)
capybara (3.40.0)
capybara (3.39.2)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.11)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
Expand All @@ -144,45 +143,41 @@ GEM
bigdecimal
rexml
crass (1.0.6)
css_parser (1.19.1)
css_parser (1.17.1)
addressable
csv (3.3.0)
csv (3.3.2)
dalli (3.2.8)
date (3.4.1)
debug (1.9.2)
debug (1.10.0)
irb (~> 1.10)
reline (>= 0.3.8)
deepl-rb (3.1.0)
diff-lcs (1.5.1)
docile (1.4.1)
domain_name (0.6.20240107)
ed25519 (1.3.0)
erubi (1.13.0)
erubi (1.13.1)
erubis (2.7.0)
excon (1.2.2)
excon (1.2.3)
execjs (2.10.0)
faraday (2.12.1)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-excon (2.3.0)
excon (>= 1.0.0)
faraday (>= 2.11.0, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (3.4.0)
net-http (>= 0.5.0)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
faraday (2.8.1)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-excon (2.1.0)
excon (>= 0.27.4)
faraday (~> 2.0)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (3.0.2)
ffi (1.16.3)
flag-icons-rails (3.4.6.1)
sass-rails
globalid (1.2.1)
activesupport (>= 6.1)
graphql (2.0.31)
base64
graphql-client (0.24.0)
graphql-client (0.25.0)
activesupport (>= 3.0)
graphql (>= 1.13.0)
haml (5.2.2)
Expand All @@ -195,8 +190,7 @@ GEM
railties (>= 5.1)
hashdiff (1.1.2)
hashie (5.0.0)
highline (3.1.1)
reline
highline (2.1.0)
html2haml (2.3.0)
erubis (~> 2.7.0)
haml (>= 4.0)
Expand All @@ -205,7 +199,7 @@ GEM
htmlbeautifier (1.4.3)
htmlentities (4.3.4)
http-accept (1.7.0)
http-cookie (1.0.7)
http-cookie (1.0.8)
domain_name (~> 0.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
Expand All @@ -229,7 +223,7 @@ GEM
activesupport (>= 3.0)
nokogiri (>= 1.6)
io-console (0.8.0)
irb (1.14.1)
irb (1.14.3)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso-639 (0.3.8)
Expand All @@ -242,7 +236,7 @@ GEM
railties (>= 3.2.16)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.9.0)
json (2.9.1)
language_server-protocol (3.17.0.3)
launchy (3.0.1)
addressable (~> 2.8)
Expand All @@ -257,8 +251,8 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.2)
loofah (2.23.1)
logger (1.6.4)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lookbook (1.5.5)
Expand Down Expand Up @@ -286,9 +280,10 @@ GEM
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1203)
mime-types-data (3.2025.0107)
mini_mime (1.1.5)
minitest (5.25.3)
mini_portile2 (2.8.8)
minitest (5.25.4)
msgpack (1.7.5)
multi_json (1.15.0)
multipart-post (2.4.1)
Expand All @@ -313,17 +308,20 @@ GEM
net-protocol
net-ssh (7.3.0)
netrc (0.11.0)
newrelic_rpm (9.16.0)
newrelic_rpm (9.16.1)
nio4r (2.7.4)
nokogiri (1.16.8-aarch64-linux)
nokogiri (1.15.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.8-arm64-darwin)
nokogiri (1.15.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.8-x86_64-darwin)
nokogiri (1.15.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.8-x86_64-linux)
nokogiri (1.15.7-x86_64-linux)
racc (~> 1.4)
oj (3.16.7)
oj (3.16.9)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
omniauth (2.1.2)
Expand All @@ -339,21 +337,21 @@ GEM
ast (~> 2.4.1)
racc
popper_js (2.11.8)
pry (0.15.0)
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.2.1)
psych (5.2.2)
date
stringio
public_suffix (6.0.1)
public_suffix (5.1.1)
puma (5.6.9)
nio4r (~> 2.0)
racc (1.8.1)
rack (2.2.10)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack-test (2.2.0)
rack (>= 1.3)
rails (7.0.8)
actioncable (= 7.0.8)
Expand All @@ -373,7 +371,7 @@ GEM
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.1)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (7.0.10)
Expand All @@ -391,20 +389,20 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.8.1)
rdoc (6.10.0)
psych (>= 4.0.0)
recaptcha (5.9.0)
json
redcarpet (3.6.0)
regexp_parser (2.9.3)
reline (0.5.12)
regexp_parser (2.10.0)
reline (0.6.0)
io-console (~> 0.5)
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.9)
rexml (3.4.0)
rouge (4.5.1)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
Expand All @@ -423,7 +421,7 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.2)
rubocop (1.69.1)
rubocop (1.69.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -433,13 +431,14 @@ GEM
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.2)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_parser (3.21.1)
racc (~> 1.5)
sexp_processor (~> 4.16)
rubyzip (2.3.2)
rubyzip (2.4.1)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
Expand All @@ -451,7 +450,7 @@ GEM
sprockets-rails
tilt
select2-rails (4.0.13)
selenium-webdriver (4.16.0)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -486,16 +485,16 @@ GEM
terser (1.2.4)
execjs (>= 0.3.0, < 3)
thor (1.3.2)
tilt (2.4.0)
tilt (2.5.0)
time (0.4.1)
date
timeout (0.4.2)
timeout (0.4.3)
turbo-rails (2.0.11)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.1.2)
unicode-display_width (3.1.3)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.2)
Expand All @@ -513,7 +512,8 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-driver (0.7.7)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
will_paginate (3.3.1)
Expand All @@ -525,6 +525,7 @@ GEM
PLATFORMS
aarch64-linux
arm64-darwin
ruby
x86_64-darwin
x86_64-linux

Expand Down
9 changes: 9 additions & 0 deletions app/assets/images/icons/copy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/assets/images/icons/copy_link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/json.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/summary/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions app/assets/javascripts/bp_mappings.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@
// The count returned may not match the actual number of mappings
// To get around this, we re-calculate based on the mapping table size

function updateMappingCount() {
var rows = jQuery("#concept_mappings_table tbody tr"), mappings_count = null;
rows.first().children("td").each(function() {
if (this.innerHTML.indexOf("no mappings") > -1) {
mappings_count = 0;
}
});
if (mappings_count === null) {
mappings_count = rows.length;
}
jQuery("#mapping_count").html(mappings_count);
}

// Also in bp_create_mappings.js
function updateMappingDeletePermissions() {
Expand Down Expand Up @@ -67,7 +55,6 @@ function loadMappings(value) {
}

jQuery(document).ready(function(){
updateMappingCount();
updateMappingDeletePermissions();

jQuery("#search_ontologies").chosen({search_contains: true, width:"100%"});
Expand All @@ -83,7 +70,6 @@ jQuery(document).ready(function(){
jQuery("#mappings-help").on("click", bpPopWindow);
});

jQuery(document).bind("tree_changed", updateMappingCount);

// deleteMappings() is a callback that is called by "#delete_mappings_button" created in
// /app/views/mappings/_concept_mappings.html.haml
Expand Down Expand Up @@ -132,7 +118,6 @@ function deleteMappings() {
jQuery("#" + rowId).css("border", "red solid");
}

jQuery("#mapping_count").html(jQuery("#mapping_details tbody tr:visible").size());
jQuery.bioportal.ont_pages["mappings"].retrieve_and_publish();
updateMappingDeletePermissions();
},
Expand Down
Loading
Loading