Ensure selected track is active for VariantTable

bbimber · bbimber · commit 22dc413a7fb6 · 2022-04-20T12:18:41.000-07:00
diff --git a/jbrowse/src/client/JBrowse/VariantTable/VariantTable.tsx b/jbrowse/src/client/JBrowse/VariantTable/VariantTable.tsx
@@ -68,7 +68,8 @@ function VariantTable() {
             setTheme(createJBrowseTheme(readConfObject(state.config.configuration, 'theme')))
         }
 
-        fetchSession(queryParam, sessionId, nativePlugins, refTheme, setState, true, undefined, undefined, successCallback, trackId)
+        // NOTE: pass trackId for activeTracks, to ensure view.tracks contains it
+        fetchSession(queryParam, sessionId, nativePlugins, refTheme, setState, true, [trackId], undefined, successCallback, trackId)
     }, []);
 
     // Error handle and then render the component
diff --git a/jbrowse/src/client/JBrowse/utils.ts b/jbrowse/src/client/JBrowse/utils.ts
@@ -204,7 +204,7 @@ function generateViewState(genome, plugins, nativePlugins){
 export function navigateToTable(sessionId, locString, trackId, track?: any) {
     const sampleFilterURL = serializeSampleFilters(track)
     const infoFilterURL = serializeInfoFilters(track)
-    window.location.href = ActionURL.buildURL("jbrowse", "variantTable.view", null, {session: sessionId, location: locString, trackId: trackId, sampleFilters: sampleFilterURL, infoFilters: infoFilterURL})
+    window.location.href = ActionURL.buildURL("jbrowse", "variantTable.view", null, {session: sessionId, location: locString, trackId: trackId, activeTracks: trackId, sampleFilters: sampleFilterURL, infoFilters: infoFilterURL})
 }
 
 export function navigateToBrowser(sessionId, locString, trackId?: string, track?: any) {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ function VariantTable() {`
`68`	`68`	`setTheme(createJBrowseTheme(readConfObject(state.config.configuration, 'theme')))`
`69`	`69`	`}`
`70`	`70`
`71`		`- fetchSession(queryParam, sessionId, nativePlugins, refTheme, setState, true, undefined, undefined, successCallback, trackId)`
	`71`	`+ // NOTE: pass trackId for activeTracks, to ensure view.tracks contains it`
	`72`	`+ fetchSession(queryParam, sessionId, nativePlugins, refTheme, setState, true, [trackId], undefined, successCallback, trackId)`
`72`	`73`	`}, []);`
`73`	`74`
`74`	`75`	`// Error handle and then render the component`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ function generateViewState(genome, plugins, nativePlugins){`
`204`	`204`	`export function navigateToTable(sessionId, locString, trackId, track?: any) {`
`205`	`205`	`const sampleFilterURL = serializeSampleFilters(track)`
`206`	`206`	`const infoFilterURL = serializeInfoFilters(track)`
`207`		`- window.location.href = ActionURL.buildURL("jbrowse", "variantTable.view", null, {session: sessionId, location: locString, trackId: trackId, sampleFilters: sampleFilterURL, infoFilters: infoFilterURL})`
	`207`	`+ window.location.href = ActionURL.buildURL("jbrowse", "variantTable.view", null, {session: sessionId, location: locString, trackId: trackId, activeTracks: trackId, sampleFilters: sampleFilterURL, infoFilters: infoFilterURL})`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`export function navigateToBrowser(sessionId, locString, trackId?: string, track?: any) {`