Avoid clearing hubURL

GMOD · Jan 22, 2025 · 14c1917 · 14c1917
1 parent bf3ffa0
commit 14c1917
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/products/jbrowse-web/src/SessionLoader.ts b/products/jbrowse-web/src/SessionLoader.ts
@@ -536,13 +536,16 @@ const SessionLoader = types
                   this.decodeJb1StyleSession()
                 } else if (isEncodedSession) {
                   await this.decodeEncodedUrlSession()
-                } else if (isHubSession) {
-                  this.decodeHubSpec()
-                  self.setBlankSession(true)
                 } else if (isJsonSession) {
                   await this.decodeJsonUrlSession()
                 } else if (isLocalSession) {
                   await this.fetchSessionStorageSession()
+                } else if (isHubSession) {
+                  // this is later in the list: prioritiz local session of "hub
+                  // spec" since hub is left in URL even when there may be a
+                  // local session
+                  this.decodeHubSpec()
+                  self.setBlankSession(true)
                 } else if (sessionQuery) {
                   // if there was a sessionQuery and we don't recognize it
                   throw new Error('unrecognized session format')

diff --git a/products/jbrowse-web/src/components/Loader.tsx b/products/jbrowse-web/src/components/Loader.tsx
@@ -45,7 +45,7 @@ export function Loader({
   const [password, setPassword] = useQueryParam('password', Str)
   const [loc, setLoc] = useQueryParam('loc', Str)
   const [sessionTracks, setSessionTracks] = useQueryParam('sessionTracks', Str)
-  const [hubURL, setHubURL] = useQueryParam('hubURL', Str)
+  const [hubURL] = useQueryParam('hubURL', Str)
   const [assembly, setAssembly] = useQueryParam('assembly', Str)
   const [tracks, setTracks] = useQueryParam('tracks', Str)
   const [highlight, setHighlight] = useQueryParam('highlight', Str)
@@ -68,10 +68,12 @@ export function Loader({
     initialTimestamp,
   })
 
+  // hubURL is specifically, for now, not cleared because otherwise it does not
+  // survive a refresh very well since it takes a different path from normal
+  // config loading
   useEffect(() => {
     setLoc(undefined, 'replaceIn')
     setTracks(undefined, 'replaceIn')
-    setHubURL(undefined, 'replaceIn')
     setAssembly(undefined, 'replaceIn')
     setPassword(undefined, 'replaceIn')
     setSessionTracks(undefined, 'replaceIn')
@@ -81,7 +83,6 @@ export function Loader({
   }, [
     setAssembly,
     setHighlight,
-    setHubURL,
     setLoc,
     setNav,
     setPassword,