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

Merge oncokb-curation feature branch into master #119

Draft
wants to merge 612 commits into
base: master
Choose a base branch
from
Draft

Merge oncokb-curation feature branch into master #119

wants to merge 612 commits into from

Conversation

calvinlu3
Copy link
Contributor

No description provided.

@calvinlu3 calvinlu3 force-pushed the rc branch 2 times, most recently from b9d3a51 to 0bd3862 Compare August 21, 2023 16:05
@calvinlu3
Copy link
Contributor Author

calvinlu3 commented Aug 21, 2023

Issue list:

  • We need to pass in Pageable to getAllGenes endpoint, but oncokb-core does not have spring-data dependency

  • Solution 1: Add spring-boot-starter-data-jpa dependency to the core. A drawback of this approach is that our spring version is very old, so we need to use an older version of spring-data that is compatible. In older version of spring-data, the method Pageable.unpaged() is not available, so we need to use new PageRequest(0, Integer.MAX_VALUE) to get all genes.

  • Solution 2 ✔️ : Use the org.oncokb.oncokb_curation.client.Pageable in the java client and manually set the Page fields.

org.oncokb.oncokb_curation.client.Pageable pageable = new org.oncokb.oncokb_curation.client.Pageable();
pageable.setPage(0);
pageable.setSize(Integer.MAX_VALUE);

  • In Gene model, we are applying @JsonIgnore annotation to the ensemblGenes field. As a result, this field is not included in our java client generated model.

Usages:

  1. In oncokb-core, we are using this field in genomicLocationShouldBeAnnotated(...) method to determine if a GL/HGVSg should be annoated by GenomeNexus.
  2. We are also using this field in PrivateUtilsApi.utilsEnsemblGenesGet(...) to get ensemble genes from entrez gene id. This is used in the AnnotationPage in oncokb-public.
  • Solution 1: Remove @JsonIgnore, so that ensemblGenes can be pulled from the Gene entity.
  • Solution 2 ✔️: Keep annotation, but provide and endpoint in EnsembleGeneResource to fetch ensembl genes by gene id. With this approach, we also need to cache all ensemblGenes in oncokb-core and create a mapping with allTranscriptGenes to quickly fetch the ensembl gene.

  • Missing properties in Gene schema produced by SpringDoc.

  • Adding @JsonIgnoreProperties in EnsemblGene causes the Gene schema to not include "geneAliases", "ensemblGenes", "alterations"

@ManyToOne
@JsonIgnoreProperties(value = { "geneAliases", "ensemblGenes", "alterations" }, allowSetters = true)
private Gene gene;

Related issue from springdoc and it seems like a bug.

  1. Increasing the springdoc version to 1.7.0 did not make a difference
  2. Created a new JHipster project with the same JDL models.
  • Interesting thing is that this new project does not have the same problem. The properties ignored in EnsemblGene does not affect the Gene schema.
  • Replacing all the java models in oncokb-curation with the newly generated models from this test application did not resolve the issue either.

zhx828 and others added 25 commits May 3, 2024 01:48
Add a button in the error page to back to home page
* Uodate keylock YAML file

* Update keylock YAML file
* Updated the README.md

* Addressed PR comments
* add webdriverio
* do not show content for add or promote
We will use user info from the server side to manage.
Remove dependency on firebase User collection
Remove germline prop from firebase Mutation model
Email/First Name/Last Name cannot be null
zhx828 and others added 30 commits November 14, 2024 15:52
Align germline color scheme with public website
* Add readOnly to CurationPageStore

* Add a banner and update RCT

* update of ReadOnlyBanner

* update banner test

* Update according to comments

* use DEFAULT_ICON_SIZE
Webdriver io tests are not running properly due to a Heap issue. Disabling until it is fixed
Fix review when associated variants is undefined and temporarily disable heap
* fix bug where empty treatment caused empty collapsible

* address comments
* Fixed global search

* removed tolower in drug query
* Add custom column filtering for synchronous table

* Add disableHeaderFiltering parameter

* Show real data in filter component on the GeneListPage

* Edit according to comments

* Change react-popper component to DefaultTooltip
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants