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.

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

Main to stage #1314

Merged
merged 9 commits into from
May 2, 2024
Merged

Main to stage #1314

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
bd09652
Merge pull request #1292 from alliance-genome/test
motenko Apr 1, 2024
ffe8631
Merge pull request #1302 from alliance-genome/test
motenko Apr 18, 2024
b05013c
Merge pull request #1310 from alliance-genome/stage
oblodgett May 1, 2024
8b46914
fixes undefined problem, but not the ui problem (the jbrowse ortholog…
scottcain May 2, 2024
5164a60
removes the jbrowse orthology link panel for sars-cov-2
scottcain May 2, 2024
2373ad2
Merge pull request #1311 from alliance-genome/fix_jbrowse_covid
oblodgett May 2, 2024
9c92040
Added new make file targets for ui deployments
oblodgett May 2, 2024
94f6920
Merge pull request #1312 from alliance-genome/fix_redirects
oblodgett May 2, 2024
df00b0a
Merge pull request #1313 from alliance-genome/test
oblodgett May 2, 2024
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
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ test-alb-deploy:
prod-alb-deploy:
npx aws-cdk deploy prod-alb-stack

stage-ui-deploy:
npx aws-cdk deploy agr-ui-stage

test-ui-deploy:
npx aws-cdk deploy agr-ui-test

prod-ui-deploy:
npx aws-cdk deploy agr-ui-production

uirun:
npm start

Expand Down
2 changes: 1 addition & 1 deletion src/components/orthology/orthologyJBrowseLinkPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const geneLocationIsInvalid = (geneLocation) => {

const OrthologyJBrowseLinkPanel = ({geneLocation, taxonid}) => {
return (
geneLocationIsInvalid(geneLocation) ? null :
(geneLocationIsInvalid(geneLocation) || taxonid === 'NCBITaxon:2697049') ? null :
<div id='orthologyJBrowseLinkPanel'>
<span>Links to orthology data in JBrowse by filter level: </span>
<OrthologyJBrowseLink
Expand Down
1 change: 1 addition & 0 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ export const SPECIES = [
jBrowseurltemplate: 'tracks/All Genes/{refseq}/trackData.jsonz',
jBrowsefastaurl: 'https://s3.amazonaws.com/agrjbrowse/fasta/GCF_000001405.40_GRCh38.p14_genomic.fna.gz',
jBrowsetracks: '_all_genes',
jBrowseOrthologyTracks:'',
suppressFlatten: true,
vertebrate: false,
enableSingleCellExpressionAtlasLink: false,
Expand Down
Loading