-
Notifications
You must be signed in to change notification settings - Fork 0
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
JBrowse2 component integration #1263
Draft
bobular
wants to merge
6
commits into
main
Choose a base branch
from
jbrowse2-gene-page-tests
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5b7a65b
found where the iframe is rendered and disabled it for now
bobular b250a05
add jbrowse package
bobular e3c5f8f
add jbrowse2 proxy - see PR description
bobular 08bc54a
WIP - getting strange compilation errors
bobular 78f83fe
moved jbrowse dependency to genomics-site
bobular dacf876
more moving jbrowse deps
bobular File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -94,5 +94,8 @@ | |
}, | ||
"files": [ | ||
"dist" | ||
] | ||
], | ||
"dependencies": { | ||
"@jbrowse/react-linear-genome-view": "^2.16.1" | ||
} | ||
} |
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
73 changes: 73 additions & 0 deletions
73
...ages/sites/genomics-site/webapp/wdkCustomization/js/client/components/common/JBrowse2.tsx
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,73 @@ | ||
import React, { useEffect, useState } from 'react'; | ||
import { Loading } from '@veupathdb/wdk-client/lib/Components'; | ||
import { | ||
createViewState, | ||
JBrowseLinearGenomeView, | ||
} from '@jbrowse/react-linear-genome-view'; | ||
|
||
interface JBrowseConfig { | ||
assemblies: { name: string }[]; | ||
tracks: any[]; | ||
} | ||
|
||
interface Props { | ||
jbrowseUrl: string; | ||
height: number; | ||
} | ||
|
||
export default function JBrowse2LinearView({ | ||
jbrowseUrl, | ||
height = 400, | ||
}: Props) { | ||
// const url = new URL(jbrowseUrl, 'https://example.com'); | ||
// const params = url.searchParams; | ||
const assemblyId = 'agamPEST'; // (params.get('data') ?? '').split('/').pop(); // TO DO: better fallback | ||
const location = 'AgamP4_2L'; // params.get('loc'); | ||
// const tracks = params.get('tracks'); // comma-delimited track ids | ||
|
||
const [config, setConfig] = useState<JBrowseConfig | undefined>(); | ||
const [loading, setLoading] = useState(true); | ||
|
||
// Could use wdk usePromise? or react-query? | ||
useEffect(() => { | ||
// Fetch the config JSON | ||
fetch('/jbrowse2/config.json') | ||
.then((response) => { | ||
if (!response.ok) { | ||
throw new Error(`Error: ${response.status}`); | ||
} | ||
return response.json(); | ||
}) | ||
.then((data) => { | ||
setConfig(data); | ||
setLoading(false); | ||
}) | ||
.catch((error) => { | ||
console.error('Failed to load JSON config:', error); | ||
setLoading(false); // Set to false to avoid infinite loading | ||
}); | ||
}, []); | ||
|
||
if (loading) { | ||
return <Loading />; | ||
} | ||
|
||
if (!config) { | ||
return <div>Error loading configuration</div>; // Error handling fallback - TO DO add contact-us etc | ||
} | ||
|
||
const assembly = config.assemblies.find(({ name }) => name === assemblyId); | ||
|
||
if (!assembly) { | ||
return <div>Error finding assembly '{assemblyId}'</div>; | ||
} | ||
const { tracks } = config; | ||
|
||
const viewState = createViewState({ | ||
assembly, | ||
tracks, | ||
location, | ||
}); | ||
|
||
return <JBrowseLinearGenomeView viewState={viewState} />; | ||
} |
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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally, this would be a configuration value that gets set in configer. Something like
jbrowse2_root_url = /jbrowse2
. Then, you can update__SITE_CONFIG__
inEbrcWebsiteCommon/Model/lib/conifer/roles/conifer/templates/EbrcWebsiteCommon/appBase.html.j2
to include that value. Then, updatepackages/libs/web-common/src/config.ts
to export that value. Finally, you can import that here viaimport { jbrowse2RootUrl } from 'web-common/lib/config';
.