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

Allow opening "synteny tracks" from the default Add track workflow #4786

Merged
merged 7 commits into from
Jan 24, 2025
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
3 changes: 3 additions & 0 deletions packages/core/data_adapters/CytobandAdapter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ export default function CytobandAdapterF(pluginManager: PluginManager) {
new AdapterType({
name: 'CytobandAdapter',
configSchema,
adapterMetadata: {
hiddenFromGUI: true,
},
getAdapterClass: () => import('./CytobandAdapter').then(f => f.default),
}),
)
Expand Down
2 changes: 0 additions & 2 deletions packages/core/pluggableElementTypes/AddTrackWorkflowType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import PluggableElementBase from './PluggableElementBase'
import type { IAnyModelType } from 'mobx-state-tree'

type BasicComponent = React.ComponentType<{
// TODO: can we use AbstractViewModel here?

model: any
}>
type AddTrackWorkflowComponentType =
Expand Down
19 changes: 8 additions & 11 deletions packages/core/ui/AssemblySelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { MenuItem, TextField } from '@mui/material'
import { observer } from 'mobx-react'
import { makeStyles } from 'tss-react/mui'

import { getConf } from '../configuration'
import { useLocalStorage } from '../util'

import type { AbstractSessionModel } from '../util'
Expand All @@ -19,13 +18,15 @@ const useStyles = makeStyles()({
const AssemblySelector = observer(function ({
session,
onChange,
label = 'Assembly',
selected,
InputProps,
TextFieldProps,
localStorageKey,
helperText = 'Select assembly to view',
}: {
session: AbstractSessionModel
label?: string
helperText?: string
onChange: (arg: string) => void
selected?: string
Expand Down Expand Up @@ -66,7 +67,7 @@ const AssemblySelector = observer(function ({
<TextField
select
data-testid="assembly-selector-textfield"
label="Assembly"
label={label}
variant="outlined"
helperText={error || helperText}
value={selection || ''}
Expand All @@ -84,15 +85,11 @@ const AssemblySelector = observer(function ({
},
}}
>
{assemblyNames.map(name => {
const assembly = assemblyManager.get(name)
const displayName = assembly ? getConf(assembly, 'displayName') : ''
return (
<MenuItem key={name} value={name}>
{displayName || name}
</MenuItem>
)
})}
{assemblyNames.map(name => (
<MenuItem key={name} value={name}>
{assemblyManager.get(name)?.displayName || name}
</MenuItem>
))}
</TextField>
)
})
Expand Down
8 changes: 8 additions & 0 deletions packages/core/util/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1424,6 +1424,14 @@ export function localStorageGetBoolean(key: string, defaultVal: boolean) {
)
}

export function testAdapter(
fileName: string,
regex: RegExp,
adapterHint: string | undefined,
expected: string,
) {
return (regex.test(fileName) && !adapterHint) || adapterHint === expected
}
export {
type Feature,
type SimpleFeatureSerialized,
Expand Down
63 changes: 20 additions & 43 deletions plugins/alignments/src/GuessAlignmentsTypes/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { testAdapter } from '@jbrowse/core/util'
import {
getFileName,
makeIndex,
Expand All @@ -20,53 +21,29 @@ export default function GuessAlignmentsTypesF(pluginManager: PluginManager) {
index?: FileLocation,
adapterHint?: string,
) => {
const regexGuess = /\.cram$/i
const adapterName = 'CramAdapter'
const fileName = getFileName(file)
const obj = {
type: adapterName,
cramLocation: file,
craiLocation: index || makeIndex(file, '.crai'),
}
if (regexGuess.test(fileName) && !adapterHint) {
return obj
}
if (adapterHint === adapterName) {
return obj
}
return adapterGuesser(file, index, adapterHint)
}
},
)

pluginManager.addToExtensionPoint(
'Core-guessAdapterForLocation',
(adapterGuesser: AdapterGuesser) => {
return (
file: FileLocation,
index?: FileLocation,
adapterHint?: string,
) => {
const regexGuess = /\.bam$/i
const adapterName = 'BamAdapter'
const fileName = getFileName(file)
const indexName = index && getFileName(index)

const obj = {
type: adapterName,
bamLocation: file,
index: {
location: index || makeIndex(file, '.bai'),
indexType: makeIndexType(indexName, 'CSI', 'BAI'),
},
}
if (regexGuess.test(fileName) && !adapterHint) {
return obj
}
if (adapterHint === adapterName) {
return obj
if (testAdapter(fileName, /\.bam$/i, adapterHint, 'BamAdapter')) {
return {
type: 'BamAdapter',
bamLocation: file,
index: {
location: index || makeIndex(file, '.bai'),
indexType: makeIndexType(indexName, 'CSI', 'BAI'),
},
}
} else if (
testAdapter(fileName, /\.cram$/i, adapterHint, 'CramAdapter')
) {
return {
type: 'CramAdapter',
cramLocation: file,
craiLocation: index || makeIndex(file, '.crai'),
}
} else {
return adapterGuesser(file, index, adapterHint)
}
return adapterGuesser(file, index, adapterHint)
}
},
)
Expand Down
101 changes: 101 additions & 0 deletions plugins/bed/src/GuessAdapter/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import { testAdapter } from '@jbrowse/core/util'
import {
getFileName,
makeIndex,
makeIndexType,
} from '@jbrowse/core/util/tracks'

import type PluginManager from '@jbrowse/core/PluginManager'
import type {
AdapterGuesser,
TrackTypeGuesser,
} from '@jbrowse/core/util/tracks'
import type { FileLocation } from '@jbrowse/core/util/types'

export default function GuessAdapterF(pluginManager: PluginManager) {
pluginManager.addToExtensionPoint(
'Core-guessAdapterForLocation',
(adapterGuesser: AdapterGuesser) => {
return (
file: FileLocation,
index?: FileLocation,
adapterHint?: string,
) => {
const fileName = getFileName(file)
const indexName = index && getFileName(index)
if (
testAdapter(fileName, /\.bedpe(\.gz)?$/i, adapterHint, 'BedpeAdapter')
) {
return {
type: 'BedpeAdapter',
bedpeLocation: file,
}
} else if (
testAdapter(fileName, /\.bb$/i, adapterHint, 'BigBedAdapter') ||
testAdapter(fileName, /\.bigBed?$/i, adapterHint, 'BigBedAdapter')
) {
return {
type: 'BigBedAdapter',
bigBedLocation: file,
}
} else if (
testAdapter(fileName, /\.bed$/i, adapterHint, 'BedAdapter')
) {
return {
type: 'BedAdapter',
bedLocation: file,
}
} else if (
testAdapter(fileName, /\.bg$/i, adapterHint, 'BedGraphAdapter')
) {
return {
type: 'BedGraphAdapter',
bedGraphLocation: file,
}
} else if (
testAdapter(
fileName,
/\.bg(\.gz)?$/i,
adapterHint,
'BedGraphTabixAdapter',
)
) {
return {
type: 'BedGraphTabixAdapter',
bedGraphGzLocation: file,
index: {
location: index || makeIndex(file, '.tbi'),
indexType: makeIndexType(indexName, 'CSI', 'TBI'),
},
}
} else if (
testAdapter(fileName, /\.bed\.gz$/i, adapterHint, 'BedTabixAdapter')
) {
return {
type: 'BedTabixAdapter',
bedGzLocation: file,
index: {
location: index || makeIndex(file, '.tbi'),
indexType: makeIndexType(indexName, 'CSI', 'TBI'),
},
}
} else {
return adapterGuesser(file, index, adapterHint)
}
}
},
)

pluginManager.addToExtensionPoint(
'Core-guessTrackTypeForLocation',
(trackTypeGuesser: TrackTypeGuesser) => (adapterName: string) => {
return (
{
BedpeAdapter: 'VariantTrack',
BedGraphAdapter: 'QuantitativeTrack',
BedGraphTabixAdapter: 'QuantitativeTrack',
}[adapterName] || trackTypeGuesser(adapterName)
)
},
)
}
Loading
Loading