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.

Sign up for GitHub

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

Jump to bottom

Feature: Add canonical portal for duplicate ontologies #770

Merged
merged 78 commits into from
Oct 24, 2024
Merged

Feature: Add canonical portal for duplicate ontologies #770

merged 78 commits into from
Oct 24, 2024

Conversation

Bilelkihal
Copy link
Collaborator

@Bilelkihal Bilelkihal commented Oct 9, 2024 •
edited by syphax-bouazzouni
Loading

PR description

This pull request introduces a function to determine the canonical portal for duplicated ontologies within a federation based on the :pullLocation data. The canonical portal is identified as the one that appears most frequently across the pullLocations of different duplicates.

Changes

  • Added a function to retrieve the canonical portal for duplicated ontologies using :pullLocation.
  • Open the ontologies in their canonical portal when they are duplicated.
  • Added a function to retrieve the canonical portal for duplicated search page results using :pullLocation of their submissions.
  • Open the search results in their canonical portal when they are duplicated.

ps. for the ontologies present in the current portal, they open always in the current portal.

syphax-bouazzouni and others added 30 commits August 23, 2024 14:37
@syphax-bouazzouni @Bilelkihal
simplify the header component to use content instead of a new section
6e87b96
@syphax-bouazzouni @Bilelkihal
update dropdown component to a custom title section instead of text
f3870cd
@syphax-bouazzouni @Bilelkihal
update browse page to use Dropdown component not bootsrap one
b21d74b
@syphax-bouazzouni @Bilelkihal
add color option to square badge component
a4759c8
@syphax-bouazzouni @Bilelkihal
add text and bg colors options to ontology browse card component
2733312
@syphax-bouazzouni @Bilelkihal
add federation helper code and config sample
cc6c288
@syphax-bouazzouni @Bilelkihal
add portals filters in the browse page
8a8bb8e
@syphax-bouazzouni @Bilelkihal
use federation helpers to get federation ontologies information
382582b
@syphax-bouazzouni @Bilelkihal
remove the filter using index code from submission filter as no used
6ab2e86
@syphax-bouazzouni @Bilelkihal
refactor the filter_using_data function to be faster by using an hash
5f8de42
@syphax-bouazzouni @Bilelkihal
update the browse analytics cache to change depending on portals
4dd2740
@syphax-bouazzouni @Bilelkihal
add categories and groups ids on hover to know its origin when federated
692c36e
@syphax-bouazzouni @Bilelkihal
use the last part of ids for browse counts independently of its origin
2910b13
@syphax-bouazzouni @Bilelkihal
remove binding.pry from final federation code
cb26cb2
@syphax-bouazzouni @Bilelkihal
add an error message if one of the external portal is down
7879468
@Bilelkihal
Merge branch 'development' into feature/federate-search-page
8d8b948
@Bilelkihal
display federated results in search page
f9f4810
@Bilelkihal
display federated search results in different colors
e403973
@Bilelkihal
add portals param in federated search
0ad89fa
@Bilelkihal
add federation checks in search page
5db6602
@Bilelkihal
merge federated search results
e68d651
@Bilelkihal
show portals names in federated search result chips in the form 'Agro…
065570b 
…Portal' instead of 'agroportal'
@Bilelkihal
sort federated search results by string similarity
2a33a0d
@syphax-bouazzouni
Merge branch 'development' into feature/federate-search-page
102b0a2
@Bilelkihal
fix merge development to federated search issues
62e1cc0
@Bilelkihal
clean search result component
07f0e44
@Bilelkihal
internationalize: results from other portals in search and browse page
2e5dd7b
@Bilelkihal
fix performance issue in federated search
d1b228a
@Bilelkihal
merge results using class id and ontology acronym
bb96959
@Bilelkihal
extract federation enabled into a helper in federated search
edb6937
@Bilelkihal Bilelkihal changed the title Feature: Federation ontology canonical portal Feature: Federation duplicated ontologies canonical portal Oct 9, 2024
@syphax-bouazzouni syphax-bouazzouni force-pushed the feature/federation-ontology-canonical-portal branch from 4a98ffa to 4b15edb Compare October 16, 2024 16:45
@syphax-bouazzouni syphax-bouazzouni force-pushed the feature/federation-ontology-canonical-portal branch from 4b15edb to 8f00782 Compare October 16, 2024 16:48
syphax-bouazzouni
syphax-bouazzouni requested changes Oct 16, 2024
View reviewed changes
app/helpers/federation_helper.rb Outdated Show resolved Hide resolved
app/helpers/federation_helper.rb Outdated Show resolved Hide resolved
@Bilelkihal Bilelkihal mentioned this pull request Oct 18, 2024
Merged
syphax-bouazzouni
syphax-bouazzouni requested changes Oct 22, 2024
View reviewed changes
app/helpers/federation_helper.rb Outdated Show resolved Hide resolved
app/controllers/concerns/search_aggregator.rb Outdated Show resolved Hide resolved
app/helpers/federation_helper.rb Outdated Show resolved Hide resolved
syphax-bouazzouni
syphax-bouazzouni requested changes Oct 23, 2024
View reviewed changes
app/helpers/federation_helper.rb Outdated Show resolved Hide resolved
app/controllers/concerns/search_aggregator.rb Outdated Show resolved Hide resolved
app/helpers/federation_helper.rb Outdated Show resolved Hide resolved
Bilelkihal
Bilelkihal commented Oct 23, 2024
View reviewed changes
Copy link
Collaborator Author

@Bilelkihal Bilelkihal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅

syphax-bouazzouni
syphax-bouazzouni approved these changes Oct 23, 2024
View reviewed changes
Copy link
Collaborator

@syphax-bouazzouni syphax-bouazzouni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved, did the following changes:

  • put again search canonical logic the search_aggregator file and refactor the code (55d0b71)
  • do the search canonical logic only if enabled (a86ba77)

@syphax-bouazzouni syphax-bouazzouni force-pushed the feature/federation-ontology-canonical-portal branch from 0cdd466 to 5a533f1 Compare October 23, 2024 20:26
@syphax-bouazzouni syphax-bouazzouni merged commit c52b5c8 into development Oct 24, 2024
2 of 4 checks passed
@syphax-bouazzouni syphax-bouazzouni changed the title Feature: Federation duplicated ontologies canonical portal Feature: Add canonical portal for duplicate ontologies Oct 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@syphax-bouazzouni syphax-bouazzouni syphax-bouazzouni approved these changes

Assignees

@Bilelkihal Bilelkihal

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Bilelkihal @syphax-bouazzouni