Adds &tracklist=true and &nav=false to be added to linear genome view

GMOD · Feb 16, 2024 · ba69484 · ba69484
1 parent e50e726
commit ba69484
Show file tree

Hide file tree

Showing 5 changed files with 938 additions and 920 deletions.
diff --git a/plugins/linear-genome-view/src/LaunchLinearGenomeView/index.ts b/plugins/linear-genome-view/src/LaunchLinearGenomeView/index.ts
@@ -1,7 +1,8 @@
 import PluginManager from '@jbrowse/core/PluginManager'
 import { AbstractSessionModel, when } from '@jbrowse/core/util'
+// locals
 import { LinearGenomeViewModel } from '../LinearGenomeView'
-import { handleSelectedRegion } from '..//searchUtils'
+import { handleSelectedRegion } from '../searchUtils'
 
 type LGV = LinearGenomeViewModel
 
@@ -25,7 +26,6 @@ export default (pluginManager: PluginManager) => {
       nav?: boolean
     }) => {
       try {
-        console.log({ nav })
         const { assemblyManager } = session
         const view = session.addView('LinearGenomeView', {}) as LGV
 
@@ -57,7 +57,7 @@ export default (pluginManager: PluginManager) => {
           view.activateTrackSelector()
         }
         if (nav !== undefined) {
-          view.setHideHeader(nav)
+          view.setHideHeader(!nav)
         }
       } catch (e) {
         session.notify(`${e}`, 'error')
@@ -68,7 +68,9 @@ export default (pluginManager: PluginManager) => {
 }
 
 function tryTrack(
-  model: { showTrack: (arg: string) => void },
+  model: {
+    showTrack: (arg: string) => void
+  },
   trackId: string,
   idsNotFound: string[],
 ) {

diff --git a/products/jbrowse-web/src/SessionLoader.ts b/products/jbrowse-web/src/SessionLoader.ts
@@ -279,7 +279,14 @@ const SessionLoader = types
     },
 
     decodeJb1StyleSession() {
-      const { loc, tracks, assembly, sessionTracksParsed: sessionTracks } = self
+      const {
+        loc,
+        tracks,
+        assembly,
+        tracklist,
+        nav,
+        sessionTracksParsed: sessionTracks,
+      } = self
       if (loc) {
         self.sessionSpec = {
           sessionTracks,
@@ -290,6 +297,8 @@ const SessionLoader = types
               sessionTracks,
               loc,
               assembly,
+              tracklist,
+              nav,
             },
           ],
         }

diff --git a/products/jbrowse-web/src/components/Loader.tsx b/products/jbrowse-web/src/components/Loader.tsx
@@ -5,7 +5,6 @@ import {
   StringParam,
   QueryParamProvider,
   useQueryParam,
-  BooleanParam,
 } from 'use-query-params'
 import { WindowHistoryAdapter } from 'use-query-params/adapters/window'
 import { FatalErrorDialog, LoadingEllipses } from '@jbrowse/core/ui'
@@ -40,7 +39,6 @@ export function Loader({
   // types.maybe
 
   const Str = StringParam
-  const Bool = BooleanParam
 
   const [config] = useQueryParam('config', Str)
   const [session] = useQueryParam('session', Str)
@@ -50,8 +48,8 @@ export function Loader({
   const [sessionTracks, setSessionTracks] = useQueryParam('sessionTracks', Str)
   const [assembly, setAssembly] = useQueryParam('assembly', Str)
   const [tracks, setTracks] = useQueryParam('tracks', Str)
-  const [nav, setNav] = useQueryParam('nav', Bool)
-  const [tracklist, setTrackList] = useQueryParam('tracklist', Bool)
+  const [nav, setNav] = useQueryParam('nav', Str)
+  const [tracklist, setTrackList] = useQueryParam('tracklist', Str)
 
   const loader = SessionLoader.create({
     configPath: normalize(config),
@@ -62,8 +60,8 @@ export function Loader({
     assembly: normalize(assembly),
     tracks: normalize(tracks),
     sessionTracks: normalize(sessionTracks),
-    tracklist: normalize(tracklist),
-    nav: normalize(nav),
+    tracklist: JSON.parse(normalize(tracklist) || 'false'),
+    nav: JSON.parse(normalize(nav) || 'true'),
     initialTimestamp,
   })
 

diff --git a/products/jbrowse-web/src/createPluginManager.ts b/products/jbrowse-web/src/createPluginManager.ts
@@ -47,7 +47,7 @@ export function createPluginManager(self: SessionLoaderModel) {
 
   // @ts-expect-error
   if (!self.configSnapshot?.configuration?.rpc?.defaultDriver) {
-    rootModel.jbrowse.configuration.defaultDriver.set('WebWorkerRpcDriver')
+    rootModel.jbrowse.configuration.rpc.defaultDriver.set('WebWorkerRpcDriver')
   }
 
   let afterInitializedCb = () => {}