Skip to content

Fix redundant ontology terms that are actually the same #932

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

Merged
sven1103 merged 1 commit into from
Nov 28, 2024
Merged

Fix redundant ontology terms that are actually the same #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions ...ce/src/main/java/life/qbic/datamanager/views/projects/create/OntologyComboboxFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ public MultiSelectComboBox<OntologyTerm> analyteBox() {
return box;
}

private FetchCallback<OntologyTerm, String> speciesFetchCallback(
List<Ontology> ontologies) {
return query -> OntologyFilterConnector.loadOntologyTerms(ontologies, query,
private FetchCallback<OntologyTerm, String> speciesFetchCallback() {
return query -> OntologyFilterConnector.loadOntologyTerms(query,
speciesLookupService);
}

Expand All @@ -51,10 +50,9 @@ private FetchCallback<OntologyTerm, String> ontologyTermFetchCallback() {
}

public MultiSelectComboBox<OntologyTerm> speciesBox() {
List<Ontology> speciesOntologies = List.of(Ontology.NCBI_TAXONOMY);

MultiSelectComboBox<OntologyTerm> box = newBox();
box.setItems(speciesFetchCallback(speciesOntologies));
box.setItems(speciesFetchCallback());

box.setPlaceholder("Search and select one or more species for your samples");
box.setLabel("Species");
Expand Down
7 changes: 2 additions & 5 deletions ...ava/life/qbic/datamanager/views/projects/project/experiments/OntologyFilterConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@ private OntologyFilterConnector() {
public static Stream<OntologyTerm> loadOntologyTerms(Query<OntologyTerm, String> query,
TerminologyService terminologyService) {
return terminologyService.query(query.getFilter().orElse(""), query.getOffset(),
query.getLimit()).stream();
query.getLimit()).stream().distinct();
}

public static Stream<OntologyTerm> loadOntologyTerms(List<Ontology> ontologies,
public static Stream<OntologyTerm> loadOntologyTerms(
Query<OntologyTerm, String> query,
SpeciesLookupService ontologyTermInformationService) {
List<String> ontologyAbbreviations = ontologies.stream()
.map(Ontology::getAbbreviation)
.toList();
List<SortOrder> sortOrders = query.getSortOrders().stream()
.map(querySortOrder -> new SortOrder(querySortOrder.getSorted(),
querySortOrder.getDirection().equals(SortDirection.DESCENDING)))
Expand Down