-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Annotation rendering configuration new section updates (#104)
* annotation rendering configuration frontend updates (#84) * updated annotation configuration, updated unit tests, partially updated system tests * updating the sidebar style to remained a fixed size, updated the logic for removing '_' from the anchors when displaying them * fixed system test & made the anchors have consistent naming style * added back the dataset data for each model * lint fix * unit test update * removed file upload where not needed * made requested PR changes, updating variant to hgvs_variant for attachment/genomic Type type, update styling to use variable set in main.css * Update frontend/src/models/analyses.js Co-authored-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> Signed-off-by: Alex Moss <kuthedk@users.noreply.github.com> * Update frontend/src/models/analyses.js Co-authored-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> Signed-off-by: Alex Moss <kuthedk@users.noreply.github.com> * Update frontend/src/models/analyses.js Co-authored-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> Signed-off-by: Alex Moss <kuthedk@users.noreply.github.com> * Update case_annotation_section_anchors.cy.js * Update frontend/src/models/analyses.js Co-authored-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> Signed-off-by: Alex Moss <kuthedk@users.noreply.github.com> --------- Signed-off-by: Alex Moss <kuthedk@users.noreply.github.com> Co-authored-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> * Alliance genome models into new configuration (#88) * Update Annotation Configuration to include new annotations from Alliance Genome (#81) * Now fetching the proper alliance genomic identifiers, with the correct identifiers the models are now being pulled in as expected * Create Animal Model Card to represent the animal models from Alliance Genome (#86) * Adding scrolling to the cards * Changed the model annotations to get a limit of 100 models, rather than 20 models. Updated the fixtures to contain ALL models * Removed display: block, position: relative from card-base. Changed li margin-left to use variable. Removed the overflow-y from card-source * Consolidated duplicate conditional code to determine if a section is empty and change the text color in AlliangeGenomeCard * Updated the AllianceGenomeCard.spec.js toContain to be to.include * Merged and updated for the new configuration to allign with the new datasets being introduced. --------- Signed-off-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> Co-authored-by: James Scherer <jscherer@uab.edu> * Migration script to update the data layer for the additional sections (#89) * Created migration script file to add additional annotation sections * Migration script saving changes in database. Debugging comments removed * Update etc/fixtures/migrations/migrate-additional-sections.js Added suggestion to update section name to match configuration Co-authored-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> Signed-off-by: Rabab Fatima <fr.rabab@gmail.com> --------- Signed-off-by: Rabab Fatima <fr.rabab@gmail.com> Co-authored-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> * Investigate why CPAM0084 breaks when re-running annotation from the api docs (#91) * Updated the fixtures for CPAM0084 * Updated python tests * As a Computational Biologist, I want to see the various summaries for animal models in the relevant section so I can have all the information consolidated in one location (#92) * Updated annotation configuration to have both automated and specificed alliance genome animal summaries, updated the fixtures to include both summaries and are accurate to the gene identifier, and updated the annotation rendering configuration to display the new annotations * Updated the python tests to include the 4 extra annotations in the configuration * updated the existing tests and removed the mongo ids from the imported fixtures * updated the existing tests and removed the mongo ids from the imported fixtures * Updated the Text Dataset in the Annotation components to display as unavailable if the value also has empty string * Updated the fixtures for genomic unit collection * Removed the mongoids from the genomic units collection initial seed * additional annottations * resolved unit test failures * Fixing the backend tests * Updated the integration tests for backend * As a Developer, provide a way to remove all automatic annotations from analyses, so they can be re-annotated with the correct information (#99) * Adding the remove annotation and annotation queueing scripts * Adding documentation and run feedback * Updated the analysis annotation script to give relevant output * Fixed the annotation config that broke annotation * Linting should be passing * Removed debugging print statements * Added a note to the annotate-all-existing-analyses.sh that it may need to be run more than once * Removed a space * Updated the the annotation configuration to uitilize the tag dataset to visualize the HPO terms * Fixed the unit test failing due to the addition of the tag datasets component * fixed the mised merge issue * pushing up system test changes * Skipping the 'should allow the user to navigate the analysis via the logo, header, and section anchor links' for now until we fix it --------- Signed-off-by: Alex Moss <kuthedk@users.noreply.github.com> Signed-off-by: Angelina Uno-Antonison <ange.unoantonison@gmail.com> Signed-off-by: Rabab Fatima <fr.rabab@gmail.com> Co-authored-by: Alex Moss <kuthedk@users.noreply.github.com> Co-authored-by: James Scherer <jscherer@uab.edu> Co-authored-by: Rabab Fatima <rfatima@uab.edu>
- Loading branch information
1 parent
ad958d8
commit 0ef93e7
Showing
22 changed files
with
24,064 additions
and
4,306 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
#! /bin/bash | ||
# ./annotate-all-existing-analyses.sh | ||
|
||
usage() { | ||
echo " " | ||
echo "usage: $0" | ||
echo " " | ||
echo " -h Prints usage" | ||
echo " " | ||
echo "Kicks off annotation jobs for all the existing analyses in Rosalution" | ||
echo " " | ||
echo "To run the annotations, please log in to Rosalution to retrieve the" | ||
echo "Client ID and Client Secret credentials. These can be found by" | ||
echo "clicking on your username or going to: <rosalution url>/rosalution/account" | ||
echo " " | ||
echo "Note: This script may need to be run multiple times due to the Rosalution" | ||
echo "annotation system not being built for large sets of annotations queued." | ||
echo " " | ||
echo "Please install jq for this script to work. https://stedolan.github.io/jq/" | ||
echo " " | ||
exit | ||
} | ||
|
||
while getopts ":h" opt; do | ||
case $opt in | ||
h) usage;; | ||
\?) echo "Invalid option -$OPTARG" && exit 127;; | ||
esac | ||
done | ||
|
||
if ! jq --version &> /dev/null | ||
then | ||
echo "Error: jq could not be found. Exiting." | ||
usage | ||
fi | ||
|
||
echo "Please enter your Client Id"; | ||
read -r CLIENT_ID; | ||
|
||
echo "Please enter your Client Secret"; | ||
read -r -s CLIENT_SECRET; | ||
|
||
if [ -z "${CLIENT_ID}" ] || [ -z "${CLIENT_SECRET}" ]; then | ||
echo " " | ||
echo "Please enter required credentials." | ||
usage | ||
fi | ||
|
||
echo "Fetching valid authentication token..." | ||
|
||
AUTH_TOKEN=$(curl -s -X 'POST' \ | ||
"http://local.rosalution.cgds/rosalution/api/auth/token" \ | ||
-H "accept: application/json" \ | ||
-H "Content-Type: application/x-www-form-urlencoded" \ | ||
-d "grant_type=&scope=&client_id=$CLIENT_ID&client_secret=$CLIENT_SECRET" | jq -r '.access_token') | ||
|
||
echo "Fetching existing analyses in Rosalution..." | ||
|
||
RESPONSE=$(curl -s -X "GET" \ | ||
"http://local.rosalution.cgds/rosalution/api/analysis/" \ | ||
-H "accept: application/json" \ | ||
-H "Authorization: Bearer $AUTH_TOKEN") | ||
|
||
ANALYSES=() | ||
while IFS='' read -r line; do ANALYSES+=("$line"); done < <(echo "$RESPONSE" | jq -c '[.[].name]') | ||
|
||
echo "${ANALYSES[@]}" | jq -r '.[]' | while read -r ANALYSIS; do | ||
echo "Starting annotations for analysis $ANALYSIS..." | ||
curl -s -X "POST" \ | ||
"http://local.rosalution.cgds/rosalution/api/annotate/$ANALYSIS" \ | ||
-H "accept: application/json" \ | ||
-H "Authorization: Bearer $AUTH_TOKEN" \ | ||
> /dev/null | ||
sleep 5 | ||
done | ||
|
||
echo "Done. Exiting." |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.