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

fix: Nginx response 500 fro tracks reqeusts #180

Merged
merged 2 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/api/annonars/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * from './types'
export * from './client'
export * from './types'
4 changes: 3 additions & 1 deletion src/components/GeneConditionsCard/GeneConditionsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,9 @@ const conditionsCols = computed<number>(() => {
{{ item.raw.panel!.name }}
<small> (v{{ item.raw.panel!.version }}) </small>
<a
:href="`https://panelapp.genomicsengland.co.uk/panels/${item.raw.panel!.id}`"
:href="`https://panelapp.genomicsengland.co.uk/panels/${
item.raw.panel!.id
}`"
target="_blank"
class="ml-2"
>
Expand Down
24 changes: 12 additions & 12 deletions src/components/GenomeBrowserCard/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const hescTadTrack = (apiBaseUrl: string): Track => ({
sourceType: 'annotation',
format: 'bed',
visibilityWindow,
url: `${apiBaseUrl}grch37/hesc.bed`,
url: `${apiBaseUrl}/grch37/hesc.bed`,
color: 'gray'
})

Expand All @@ -18,7 +18,7 @@ const curatedMmsTrack = (apiBaseUrl: string): Track => ({
sourceType: 'annotation',
format: 'bed',
visibilityWindow,
url: `${apiBaseUrl}grch37/patho-mms.bed`,
url: `${apiBaseUrl}/grch37/patho-mms.bed`,
color: 'red'
})

Expand All @@ -27,8 +27,8 @@ const duplicationTrack = (apiBaseUrl: string): Track => ({
sourceType: 'annotation',
format: 'bed',
visibilityWindow,
url: `${apiBaseUrl}grch37/genomicSuperDups.bed.gz`,
indexURL: `${apiBaseUrl}grch37/genomicSuperDups.bed.gz.tbi`,
url: `${apiBaseUrl}/grch37/genomicSuperDups.bed.gz`,
indexURL: `${apiBaseUrl}/grch37/genomicSuperDups.bed.gz.tbi`,
color: 'black'
})

Expand All @@ -37,8 +37,8 @@ const repeatsTrack = (apiBaseUrl: string): Track => ({
sourceType: 'annotation',
format: 'bed',
visibilityWindow,
url: `${apiBaseUrl}grch37/rmsk.bed.gz`,
indexURL: `${apiBaseUrl}grch37/rmsk.bed.gz.tbi`,
url: `${apiBaseUrl}/grch37/rmsk.bed.gz`,
indexURL: `${apiBaseUrl}/grch37/rmsk.bed.gz.tbi`,
color: 'black'
})

Expand All @@ -47,8 +47,8 @@ const altTrack = (apiBaseUrl: string): Track => ({
sourceType: 'annotation',
format: 'bed',
visibilityWindow,
url: `${apiBaseUrl}grch37/altSeqLiftOverPsl.bed.gz`,
indexURL: `${apiBaseUrl}grch37/altSeqLiftOverPsl.bed.gz.tbi`,
url: `${apiBaseUrl}/grch37/altSeqLiftOverPsl.bed.gz`,
indexURL: `${apiBaseUrl}/grch37/altSeqLiftOverPsl.bed.gz.tbi`,
color: 'black'
})

Expand All @@ -57,8 +57,8 @@ const fixTrack = (apiBaseUrl: string): Track => ({
sourceType: 'annotation',
format: 'bed',
visibilityWindow,
url: `${apiBaseUrl}grch37/fixSeqLiftOverPsl.bed.gz`,
indexURL: `${apiBaseUrl}grch37/fixSeqLiftOverPsl.bed.gz.tbi`,
url: `${apiBaseUrl}/grch37/fixSeqLiftOverPsl.bed.gz`,
indexURL: `${apiBaseUrl}/grch37/fixSeqLiftOverPsl.bed.gz.tbi`,
color: 'black'
})

Expand Down Expand Up @@ -87,8 +87,8 @@ const bgDbTracks = (apiBaseUrl: string): Track[] => {
format: 'bed',
visibilityWindow,
displayMode: 'SQUISHED',
url: `${apiBaseUrl}grch37/${token}.bed.gz`,
indexURL: `${apiBaseUrl}grch37/${token}.bed.gz.tbi`,
url: `${apiBaseUrl}/grch37/${token}.bed.gz`,
indexURL: `${apiBaseUrl}/grch37/${token}.bed.gz.tbi`,
color: 'black'
}
})
Expand Down
12 changes: 9 additions & 3 deletions src/components/StrucvarToolsCard/StrucvarToolsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ const varsomeLinkout = computed((): string => {
const chrom = props.strucvar.chrom.startsWith('chr')
? props.strucvar.chrom
: `chr${props.strucvar.chrom}`
return `https://varsome.com/cnv/${urlRelease}/${chrom}:${props.strucvar.start}:${svStop(props.strucvar)}:${props.strucvar.svType}`
return `https://varsome.com/cnv/${urlRelease}/${chrom}:${props.strucvar.start}:${svStop(
props.strucvar
)}:${props.strucvar.svType}`
})

const franklinLinkout = computed((): string => {
Expand All @@ -90,7 +92,9 @@ const franklinLinkout = computed((): string => {
}
const { chrom, start, svType } = props.strucvar
const urlRelease = props.strucvar?.genomeBuild === 'grch37' ? 'hg19' : 'hg38'
return `https://franklin.genoox.com/clinical-db/variant/sv/chr${chrom}-${start}-${svStop(props.strucvar)}-${svType}-${urlRelease}`
return `https://franklin.genoox.com/clinical-db/variant/sv/chr${chrom}-${start}-${svStop(
props.strucvar
)}-${svType}-${urlRelease}`
})

const jumpToLocus = async () => {
Expand All @@ -99,7 +103,9 @@ const jumpToLocus = async () => {
: `chr${props.strucvar?.chrom}`
// NB: we allow the call to fetch here as it goes to local IGV.
await fetch(
`http://127.0.0.1:60151/goto?locus=${chrPrefixed}:${props.strucvar?.start}-${svStop(props.strucvar!)}`
`http://127.0.0.1:60151/goto?locus=${chrPrefixed}:${props.strucvar?.start}-${svStop(
props.strucvar!
)}`
).catch((e) => {
const msg = "Couldn't connect to IGV. Please make sure IGV is running and try again."
emit('error', msg)
Expand Down
2 changes: 1 addition & 1 deletion src/lib/urlConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const setupUrlConfigForTesting = () => {
urlConfig.baseUrlViguno = '/internal/proxy/viguno'
urlConfig.baseUrlCadaPrio = '/internal/proxy/cada-prio'
urlConfig.baseUrlDotty = '/internal/proxy/dotty'
urlConfig.baseUrlNginx = '/remote/variantvalidator'
urlConfig.baseUrlNginx = '/internal/proxy/nginx'
urlConfig.baseUrlVariantValidator = '/remote/variantvalidator'
urlConfig.baseUrlPubtator = '/remote/pubtator3-api'
}
Expand Down
Loading