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

Annotation rendering configuration new section updates #104

Merged

Conversation

SeriousHorncat
Copy link
Collaborator

Checklist before requesting a review

  • I have performed a self-review of my code.
  • My code follows the style guidelines enforced by static analysis tools.
  • If it is a core feature, I have added thorough tests.
  • My changes generate no new warnings.
  • New and existing unit tests pass locally with my changes.
  • Will this be part of a product update? If yes, please write one phrase about this update.

Pull Request Details

Wrike Ticket - Deployment Plan for Each of the branches

Changes made:

  • Analysis now supports the same image attachment annotations to the analysis as annotations do
  • New sections to the configures with enhanced field types that can be set in configuration now
  • Consolidated CSS improvements to simplify the maintenance of the CSS and design system in code

To Review:

  • Static Analysis by Reviewer

  • The migration script migrates the production installation works as intended/rendered correctly.
    To check this run the following commands:

    1. Download the archived production database to your local machine. See @SeriousHorncat for the URL to download it from Box.

    2. Import the production database backup to Rosalution from the rosalution root directory

    # ./etc/database/restore-database.sh <container name> <absolute-file-path-to-backup-archive>
    ./etc/database/restore-database.sh rosalution-rosalution-db-1 rosalution-db-2023-07-07-1688746774.archive
    1. Run the migration script
    docker exec -it rosalution-rosalution-db-1 mongosh /tmp/fixtures/migrations/migrate-additional-sections.js
    1. Update the annotation configuration in the production database
     docker cp ./etc/database/set-new-annotations-configuration.sh rosalution-rosalution-db-1:/tmp/fixtures/set-new-annotations-configuration.sh
    docker exec -it rosalution-rosalution-db-1 bash
    ./tmp/fixtures/set-new-annotations-configuration.sh -f /tmp/fixtures/initial-seed/annotations-config.json -b ./backup/
    1. Strip Non-User Annotations
    docker exec rosalution-rosalution-db-1 mongosh /tmp/fixtures/remove-automatic-annotations.js
    1. Re-annotate all cases
     ./etc/api/annotate-all-existing-analyses.sh
  • List any other checks needed to be reviewed.

  • All Github Actions checks have passed.

kuthedk and others added 12 commits July 7, 2023 11:50
* 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>
* 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>
…#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>
…pi docs (#91)

* Updated the fixtures for CPAM0084

* Updated python tests
… 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
…m 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
Copy link
Collaborator

@JmScherer JmScherer left a comment

Choose a reason for hiding this comment

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

PR reviewed in meeting with @SeriousHorncat & @fatimarabab on 07/07/2023 @ 11:00am

@SeriousHorncat SeriousHorncat merged commit 0ef93e7 into main Jul 7, 2023
8 checks passed
@SeriousHorncat SeriousHorncat deleted the annotation-rendering-configuration-new-section-updates branch July 7, 2023 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants