jbrowse-plugin-graphgenomeviewer 7.7.0 → 8.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/chunks/{AddTrackWorkflow-NLSZYK56.js → AddTrackWorkflow-KT6Z6PSW.js} +2 -2
- package/dist/chunks/{ChooseSamplesDialog-JRN4YLBY.js → ChooseSamplesDialog-YUH6SVEZ.js} +2 -2
- package/dist/chunks/{ChooseWalksDialog-SM326TOX.js → ChooseWalksDialog-2QJKRASB.js} +2 -2
- package/dist/chunks/{GbzBaseSyntenyAdapter-HT275FAA.js → GbzBaseSyntenyAdapter-NPEXW3Z3.js} +2 -2
- package/dist/chunks/{GbzBaseSyntenyAdapter-HT275FAA.js.map → GbzBaseSyntenyAdapter-NPEXW3Z3.js.map} +1 -1
- package/dist/chunks/GraphGenomeView-5LYF6LMA.js +10 -0
- package/dist/chunks/{GraphGenomeView-NBLEWVY2.js.map → GraphGenomeView-5LYF6LMA.js.map} +1 -1
- package/dist/chunks/{GraphTrackSettingsDialog-63UGAGAC.js → GraphTrackSettingsDialog-T5YKMIPH.js} +2 -2
- package/dist/chunks/{GraphTrackSettingsDialog-63UGAGAC.js.map → GraphTrackSettingsDialog-T5YKMIPH.js.map} +1 -1
- package/dist/chunks/{HighlightColorDialog-MY4MWVCJ.js → HighlightColorDialog-UGAQFACU.js} +2 -2
- package/dist/chunks/LinearGraphDisplay-YTSXFZED.js +2 -0
- package/dist/chunks/{LinearGraphDisplay-3LMAWRNR.js.map → LinearGraphDisplay-YTSXFZED.js.map} +2 -2
- package/dist/chunks/{MinigraphBubbleAdapter-YMI75DAV.js → MinigraphBubbleAdapter-D57ZFMKV.js} +2 -2
- package/dist/chunks/{RgfaTabixAdapter-AFNTSA6Y.js → RgfaTabixAdapter-HN2NLJJW.js} +2 -2
- package/dist/chunks/{TrackWarningsDialog-CPAYIP6K.js → TrackWarningsDialog-4YDIV2FN.js} +2 -2
- package/dist/chunks/{TrackWarningsDialog-CPAYIP6K.js.map → TrackWarningsDialog-4YDIV2FN.js.map} +1 -1
- package/dist/chunks/{WalkFormsAdapter-ZPE2JQJU.js → WalkFormsAdapter-ESCQSNEJ.js} +2 -2
- package/dist/chunks/{WalkTabixSyntenyAdapter-EOD4RQVU.js → WalkTabixSyntenyAdapter-62PJZBRP.js} +2 -2
- package/dist/chunks/chunk-26SCNTI3.js +2 -0
- package/dist/chunks/chunk-26SCNTI3.js.map +7 -0
- package/dist/chunks/{chunk-EV54SYM7.js → chunk-2VKDQF54.js} +2 -2
- package/dist/chunks/{chunk-EV54SYM7.js.map → chunk-2VKDQF54.js.map} +1 -1
- package/dist/chunks/chunk-3VGXCEMQ.js +2 -0
- package/dist/chunks/{chunk-7WIBGKBU.js.map → chunk-3VGXCEMQ.js.map} +3 -3
- package/dist/chunks/chunk-3WG3GF2A.js +2 -0
- package/dist/chunks/{chunk-NDRLCGPC.js.map → chunk-3WG3GF2A.js.map} +3 -3
- package/dist/chunks/{chunk-LIRBZOBX.js → chunk-56YYNIV3.js} +2 -2
- package/dist/chunks/{chunk-LIRBZOBX.js.map → chunk-56YYNIV3.js.map} +1 -1
- package/dist/chunks/{chunk-UGCNPRKC.js → chunk-5Z4VIKXZ.js} +2 -2
- package/dist/chunks/chunk-5Z4VIKXZ.js.map +7 -0
- package/dist/chunks/{chunk-DDAG445J.js → chunk-A4YQH3PN.js} +3 -3
- package/dist/chunks/chunk-A4YQH3PN.js.map +7 -0
- package/dist/chunks/chunk-AH5UWTAV.js +2 -0
- package/dist/chunks/{chunk-TYV6UXJA.js.map → chunk-AH5UWTAV.js.map} +2 -2
- package/dist/chunks/chunk-AZ3YVI3P.js +2 -0
- package/dist/chunks/{chunk-Q5H6ETNZ.js → chunk-DKUKQR3S.js} +3 -3
- package/dist/chunks/chunk-DKUKQR3S.js.map +7 -0
- package/dist/chunks/chunk-H53NTUCD.js +4 -0
- package/dist/chunks/chunk-H53NTUCD.js.map +7 -0
- package/dist/chunks/{chunk-TENPGIPX.js → chunk-J5RMHLFJ.js} +1 -1
- package/dist/chunks/chunk-J5RMHLFJ.js.map +7 -0
- package/dist/chunks/{chunk-22A3MS5J.js → chunk-JSWEU5QG.js} +1 -1
- package/dist/chunks/{chunk-22A3MS5J.js.map → chunk-JSWEU5QG.js.map} +1 -1
- package/dist/chunks/{chunk-2QRCU675.js → chunk-JYTZO52E.js} +2 -2
- package/dist/chunks/{chunk-4AXLBI6M.js → chunk-KQ6JJDJC.js} +2 -2
- package/dist/chunks/{chunk-4AXLBI6M.js.map → chunk-KQ6JJDJC.js.map} +1 -1
- package/dist/chunks/{chunk-DFZ6G452.js → chunk-KUT6FNKO.js} +4 -4
- package/dist/chunks/{chunk-DFZ6G452.js.map → chunk-KUT6FNKO.js.map} +3 -3
- package/dist/chunks/{chunk-IFIZMFS6.js → chunk-LJAPKX5Y.js} +2 -2
- package/dist/chunks/{chunk-IFIZMFS6.js.map → chunk-LJAPKX5Y.js.map} +1 -1
- package/dist/chunks/{chunk-IBWORBGY.js → chunk-LR45N54F.js} +2 -2
- package/dist/chunks/{chunk-SXQ6222I.js → chunk-NE3OW4WX.js} +2 -2
- package/dist/chunks/{chunk-ODQSCM3F.js → chunk-ON465L7Z.js} +1 -1
- package/dist/chunks/{chunk-ODQSCM3F.js.map → chunk-ON465L7Z.js.map} +1 -1
- package/dist/chunks/{chunk-T4R3ZVEM.js → chunk-OTBDKJEA.js} +1 -1
- package/dist/chunks/{chunk-T4R3ZVEM.js.map → chunk-OTBDKJEA.js.map} +1 -1
- package/dist/chunks/{chunk-KY6GXBXU.js → chunk-QGLMVXGX.js} +2 -2
- package/dist/chunks/{chunk-KY6GXBXU.js.map → chunk-QGLMVXGX.js.map} +1 -1
- package/dist/chunks/{chunk-JRJHXLGP.js → chunk-ROZPEXN4.js} +2 -2
- package/dist/chunks/chunk-ROZPEXN4.js.map +7 -0
- package/dist/chunks/{chunk-3Y2G43HK.js → chunk-SD7WGQ6Y.js} +3 -3
- package/dist/chunks/chunk-SD7WGQ6Y.js.map +7 -0
- package/dist/chunks/{chunk-E7S7PGEZ.js → chunk-SVLBMU6I.js} +2 -2
- package/dist/chunks/{chunk-E7S7PGEZ.js.map → chunk-SVLBMU6I.js.map} +1 -1
- package/dist/chunks/{chunk-DSSZIADV.js → chunk-VCYF5E2N.js} +1 -1
- package/dist/chunks/{chunk-DSSZIADV.js.map → chunk-VCYF5E2N.js.map} +1 -1
- package/dist/chunks/{chunk-GK5YETAZ.js → chunk-YXN7J6LG.js} +2 -2
- package/dist/chunks/{chunk-GK5YETAZ.js.map → chunk-YXN7J6LG.js.map} +1 -1
- package/dist/chunks/{chunk-PT3WV5ED.js → chunk-ZKCMVSD4.js} +2 -2
- package/dist/chunks/{chunk-PT3WV5ED.js.map → chunk-ZKCMVSD4.js.map} +1 -1
- package/dist/chunks/executeDiagonalize-MDMQAC5Z.js +2 -0
- package/dist/chunks/executeDiagonalize-MDMQAC5Z.js.map +7 -0
- package/dist/chunks/renderSvg-3KAQCRFY.js +2 -0
- package/dist/chunks/renderSvg-3KAQCRFY.js.map +7 -0
- package/dist/jbrowse-plugin-graphgenomeviewer.esm.js +5 -5
- package/dist/jbrowse-plugin-graphgenomeviewer.esm.js.map +4 -4
- package/package.json +11 -11
- package/src/GraphAddTrackWorkflow/buildTrackConfig.test.ts +3 -1
- package/src/GraphAddTrackWorkflow/buildTrackConfig.ts +5 -1
- package/src/GraphGenomeView/model.test.ts +5 -5
- package/src/GraphGenomeView/pane/fitViews.ts +5 -5
- package/src/GraphGenomeView/pane/graphViews.ts +12 -12
- package/src/GraphGenomeView/pane/launchActions.ts +7 -1
- package/src/GraphGenomeView/pane/loadActions.ts +2 -2
- package/src/GraphGenomeView/pane/settingActions.ts +1 -1
- package/src/GraphGenomeView/tubeMapPanels.test.ts +1 -1
- package/src/GraphGenomeView/tubeMapPanels.ts +6 -6
- package/src/GraphGenomeView/viewModel.ts +2 -2
- package/src/GraphGenomeView/walkRowGroups.test.ts +8 -4
- package/src/GraphGenomeView/walkRowGroups.ts +8 -6
- package/src/LinearGraphDisplay/LinearGraphDisplay.test.ts +1 -1
- package/src/LinearGraphDisplay/components/GraphStatusChrome.tsx +4 -8
- package/src/LinearGraphDisplay/configSchema.ts +1 -1
- package/src/graphTrackConfig.ts +14 -8
- package/src/launchFromGraph/launchFromGraph.ts +11 -11
- package/src/launchFromGraph/syntenyTracks.test.ts +6 -26
- package/src/launchFromGraph/syntenyTracks.ts +20 -17
- package/src/panSNAliases/trackAdapterConfig.ts +4 -7
- package/src/version.ts +1 -1
- package/dist/chunks/GraphGenomeView-NBLEWVY2.js +0 -10
- package/dist/chunks/LinearGraphDisplay-3LMAWRNR.js +0 -2
- package/dist/chunks/chunk-3Y2G43HK.js.map +0 -7
- package/dist/chunks/chunk-7WIBGKBU.js +0 -2
- package/dist/chunks/chunk-AK3UZI6J.js +0 -4
- package/dist/chunks/chunk-AK3UZI6J.js.map +0 -7
- package/dist/chunks/chunk-DDAG445J.js.map +0 -7
- package/dist/chunks/chunk-JRJHXLGP.js.map +0 -7
- package/dist/chunks/chunk-NDRLCGPC.js +0 -2
- package/dist/chunks/chunk-O6HXOTJN.js +0 -2
- package/dist/chunks/chunk-O6HXOTJN.js.map +0 -7
- package/dist/chunks/chunk-Q5H6ETNZ.js.map +0 -7
- package/dist/chunks/chunk-TENPGIPX.js.map +0 -7
- package/dist/chunks/chunk-TUECGSVJ.js +0 -2
- package/dist/chunks/chunk-TYV6UXJA.js +0 -2
- package/dist/chunks/chunk-UGCNPRKC.js.map +0 -7
- package/dist/chunks/executeDiagonalize-SGJDSTYC.js +0 -2
- package/dist/chunks/executeDiagonalize-SGJDSTYC.js.map +0 -7
- package/dist/chunks/renderSvg-WMFKXKFZ.js +0 -2
- package/dist/chunks/renderSvg-WMFKXKFZ.js.map +0 -7
- /package/dist/chunks/{AddTrackWorkflow-NLSZYK56.js.map → AddTrackWorkflow-KT6Z6PSW.js.map} +0 -0
- /package/dist/chunks/{ChooseSamplesDialog-JRN4YLBY.js.map → ChooseSamplesDialog-YUH6SVEZ.js.map} +0 -0
- /package/dist/chunks/{ChooseWalksDialog-SM326TOX.js.map → ChooseWalksDialog-2QJKRASB.js.map} +0 -0
- /package/dist/chunks/{HighlightColorDialog-MY4MWVCJ.js.map → HighlightColorDialog-UGAQFACU.js.map} +0 -0
- /package/dist/chunks/{MinigraphBubbleAdapter-YMI75DAV.js.map → MinigraphBubbleAdapter-D57ZFMKV.js.map} +0 -0
- /package/dist/chunks/{RgfaTabixAdapter-AFNTSA6Y.js.map → RgfaTabixAdapter-HN2NLJJW.js.map} +0 -0
- /package/dist/chunks/{WalkFormsAdapter-ZPE2JQJU.js.map → WalkFormsAdapter-ESCQSNEJ.js.map} +0 -0
- /package/dist/chunks/{WalkTabixSyntenyAdapter-EOD4RQVU.js.map → WalkTabixSyntenyAdapter-62PJZBRP.js.map} +0 -0
- /package/dist/chunks/{chunk-TUECGSVJ.js.map → chunk-AZ3YVI3P.js.map} +0 -0
- /package/dist/chunks/{chunk-2QRCU675.js.map → chunk-JYTZO52E.js.map} +0 -0
- /package/dist/chunks/{chunk-IBWORBGY.js.map → chunk-LR45N54F.js.map} +0 -0
- /package/dist/chunks/{chunk-SXQ6222I.js.map → chunk-NE3OW4WX.js.map} +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jbrowse-plugin-graphgenomeviewer",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0",
|
|
4
4
|
"description": "JBrowse 2 graph genome (pangenome) view: rGFA reference-anchored layouts, the Bandage force-directed engine, and haplotype lanes read from a gbz-base database",
|
|
5
5
|
"license": "GPL-3.0-or-later",
|
|
6
6
|
"repository": {
|
|
@@ -28,22 +28,22 @@
|
|
|
28
28
|
"@gmod/bgzf-filehandle": "^6.8.0",
|
|
29
29
|
"@gmod/gbz-base": "^7.4.1",
|
|
30
30
|
"@gmod/tabix": "^3.11.0",
|
|
31
|
-
"@jbrowse/cigar-utils": "5.0.0-beta.
|
|
32
|
-
"@jbrowse/core": "5.0.0-beta.
|
|
33
|
-
"@jbrowse/display-kit": "5.0.0-beta.
|
|
34
|
-
"@jbrowse/display-ui": "5.0.0-beta.
|
|
31
|
+
"@jbrowse/cigar-utils": "5.0.0-beta.18",
|
|
32
|
+
"@jbrowse/core": "5.0.0-beta.18",
|
|
33
|
+
"@jbrowse/display-kit": "5.0.0-beta.18",
|
|
34
|
+
"@jbrowse/display-ui": "5.0.0-beta.18",
|
|
35
35
|
"@jbrowse/graph-walks": "^4.2.0",
|
|
36
|
-
"@jbrowse/render-core": "5.0.0-beta.
|
|
37
|
-
"@jbrowse/synteny-core": "5.0.0-beta.
|
|
36
|
+
"@jbrowse/render-core": "5.0.0-beta.18",
|
|
37
|
+
"@jbrowse/synteny-core": "5.0.0-beta.18"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@emotion/react": "^11.14.0",
|
|
41
41
|
"@emotion/styled": "^11.14.1",
|
|
42
42
|
"@eslint/js": "^10.0.1",
|
|
43
|
-
"@jbrowse/bandage-core": "^
|
|
43
|
+
"@jbrowse/bandage-core": "^12.0.0",
|
|
44
44
|
"@jbrowse/cli": "^4.3.0",
|
|
45
|
-
"@jbrowse/mobx-state-tree": "^6.
|
|
46
|
-
"@jbrowse/plugin-linear-genome-view": "5.0.0-beta.
|
|
45
|
+
"@jbrowse/mobx-state-tree": "^6.10.0",
|
|
46
|
+
"@jbrowse/plugin-linear-genome-view": "5.0.0-beta.18",
|
|
47
47
|
"@mui/icons-material": "^9.5.0",
|
|
48
48
|
"@mui/material": "^9.5.0",
|
|
49
49
|
"@mui/system": "^9.5.0",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"git-cliff": "^2.14.2",
|
|
61
61
|
"globals": "^17.13.0",
|
|
62
62
|
"jsdom": "^30.1.3",
|
|
63
|
-
"mobx": "^7.
|
|
63
|
+
"mobx": "^7.1.1",
|
|
64
64
|
"mobx-react": "^10.0.2",
|
|
65
65
|
"prettier": "^3.9.10",
|
|
66
66
|
"pretty-bytes": "^7.2.0",
|
|
@@ -219,7 +219,11 @@ export function buildTrackConfig(args: {
|
|
|
219
219
|
assemblyNames: [assembly],
|
|
220
220
|
adapter: buildAdapterConfig(args),
|
|
221
221
|
...(choice === 'RgfaTabixAdapter' || choice === 'RgfaTabixWalks'
|
|
222
|
-
? {
|
|
222
|
+
? {
|
|
223
|
+
displayDefaults: {
|
|
224
|
+
labels: { name: { show: false }, description: { show: false } },
|
|
225
|
+
},
|
|
226
|
+
}
|
|
223
227
|
: {}),
|
|
224
228
|
}
|
|
225
229
|
}
|
|
@@ -3820,23 +3820,23 @@ describe('walk rows', () => {
|
|
|
3820
3820
|
expect(model.facetSpec).toBe('sample')
|
|
3821
3821
|
})
|
|
3822
3822
|
|
|
3823
|
-
test('a facet written as an object orders its panels by
|
|
3823
|
+
test('a facet written as an object orders its panels by sort, and a change of field drops the order', async () => {
|
|
3824
3824
|
rpcRespond()
|
|
3825
3825
|
const model = stateModelFactory().create({
|
|
3826
3826
|
type: 'GraphGenomeView',
|
|
3827
3827
|
layoutMode: 'auto',
|
|
3828
|
-
facet: { field: 'sample',
|
|
3828
|
+
facet: { field: 'sample', sort: ['B'], columns: 3 },
|
|
3829
3829
|
})
|
|
3830
3830
|
await model.loadGFA(WALKS_GFA, 'walks')
|
|
3831
3831
|
model.liftWalks(['GRCh38#0#chr1', 'A#1#ctg', 'A#2#ctg', 'B#1#ctg'])
|
|
3832
3832
|
expect(model.facetPlacement!.cells).toEqual([2, 4, 5, 0])
|
|
3833
3833
|
expect(model.facetSpec).toEqual({
|
|
3834
3834
|
field: 'sample',
|
|
3835
|
-
|
|
3835
|
+
sort: ['B'],
|
|
3836
3836
|
columns: 3,
|
|
3837
3837
|
})
|
|
3838
3838
|
model.setFacet('walk')
|
|
3839
|
-
expect(model.facetSpec).toEqual({ field: 'walk',
|
|
3839
|
+
expect(model.facetSpec).toEqual({ field: 'walk', sort: [], columns: 3 })
|
|
3840
3840
|
model.writeGrammar({ facet: { ...model.facetSetting, columns: undefined } })
|
|
3841
3841
|
expect(model.facetSpec).toBe('walk')
|
|
3842
3842
|
expect(
|
|
@@ -4840,7 +4840,7 @@ describe('walk rows grouped by a sample column', () => {
|
|
|
4840
4840
|
expect(bare.walkRowGroupBy).toEqual({ field: 'superpopulation' })
|
|
4841
4841
|
expect(getSnapshot(bare).facet).toBe('superpopulation')
|
|
4842
4842
|
const ordered = await groupedModel({
|
|
4843
|
-
facet: { field: 'superpopulation',
|
|
4843
|
+
facet: { field: 'superpopulation', sort: ['EUR', 7] },
|
|
4844
4844
|
})
|
|
4845
4845
|
expect(ordered.walkRowGroups!.sections.map(s => s.key)).toEqual([
|
|
4846
4846
|
'EUR',
|
|
@@ -304,26 +304,26 @@ export const withFitViews = withHostViews
|
|
|
304
304
|
// The facet as a spec writes it: the bare field while nothing else is
|
|
305
305
|
// written, the whole setting otherwise, and nothing while off
|
|
306
306
|
get facetSpec(): string | FacetSetting | undefined {
|
|
307
|
-
const { field,
|
|
307
|
+
const { field, sort, columns } = self.facetSetting
|
|
308
308
|
return field === ''
|
|
309
309
|
? undefined
|
|
310
|
-
:
|
|
310
|
+
: sort.length === 0 && columns === undefined
|
|
311
311
|
? field
|
|
312
312
|
: {
|
|
313
313
|
field,
|
|
314
|
-
|
|
314
|
+
sort: [...sort],
|
|
315
315
|
...(columns === undefined ? {} : { columns }),
|
|
316
316
|
}
|
|
317
317
|
},
|
|
318
318
|
// Which grid cell each panel takes; see facetCells
|
|
319
319
|
get facetPlacement() {
|
|
320
320
|
const panels = self.facetPanels
|
|
321
|
-
const { field,
|
|
321
|
+
const { field, sort } = self.facetSetting
|
|
322
322
|
return panels
|
|
323
323
|
? facetCells(
|
|
324
324
|
panels.map(p => p.walks[0]!.name),
|
|
325
325
|
self.hostPlacesX || field === '' ? 'walk' : field,
|
|
326
|
-
|
|
326
|
+
sort,
|
|
327
327
|
)
|
|
328
328
|
: undefined
|
|
329
329
|
},
|
|
@@ -51,7 +51,6 @@ import { tubeMapNodeColors } from '@jbrowse/bandage-core/tubeMap/nodeColors'
|
|
|
51
51
|
import { axisScaleOf } from '@jbrowse/bandage-core/viewport'
|
|
52
52
|
import { NO_VALUE_COLOR } from '@jbrowse/bandage-core/walkEncoding'
|
|
53
53
|
import { facetLifts, walkLift } from '@jbrowse/bandage-core/walkHighlight'
|
|
54
|
-
import { readConfObject } from '@jbrowse/core/configuration'
|
|
55
54
|
import SerializableFilterChain from '@jbrowse/core/pluggableElementTypes/renderers/util/serializableFilterChain'
|
|
56
55
|
import {
|
|
57
56
|
getContainingTrack,
|
|
@@ -59,9 +58,11 @@ import {
|
|
|
59
58
|
getEnv,
|
|
60
59
|
getSession,
|
|
61
60
|
} from '@jbrowse/core/util'
|
|
61
|
+
import { getTrackName } from '@jbrowse/core/util/tracks'
|
|
62
62
|
import { computed } from 'mobx'
|
|
63
63
|
|
|
64
64
|
import { TUBE_MAP_MODES, dependOn, geometryPainted, paneBase } from './paneBase'
|
|
65
|
+
import { trackAdapterSnapshot } from '../../graphTrackConfig'
|
|
65
66
|
import {
|
|
66
67
|
canonicalAssemblyName,
|
|
67
68
|
trackAssemblies,
|
|
@@ -114,7 +115,7 @@ import type { Graph, GraphNode } from '@jbrowse/bandage-core/types'
|
|
|
114
115
|
import type { NodeInk } from '@jbrowse/bandage-core/util/hitDetection'
|
|
115
116
|
import type { WalkLayer } from '@jbrowse/bandage-core/walkEncoding'
|
|
116
117
|
import type { WalkLift } from '@jbrowse/bandage-core/walkHighlight'
|
|
117
|
-
import type {
|
|
118
|
+
import type { AnyTrackConfig } from '@jbrowse/core/configuration'
|
|
118
119
|
import type { FileLocation } from '@jbrowse/core/util/types'
|
|
119
120
|
|
|
120
121
|
// A repeat pick slices the cut's walks again, by the repeat's own array
|
|
@@ -185,7 +186,7 @@ export interface GraphRows {
|
|
|
185
186
|
export const withGraphViews = paneBase
|
|
186
187
|
.views(self => ({
|
|
187
188
|
// the session's config for a track, by id
|
|
188
|
-
sessionTrack(trackId: string):
|
|
189
|
+
sessionTrack(trackId: string): AnyTrackConfig | undefined {
|
|
189
190
|
return getSession(self).tracks.find(t => t.trackId === trackId)
|
|
190
191
|
},
|
|
191
192
|
get grammar(): GraphGrammar {
|
|
@@ -199,7 +200,7 @@ export const withGraphViews = paneBase
|
|
|
199
200
|
return false
|
|
200
201
|
},
|
|
201
202
|
// the track the graph is cut from: the one the pane is a display of
|
|
202
|
-
get sourceTrack():
|
|
203
|
+
get sourceTrack(): AnyTrackConfig | undefined {
|
|
203
204
|
return orUndefined(() => getContainingTrack(self).configuration)
|
|
204
205
|
},
|
|
205
206
|
get containingView(): object | undefined {
|
|
@@ -275,7 +276,7 @@ export const withGraphViews = paneBase
|
|
|
275
276
|
// One section per value of a field, as a grammar of graphics splits a
|
|
276
277
|
// plot. A node layout draws a panel per `walk` (each lifted walk alone,
|
|
277
278
|
// on the same layout) or per `sample` (a sample's haplotypes in a row);
|
|
278
|
-
// `
|
|
279
|
+
// `sort` orders the panels and `columns` fixes how many go across.
|
|
279
280
|
// See facetPanels and facetCells.
|
|
280
281
|
get facetSetting(): FacetSetting {
|
|
281
282
|
return facet.get()
|
|
@@ -698,17 +699,16 @@ export const withGraphViews = paneBase
|
|
|
698
699
|
return track ? trackAdapterConfig(self, track) : undefined
|
|
699
700
|
},
|
|
700
701
|
get sourceTrackId() {
|
|
701
|
-
|
|
702
|
-
return track ? (readConfObject(track, 'trackId') as string) : undefined
|
|
702
|
+
return self.sourceTrack?.trackId as string | undefined
|
|
703
703
|
},
|
|
704
704
|
// The session's tracks, each with the assemblies it covers by canonical
|
|
705
705
|
// name, since a track may name one by an alias
|
|
706
706
|
get sessionTracks() {
|
|
707
707
|
const session = getSession(self)
|
|
708
708
|
return session.tracks.map(t => ({
|
|
709
|
-
trackId: t.trackId
|
|
710
|
-
name:
|
|
711
|
-
adapterType: (
|
|
709
|
+
trackId: t.trackId,
|
|
710
|
+
name: getTrackName(t, session),
|
|
711
|
+
adapterType: trackAdapterSnapshot(t).type as string,
|
|
712
712
|
assemblies: trackAssemblies(session, t),
|
|
713
713
|
}))
|
|
714
714
|
},
|
|
@@ -966,10 +966,10 @@ export const withGraphViews = paneBase
|
|
|
966
966
|
// How a tube map splits into panels: by sample or walk, or by a sample
|
|
967
967
|
// table column
|
|
968
968
|
get tubeMapPanelSplit(): TubeMapPanelSplit | undefined {
|
|
969
|
-
const { field,
|
|
969
|
+
const { field, sort } = self.facetSetting
|
|
970
970
|
const grouped = this.tableGroupBy
|
|
971
971
|
return field !== ''
|
|
972
|
-
? { by: field,
|
|
972
|
+
? { by: field, sort }
|
|
973
973
|
: grouped
|
|
974
974
|
? { by: 'column', ...grouped.groupBy, table: grouped.table }
|
|
975
975
|
: undefined
|
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
layoutModeByValue,
|
|
6
6
|
} from '@jbrowse/bandage-core/layoutModes'
|
|
7
7
|
import { getSession } from '@jbrowse/core/util'
|
|
8
|
+
import { getEnv } from '@jbrowse/mobx-state-tree'
|
|
8
9
|
import HubIcon from '@mui/icons-material/Hub'
|
|
9
10
|
import PaletteIcon from '@mui/icons-material/Palette'
|
|
10
11
|
import PhotoCameraIcon from '@mui/icons-material/PhotoCamera'
|
|
@@ -39,6 +40,7 @@ import type { GraphLayer } from '../graphLayers'
|
|
|
39
40
|
import type { TubeMapPanelSplit } from '../tubeMapPanels'
|
|
40
41
|
import type { ColorScheme } from '@jbrowse/bandage-core/colorSchemes'
|
|
41
42
|
import type { LayoutEngineKind } from '@jbrowse/bandage-core/layoutEngines'
|
|
43
|
+
import type PluginManager from '@jbrowse/core/PluginManager'
|
|
42
44
|
import type { MenuItem } from '@jbrowse/core/ui'
|
|
43
45
|
|
|
44
46
|
const ENGINE_NAMES: readonly (readonly [LayoutEngineKind, string])[] = [
|
|
@@ -140,7 +142,11 @@ export const withLaunchActions = withRenderingActions
|
|
|
140
142
|
get syntenyLaunchTracks() {
|
|
141
143
|
const samples = self.launchableAssemblies.map(c => c.sample)
|
|
142
144
|
return samples.length >= 2
|
|
143
|
-
? launchableSyntenyTracks(
|
|
145
|
+
? launchableSyntenyTracks(
|
|
146
|
+
getSession(self),
|
|
147
|
+
samples,
|
|
148
|
+
getEnv<{ pluginManager: PluginManager }>(self).pluginManager,
|
|
149
|
+
)
|
|
144
150
|
: []
|
|
145
151
|
},
|
|
146
152
|
}))
|
|
@@ -18,7 +18,6 @@ import { engineSettingsOf, loadGraph } from '@jbrowse/bandage-core/pipeline'
|
|
|
18
18
|
import { assemblyWalk } from '@jbrowse/bandage-core/reference'
|
|
19
19
|
import { bundleRoutes } from '@jbrowse/bandage-core/tubeMap/bundle'
|
|
20
20
|
import { coarsenTubeMap } from '@jbrowse/bandage-core/tubeMap/coarsen'
|
|
21
|
-
import { readConfObject } from '@jbrowse/core/configuration'
|
|
22
21
|
import {
|
|
23
22
|
getRpcSessionId,
|
|
24
23
|
getSession,
|
|
@@ -36,6 +35,7 @@ import {
|
|
|
36
35
|
} from './paneBase'
|
|
37
36
|
import { withSettingActions } from './settingActions'
|
|
38
37
|
import { namesReads } from '../../GetGraphReads'
|
|
38
|
+
import { trackAdapterSnapshot } from '../../graphTrackConfig'
|
|
39
39
|
import { geneModelsFrom } from '../genes/geneFeatures'
|
|
40
40
|
import { gfaText } from '../gfaText'
|
|
41
41
|
import { repeatArraysFrom } from '../repeats/repeatFeatures'
|
|
@@ -578,7 +578,7 @@ export const withLoadActions = withEngineSettings.actions(self => {
|
|
|
578
578
|
return undefined
|
|
579
579
|
}
|
|
580
580
|
return yield* readFeatures(
|
|
581
|
-
|
|
581
|
+
trackAdapterSnapshot(config),
|
|
582
582
|
region,
|
|
583
583
|
what,
|
|
584
584
|
signal,
|
|
@@ -49,7 +49,7 @@ test('a panel per sample holds its haplotypes, per walk each walk alone', () =>
|
|
|
49
49
|
'B#1#c',
|
|
50
50
|
])
|
|
51
51
|
expect(
|
|
52
|
-
tubeMapPanelGroups(g, { by: 'sample',
|
|
52
|
+
tubeMapPanelGroups(g, { by: 'sample', sort: ['B'] }).map(p => p.key),
|
|
53
53
|
).toEqual(['B', 'A'])
|
|
54
54
|
})
|
|
55
55
|
|
|
@@ -33,12 +33,12 @@ export const TUBE_MAP_PANELS: { field: '' | FacetBy; label: string }[] = [
|
|
|
33
33
|
{ field: 'walk', label: 'A panel per haplotype' },
|
|
34
34
|
]
|
|
35
35
|
|
|
36
|
-
// How the walks split: by sample or walk, the groups the
|
|
36
|
+
// How the walks split: by sample or walk, the groups the sort names first
|
|
37
37
|
// and the rest in the graph's order, or by a sample table column, its values
|
|
38
38
|
// in the order a JBrowse Group by sorts them
|
|
39
39
|
export type TubeMapPanelSplit =
|
|
40
|
-
| { by: FacetBy;
|
|
41
|
-
| { by: 'column'; field: string; table: SampleRow[];
|
|
40
|
+
| { by: FacetBy; sort?: readonly string[] }
|
|
41
|
+
| { by: 'column'; field: string; table: SampleRow[]; sort?: string[] }
|
|
42
42
|
|
|
43
43
|
export interface TubeMapPanelGroup {
|
|
44
44
|
key: string
|
|
@@ -158,9 +158,9 @@ export function tubeMapPanelGroups(
|
|
|
158
158
|
groups.set(key, [name])
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
|
-
const
|
|
162
|
-
const rank = new Map(
|
|
163
|
-
const listed = (key: string) => rank.get(key) ??
|
|
161
|
+
const sort = split.sort ?? []
|
|
162
|
+
const rank = new Map(sort.map((key, i) => [key, i]))
|
|
163
|
+
const listed = (key: string) => rank.get(key) ?? sort.length
|
|
164
164
|
return [...groups]
|
|
165
165
|
.map(([key, paths], i) => ({ key, paths, i }))
|
|
166
166
|
.sort((a, b) => listed(a.key) - listed(b.key) || a.i - b.i)
|
|
@@ -17,7 +17,7 @@ import type { SubgraphRegion } from '../GetSubgraph'
|
|
|
17
17
|
import type { GraphGrammar, GraphRows } from './pane/graphViews'
|
|
18
18
|
import type { FacetInput } from '@jbrowse/bandage-core/facetGrid'
|
|
19
19
|
import type { LayoutModeValue } from '@jbrowse/bandage-core/layoutModes'
|
|
20
|
-
import type {
|
|
20
|
+
import type { AnyTrackConfig } from '@jbrowse/core/configuration'
|
|
21
21
|
import type { FileLocation } from '@jbrowse/core/util/types'
|
|
22
22
|
import type { Instance } from '@jbrowse/mobx-state-tree'
|
|
23
23
|
|
|
@@ -99,7 +99,7 @@ export default function stateModelFactory() {
|
|
|
99
99
|
get paneMeasured() {
|
|
100
100
|
return self.widthMeasured
|
|
101
101
|
},
|
|
102
|
-
get sourceTrack():
|
|
102
|
+
get sourceTrack(): AnyTrackConfig | undefined {
|
|
103
103
|
return self.loadedTrackId
|
|
104
104
|
? self.sessionTrack(self.loadedTrackId)
|
|
105
105
|
: undefined
|
|
@@ -32,9 +32,13 @@ test('a samples TSV keys rows by its first column, the first of a repeat kept',
|
|
|
32
32
|
|
|
33
33
|
test('the persisted setting reads a bare field or the object, anything else as ungrouped', () => {
|
|
34
34
|
expect(groupByOf('superpopulation')).toEqual({ field: 'superpopulation' })
|
|
35
|
-
expect(groupByOf({ field: 'sex',
|
|
35
|
+
expect(groupByOf({ field: 'sex', sort: ['male', 3] })).toEqual({
|
|
36
36
|
field: 'sex',
|
|
37
|
-
|
|
37
|
+
sort: ['male'],
|
|
38
|
+
})
|
|
39
|
+
expect(groupByOf({ field: 'sex', domain: ['female'] })).toEqual({
|
|
40
|
+
field: 'sex',
|
|
41
|
+
sort: ['female'],
|
|
38
42
|
})
|
|
39
43
|
expect(groupByOf('')).toBeUndefined()
|
|
40
44
|
expect(groupByOf({ field: 3 })).toBeUndefined()
|
|
@@ -75,10 +79,10 @@ describe('grouping', () => {
|
|
|
75
79
|
])
|
|
76
80
|
})
|
|
77
81
|
|
|
78
|
-
test('a haplotype row in the table wins over its sample, and a
|
|
82
|
+
test('a haplotype row in the table wins over its sample, and a sort leads the order', () => {
|
|
79
83
|
const { rows: ordered, sections } = groupWalkRows(rows, table, {
|
|
80
84
|
field: 'population',
|
|
81
|
-
|
|
85
|
+
sort: ['MXL'],
|
|
82
86
|
})
|
|
83
87
|
expect(sections.map(s => s.key)).toEqual(['MXL', 'GBR', 'YRI', ''])
|
|
84
88
|
expect(ordered[0]!.label).toBe('C#1')
|
|
@@ -16,7 +16,7 @@ export type SampleRow = { name: string } & Record<string, string>
|
|
|
16
16
|
|
|
17
17
|
export interface WalkRowGroupBy {
|
|
18
18
|
field: string
|
|
19
|
-
|
|
19
|
+
sort?: string[]
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
export interface WalkRowSection {
|
|
@@ -69,12 +69,14 @@ export function groupByOf(value: unknown): WalkRowGroupBy | undefined {
|
|
|
69
69
|
if (typeof value === 'string') {
|
|
70
70
|
return value ? { field: value } : undefined
|
|
71
71
|
}
|
|
72
|
-
|
|
72
|
+
// `domain` is the facet's order through 7.x
|
|
73
|
+
const { field, sort, domain } = (value ?? {}) as Record<string, unknown>
|
|
73
74
|
if (typeof field !== 'string' || !field) {
|
|
74
75
|
return undefined
|
|
75
76
|
}
|
|
76
|
-
|
|
77
|
-
|
|
77
|
+
const order = sort ?? domain
|
|
78
|
+
return Array.isArray(order)
|
|
79
|
+
? { field, sort: order.filter(d => typeof d === 'string') }
|
|
78
80
|
: { field }
|
|
79
81
|
}
|
|
80
82
|
|
|
@@ -96,7 +98,7 @@ export function columnValueOf(field: string, table: SampleRow[]) {
|
|
|
96
98
|
export function groupsByColumn<T>(
|
|
97
99
|
items: readonly T[],
|
|
98
100
|
valueOf: (item: T) => string,
|
|
99
|
-
{ field,
|
|
101
|
+
{ field, sort }: { field: string; sort?: readonly string[] },
|
|
100
102
|
noun: string,
|
|
101
103
|
nounOf: (item: T) => string,
|
|
102
104
|
) {
|
|
@@ -110,7 +112,7 @@ export function groupsByColumn<T>(
|
|
|
110
112
|
groups.set(key, [item])
|
|
111
113
|
}
|
|
112
114
|
}
|
|
113
|
-
return [...groups.keys()].sort(groupKeyComparator(
|
|
115
|
+
return [...groups.keys()].sort(groupKeyComparator(sort)).map(key => {
|
|
114
116
|
const members = groups.get(key)!
|
|
115
117
|
const n = new Set(members.map(nounOf)).size
|
|
116
118
|
return {
|
|
@@ -1119,7 +1119,7 @@ test('each grammar setter writes the track config, and the pane reads it back',
|
|
|
1119
1119
|
encoding: { color: { field: 'depth' } },
|
|
1120
1120
|
size: { value: 6, links: 'walks' },
|
|
1121
1121
|
layers: { bubbles: true },
|
|
1122
|
-
facet: { field: 'walk',
|
|
1122
|
+
facet: { field: 'walk', sort: [] },
|
|
1123
1123
|
rows: { kept: ['HG1'], order: 'shared' },
|
|
1124
1124
|
hover: 'off',
|
|
1125
1125
|
})
|
|
@@ -27,9 +27,6 @@ const ZOOM_IN_ADVICE =
|
|
|
27
27
|
const FORCE_LOAD_ADVICE =
|
|
28
28
|
'Force load this track for the rest of the session (may be slow)'
|
|
29
29
|
|
|
30
|
-
// Hosts before the plain-props overlay change (jbrowse-components 3a5393f5a6)
|
|
31
|
-
// read `model` and `visible`; later hosts read values and callbacks. Each
|
|
32
|
-
// overlay gets both, so one build runs on either.
|
|
33
30
|
function overlayProps(model: LinearGraphDisplayModel) {
|
|
34
31
|
const { error } = model
|
|
35
32
|
const regionTooLarge =
|
|
@@ -79,7 +76,7 @@ function overlayProps(model: LinearGraphDisplayModel) {
|
|
|
79
76
|
* over it in the track's overlay layer. Core's `DisplayStatusChrome` drew this
|
|
80
77
|
* until jbrowse-web main removed it on 2026-10-08 (d8db736896), and its named
|
|
81
78
|
* import came back undefined there, failing the track with React error #130.
|
|
82
|
-
* Built here from the overlays every host from 5.0.0-beta.
|
|
79
|
+
* Built here from the overlays every host from 5.0.0-beta.18 serves.
|
|
83
80
|
*/
|
|
84
81
|
export default observer(function GraphStatusChrome({
|
|
85
82
|
model,
|
|
@@ -113,7 +110,7 @@ export default observer(function GraphStatusChrome({
|
|
|
113
110
|
<div style={{ display: 'contents' }} {...attributes}>
|
|
114
111
|
<TrackOverlayPortal>
|
|
115
112
|
<div style={{ pointerEvents: 'auto' }}>
|
|
116
|
-
<TooLarge
|
|
113
|
+
<TooLarge {...props.tooLarge} />
|
|
117
114
|
</div>
|
|
118
115
|
</TrackOverlayPortal>
|
|
119
116
|
</div>
|
|
@@ -131,10 +128,9 @@ export default observer(function GraphStatusChrome({
|
|
|
131
128
|
{/* a backend's render error is the canvas's banner, whose retry
|
|
132
129
|
rebuilds the backend */}
|
|
133
130
|
{phase === 'error' && model.error !== undefined ? (
|
|
134
|
-
<ErrorBar
|
|
131
|
+
<ErrorBar {...props.error} />
|
|
135
132
|
) : null}
|
|
136
133
|
<Loading
|
|
137
|
-
model={model}
|
|
138
134
|
{...props.loading}
|
|
139
135
|
visible={phase === 'loading' || phase === 'canceled'}
|
|
140
136
|
immediate={!drawn}
|
|
@@ -153,7 +149,7 @@ export default observer(function GraphStatusChrome({
|
|
|
153
149
|
}}
|
|
154
150
|
>
|
|
155
151
|
{phase === 'ready' && model.statusMessage ? (
|
|
156
|
-
<BackgroundProgress
|
|
152
|
+
<BackgroundProgress {...props.background} />
|
|
157
153
|
) : null}
|
|
158
154
|
</div>
|
|
159
155
|
</TrackOverlayPortal>
|
|
@@ -74,7 +74,7 @@ export function configSchemaFactory() {
|
|
|
74
74
|
* #slot
|
|
75
75
|
* one section per value of a field: a node layout draws a panel per
|
|
76
76
|
* `walk` or `sample`, and walk rows stack into a section per value of
|
|
77
|
-
* a sample table column. A bare field, or `{ field,
|
|
77
|
+
* a sample table column. A bare field, or `{ field, sort, columns }`
|
|
78
78
|
*/
|
|
79
79
|
facet: {
|
|
80
80
|
type: 'frozen',
|
package/src/graphTrackConfig.ts
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
getConfAssemblyNamesOrNone,
|
|
3
|
+
toTrackConfigEntry,
|
|
4
|
+
} from '@jbrowse/core/util/tracks'
|
|
2
5
|
|
|
3
6
|
import { snapshotNamesFile } from './locationName.ts'
|
|
4
7
|
|
|
5
|
-
import type {
|
|
8
|
+
import type { AnyTrackConfig } from '@jbrowse/core/configuration'
|
|
6
9
|
|
|
7
10
|
function isStringArray(value: unknown): value is string[] {
|
|
8
11
|
return Array.isArray(value) && value.every(item => typeof item === 'string')
|
|
@@ -10,9 +13,8 @@ function isStringArray(value: unknown): value is string[] {
|
|
|
10
13
|
|
|
11
14
|
// The assemblies the track names after its reference, which is what core's
|
|
12
15
|
// MultiWaySyntenyDisplay opens a lane-declaring source on.
|
|
13
|
-
export function trackLanes(track:
|
|
14
|
-
const
|
|
15
|
-
const lanes = isStringArray(assemblyNames) ? assemblyNames.slice(1) : []
|
|
16
|
+
export function trackLanes(track: AnyTrackConfig) {
|
|
17
|
+
const lanes = getConfAssemblyNamesOrNone(track).slice(1)
|
|
16
18
|
return lanes.length > 0 ? lanes : undefined
|
|
17
19
|
}
|
|
18
20
|
|
|
@@ -52,9 +54,13 @@ export function configHaplotypes(adapterConfig: Record<string, unknown>) {
|
|
|
52
54
|
// GbzBaseSyntenyAdapter states for its anchor. Every other assembly the track
|
|
53
55
|
// names holds its sequence as rank>0 alleles off that reference's backbone, so
|
|
54
56
|
// a window on one has no reference coordinates to frame the cut by.
|
|
55
|
-
export function graphReferenceAssembly(track:
|
|
56
|
-
|
|
57
|
-
|
|
57
|
+
export function graphReferenceAssembly(track: AnyTrackConfig) {
|
|
58
|
+
return getConfAssemblyNamesOrNone(track)[0]
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// A track's adapter config, from a live node or a session's frozen entry
|
|
62
|
+
export function trackAdapterSnapshot(track: AnyTrackConfig) {
|
|
63
|
+
return toTrackConfigEntry(track).adapter as Record<string, unknown>
|
|
58
64
|
}
|
|
59
65
|
|
|
60
66
|
export function offReferenceProblem(
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { regionLabel } from '@jbrowse/bandage-core/hoverText'
|
|
2
|
-
import {
|
|
2
|
+
import { getConfAssemblyNamesOrNone } from '@jbrowse/core/util/tracks'
|
|
3
3
|
|
|
4
4
|
import { locString } from './contributors'
|
|
5
5
|
import { linearViewTarget } from './linearViewTarget'
|
|
6
6
|
|
|
7
7
|
import type { Contributor, GraphLocation } from './contributors'
|
|
8
8
|
import type { SubgraphRegion } from '../GetSubgraph'
|
|
9
|
-
import type {
|
|
9
|
+
import type {
|
|
10
|
+
AnyConfigurationModel,
|
|
11
|
+
AnyTrackConfig,
|
|
12
|
+
} from '@jbrowse/core/configuration'
|
|
10
13
|
|
|
11
14
|
export interface TrackScanSession {
|
|
12
|
-
tracks:
|
|
15
|
+
tracks: AnyTrackConfig[]
|
|
13
16
|
// core's getTrackName reads these
|
|
14
17
|
assemblies: AnyConfigurationModel[]
|
|
15
18
|
// optional, as a hand-built session in a test has none
|
|
@@ -55,14 +58,11 @@ export function canonicalRegion<
|
|
|
55
58
|
// The assemblies a track config covers, by canonical name
|
|
56
59
|
export function trackAssemblies(
|
|
57
60
|
session: TrackScanSession,
|
|
58
|
-
track:
|
|
61
|
+
track: AnyTrackConfig,
|
|
59
62
|
) {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
.filter(n => typeof n === 'string')
|
|
64
|
-
.map(n => canonicalAssemblyName(session, n))
|
|
65
|
-
: []
|
|
63
|
+
return getConfAssemblyNamesOrNone(track).map(n =>
|
|
64
|
+
canonicalAssemblyName(session, n),
|
|
65
|
+
)
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
export interface GraphLaunchSession extends TrackScanSession {
|
|
@@ -240,7 +240,7 @@ function assemblyNamesOfTrack(
|
|
|
240
240
|
const track =
|
|
241
241
|
trackId === undefined
|
|
242
242
|
? undefined
|
|
243
|
-
: session.tracks.find(t =>
|
|
243
|
+
: session.tracks.find(t => t.trackId === trackId)
|
|
244
244
|
return track ? trackAssemblies(session, track) : []
|
|
245
245
|
}
|
|
246
246
|
|