Skip to content

[BI-1375] Make GIDs clickable links #177

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
HMS17 merged 9 commits into from
May 11, 2022
Merged

[BI-1375] Make GIDs clickable links #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee80eb7
[BI-1375] - Make GIDs clickable links
HMS17 Apr 13, 2022
0fd116c
[BI-1375] - Make GIDs clickable links
HMS17 Apr 13, 2022
27e8e1e
Merge remote-tracking branch 'origin/feature/BI-1375' into feature/BI…
HMS17 Apr 14, 2022
cb2fade
Merge branch 'develop' into feature/BI-1375
HMS17 Apr 14, 2022
341a698
Merge branch 'feature/BI-1375' of https://github.com/Breeding-Insight…
HMS17 Apr 14, 2022
426d5d4
Merge branch 'develop' of https://github.com/Breeding-Insight/bi-api …
HMS17 Apr 15, 2022
3c18dd1
Small fixes
HMS17 Apr 15, 2022
56ded6a
[BI-1339] [BI-1375] QA fix and Code review fix
HMS17 May 3, 2022
f7ddb3e
Merge branch 'develop' into feature/BI-1375
HMS17 May 3, 2022
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
1 change: 1 addition & 0 deletions src/main/java/org/breedinginsight/brapi/v2/constants/BrAPIAdditionalInfoFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
public final class BrAPIAdditionalInfoFields {
public static final String GERMPLASM_RAW_PEDIGREE = "rawPedigree";
public static final String GERMPLASM_PEDIGREE_BY_NAME = "pedigreeByName";
public static final String GERMPLASM_PEDIGREE_BY_UUID = "pedigreeByUUID";
}
8 changes: 8 additions & 0 deletions src/main/java/org/breedinginsight/brapi/v2/dao/BrAPIGermplasmDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,21 +157,29 @@ private Map<String,BrAPIGermplasm> processGermplasmForDisplay(List<BrAPIGermplas

String newPedigreeString = "";
String namePedigreeString = "";
String uuidPedigreeString = "";
List<String> parents = Arrays.asList(germplasm.getPedigree().split("/"));
if (parents.size() >= 1) {
if (programGermplasmByFullName.containsKey(parents.get(0))) {
newPedigreeString = programGermplasmByFullName.get(parents.get(0)).getAccessionNumber();
namePedigreeString = programGermplasmByFullName.get(parents.get(0)).getDefaultDisplayName();
uuidPedigreeString = programGermplasmByFullName.get(parents.get(0)).getExternalReferences().
stream().filter(ref -> ref.getReferenceSource().equals(referenceSource)).
Copy link
Contributor

@ctucker3 ctucker3 May 3, 2022

Choose a reason for hiding this comment

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

Looks good! Did you mean to have the . on a separate line from the map and stream? I usually have seen it on the same line. If it's a style choice, feel free to keep it.

map(ref -> ref.getReferenceID()).findFirst().orElse("");
}
}
if (parents.size() == 2) {
if (programGermplasmByFullName.containsKey(parents.get(1))) {
newPedigreeString += "/" + programGermplasmByFullName.get(parents.get(1)).getAccessionNumber();
namePedigreeString += "/" + programGermplasmByFullName.get(parents.get(1)).getDefaultDisplayName();
uuidPedigreeString += "/" + programGermplasmByFullName.get(parents.get(1)).getExternalReferences().
stream().filter(ref -> ref.getReferenceSource().equals(referenceSource)).
map(ref -> ref.getReferenceID()).findFirst().orElse("");
}
}
//For use in individual germplasm display
additionalInfo.addProperty(BrAPIAdditionalInfoFields.GERMPLASM_PEDIGREE_BY_NAME, namePedigreeString);
additionalInfo.addProperty(BrAPIAdditionalInfoFields.GERMPLASM_PEDIGREE_BY_UUID, uuidPedigreeString);

germplasm.setPedigree(newPedigreeString);
}
Expand Down