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 to AgroPortal 3.0 #14

Merged
Changes from 6 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
452c5e2
Feature: mappings statistics slices support (#78)
Bilelkihal May 21, 2024
c2ac9e0
update owl wrapper version to v1.4.3
syphax-bouazzouni Jun 26, 2024
0bb7916
update test search multilingual test to ensure selecting one prefLabel
syphax-bouazzouni Jun 27, 2024
147e44b
add filter search results attributes by language
syphax-bouazzouni Jun 27, 2024
955817a
add search multiple languages or all languages tests
syphax-bouazzouni Jun 27, 2024
923629e
implement display search results in multiple languages
syphax-bouazzouni Jun 27, 2024
6abcaaa
fix annotator prefLabel language selection
syphax-bouazzouni Jun 27, 2024
ab38c60
fix: remove duplicated agents endpoint ('/Agents') (#85)
Bilelkihal Jul 23, 2024
67bc9fb
Feature: implement ontology agents endpoint (#84)
syphax-bouazzouni Jul 23, 2024
4534006
Merge pull request #82 from ontoportal-lirmm/fix/search-multilingual-…
Bilelkihal Jul 24, 2024
014eb3d
Feature: update agents search endpoint to add option to have a custom…
Bilelkihal Aug 1, 2024
fc11608
Fix: hide duplicated agents endpoint ('/Agents') (#91)
syphax-bouazzouni Aug 1, 2024
e9d1db6
Merge branch 'master' into development
syphax-bouazzouni Aug 5, 2024
189a35c
Feature: Add OntoPortal API deployment CI (#88)
syphax-bouazzouni Aug 8, 2024
34ebd68
Merge branch 'master' into development
syphax-bouazzouni Aug 8, 2024
b434252
Merge pull request #87 from ontoportal-lirmm/development
syphax-bouazzouni Aug 8, 2024
67f376c
Merge branch 'master' into development
syphax-bouazzouni Aug 8, 2024
54424ed
Merge branch 'development'
syphax-bouazzouni Aug 8, 2024
16fedb9
Feature: Add unmapped, range and domain attributes for properties end…
syphax-bouazzouni Aug 23, 2024
fc6635f
update home endpoint to add portal config information
syphax-bouazzouni Aug 30, 2024
dd3be1f
set the portal config id as the the api endpoint host
syphax-bouazzouni Sep 4, 2024
82ded73
Feature: Add unmapped, range and domain attributes for properties end…
syphax-bouazzouni Aug 23, 2024
41743a6
Merge branch 'master' into development
syphax-bouazzouni Sep 10, 2024
5d56ebb
add submission diff endpoint
syphax-bouazzouni Sep 16, 2024
30476b5
Merge branch 'feature/add-portal-config-endpoint' into development
Bilelkihal Sep 19, 2024
2c2d837
Merge branch 'development' into feature/add-diff-parsing-endpoint
syphax-bouazzouni Oct 4, 2024
1c27d64
add a test for parent category
Bilelkihal Oct 5, 2024
129294f
use parent category branch in the gemfile
Bilelkihal Oct 5, 2024
3afae26
update test parent category to use parentCategory instead of parentCa…
Bilelkihal Oct 5, 2024
40c5444
save category and fetch it in test parent category
Bilelkihal Oct 10, 2024
87b4add
Merge pull request #97 from ontoportal-lirmm/feature/test-parent-cate…
syphax-bouazzouni Oct 10, 2024
eb15fd3
Merge branch 'development' into feature/add-diff-parsing-endpoint
syphax-bouazzouni Oct 19, 2024
e0cfbd9
Merge pull request #95 from ontoportal-lirmm/feature/add-diff-parsing…
syphax-bouazzouni Oct 19, 2024
4b62667
Fix: Broken password reset after merging (ontologies_linked_data PR#1…
muhammedBkf Oct 21, 2024
3fb29ce
Fix: remove file parameters when no file is uploaded (#99)
muhammedBkf Oct 22, 2024
34ecc2d
Fix: multilingual generated missing labels issue (#101)
syphax-bouazzouni Oct 24, 2024
8a21637
Feature: Migrate to minitest 5 (#102)
syphax-bouazzouni Oct 26, 2024
9e77603
Merge branch 'development' into ecoportal
syphax-bouazzouni Oct 26, 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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ gem 'ncbo_cron', git: 'https://github.com/ontoportal-lirmm/ncbo_cron.git', branc
gem 'ncbo_ontology_recommender', git: 'https://github.com/ncbo/ncbo_ontology_recommender.git', branch: 'master'
gem 'goo', github: 'ontoportal-lirmm/goo', branch: 'development'
gem 'sparql-client', github: 'ontoportal-lirmm/sparql-client', branch: 'development'
gem 'ontologies_linked_data', git: 'https://github.com/ontoportal-lirmm/ontologies_linked_data.git', branch: 'feature/parse-diff-files'
gem 'ontologies_linked_data', git: 'https://github.com/ontoportal-lirmm/ontologies_linked_data.git', branch: 'development'

group :development do
# bcrypt_pbkdf and ed35519 is required for capistrano deployments when using ed25519 keys; see https://github.com/miloserdow/capistrano-deploy/issues/42
31 changes: 16 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/ncbo/ncbo_ontology_recommender.git
revision: 013abea4af3b10910ec661dbb358a4b6cae198a4
revision: 9dbd4f179e42c52095129d353a5ac584e9bd47f3
branch: master
specs:
ncbo_ontology_recommender (0.0.1)
@@ -11,7 +11,7 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/goo.git
revision: a95245b8c964431505ca6315907440996c59a00d
revision: 6018b33373467b778744432ec78a6d814159d129
branch: development
specs:
goo (0.0.2)
@@ -57,8 +57,8 @@ GIT

GIT
remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git
revision: d69ede0a0b3e3c5dee64fa75cb09cc6e16e0f4b5
branch: feature/parse-diff-files
revision: 0a456557bc0ae2a7d016000de9b57d3f9eca99a5
branch: development
specs:
ontologies_linked_data (0.0.1)
activesupport
@@ -141,7 +141,7 @@ GEM
docile (1.4.1)
domain_name (0.6.20240107)
ed25519 (1.3.0)
faraday (1.10.3)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -204,7 +204,7 @@ GEM
grpc (~> 1.41)
googleapis-common-protos-types (1.16.0)
google-protobuf (>= 3.18, < 5.a)
googleauth (1.11.0)
googleauth (1.11.1)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
@@ -231,7 +231,7 @@ GEM
rdf (>= 2.2.8, < 4.0)
json-schema (2.8.1)
addressable (>= 2.4)
jwt (2.9.0)
jwt (2.9.3)
base64
kgio (2.11.4)
libxml-ruby (5.0.3)
@@ -245,9 +245,10 @@ GEM
net-pop
net-smtp
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 (4.7.5)
minitest-stub_any_instance (1.0.3)
@@ -258,7 +259,7 @@ GEM
mutex_m (0.2.0)
net-http-persistent (4.0.4)
connection_pool (~> 2.2)
net-imap (0.4.16)
net-imap (0.4.17)
date
net-protocol
net-pop (0.1.2)
@@ -271,9 +272,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)
oj (3.16.1)
omni_logger (0.1.4)
logger
@@ -342,7 +343,7 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (3.1.2)
rexml (3.3.7)
rexml (3.3.8)
rsolr (2.6.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
@@ -378,7 +379,7 @@ GEM
rack-test
sinatra (~> 1.4.0)
tilt (>= 1.3, < 3)
sshkit (1.23.1)
sshkit (1.23.2)
base64
net-scp (>= 1.1.2)
net-sftp (>= 2.1.2)
@@ -464,4 +465,4 @@ DEPENDENCIES
webmock (~> 3.19.1)

BUNDLED WITH
2.3.23
2.4.22
32 changes: 31 additions & 1 deletion test/controllers/test_categories_controller.rb
Original file line number Diff line number Diff line change
@@ -117,4 +117,34 @@ def test_delete_category
get "/categories/#{acronym}"
assert last_response.status == 404
end
end

def test_parent_category
parent_category1 = LinkedData::Models::Category.new(
acronym: "PARENT1",
name: "Parent Category 1",
description: "Description for Parent Category 1."
)
parent_category1.save

parent_category2 = LinkedData::Models::Category.new(
acronym: "PARENT2",
name: "Parent Category 2",
description: "Description for Parent Category 2."
)
parent_category2.save

category_instance = LinkedData::Models::Category.new(
acronym: "CAT123",
name: "Sample Category",
description: "This is a sample category.",
parentCategory: [parent_category1, parent_category2]
)
category_instance.save

get '/categories/CAT123'
fetched_category = MultiJson.load(last_response.body)

assert_equal fetched_category["parentCategory"].first , parent_category1.id.to_s
assert_equal fetched_category["parentCategory"].last , parent_category2.id.to_s
end
end