@jbrowse/plugin-linear-genome-view 1.7.9 → 1.7.10

package/src/LinearGenomeView/index.tsx

@@ -127,6 +127,7 @@ export function stateModelFactory(pluginManager: PluginManager) {
         ),
         hideHeader: false,
         hideHeaderOverview: false,
+        hideNoTracksActive: false,
         trackSelectorType: types.optional(
           types.enumeration(['hierarchical']),
           'hierarchical',
@@ -177,11 +178,18 @@ export function stateModelFactory(pluginManager: PluginManager) {
       get interRegionPaddingWidth() {
         return INTER_REGION_PADDING_WIDTH
       },
+
+      get assemblyNames() {
+        return [
+          ...new Set(self.displayedRegions.map(region => region.assemblyName)),
+        ]
+      },
     }))
     .views(self => ({
       get assemblyErrors() {
         const { assemblyManager } = getSession(self)
-        return this.assemblyNames
+        const { assemblyNames } = self
+        return assemblyNames
           .map(a => assemblyManager.get(a)?.error)
           .filter(f => !!f)
           .join(', ')
@@ -189,9 +197,8 @@ export function stateModelFactory(pluginManager: PluginManager) {
 
       get assembliesInitialized() {
         const { assemblyManager } = getSession(self)
-        return this.assemblyNames.every(
-          a => assemblyManager.get(a)?.initialized,
-        )
+        const { assemblyNames } = self
+        return assemblyNames.every(a => assemblyManager.get(a)?.initialized)
       },
       get initialized() {
         return self.volatileWidth !== undefined && this.assembliesInitialized
@@ -273,11 +280,6 @@ export function stateModelFactory(pluginManager: PluginManager) {
         }
       },
 
-      get assemblyNames() {
-        return [
-          ...new Set(self.displayedRegions.map(region => region.assemblyName)),
-        ]
-      },
       searchScope(assemblyName: string) {
         return {
           assemblyName,
@@ -286,13 +288,6 @@ export function stateModelFactory(pluginManager: PluginManager) {
         }
       },
 
-      /**
-       * @param refName - refName of the displayedRegion
-       * @param coord - coordinate at the displayed Region
-       * @param regionNumber - optional param used as identifier when
-       * there are multiple displayedRegions with the same refName
-       * @returns offsetPx of the displayed region that it lands in
-       */
       bpToPx({
         refName,
         coord,
@@ -396,10 +391,8 @@ export function stateModelFactory(pluginManager: PluginManager) {
           track => track.configuration.trackId,
         )
         results.forEach(result => {
-          if (openTrackIds !== []) {
-            if (openTrackIds.includes(result.trackId)) {
-              result.updateScore(result.getScore() + 1)
-            }
+          if (openTrackIds.includes(result.trackId)) {
+            result.updateScore(result.getScore() + 1)
           }
         })
         return results
@@ -407,7 +400,7 @@ export function stateModelFactory(pluginManager: PluginManager) {
 
       // modifies view menu action onClick to apply to all tracks of same type
       rewriteOnClicks(trackType: string, viewMenuActions: MenuItem[]) {
-        viewMenuActions.forEach((action: MenuItem) => {
+        viewMenuActions.forEach(action => {
           // go to lowest level menu
           if ('subMenu' in action) {
             this.rewriteOnClicks(trackType, action.subMenu)
@@ -464,6 +457,9 @@ export function stateModelFactory(pluginManager: PluginManager) {
       toggleHeaderOverview() {
         self.hideHeaderOverview = !self.hideHeaderOverview
       },
+      toggleNoTracksActive() {
+        self.hideNoTracksActive = !self.hideNoTracksActive
+      },
 
       scrollTo(offsetPx: number) {
         const newOffsetPx = clamp(offsetPx, self.minOffset, self.maxOffset)
@@ -675,13 +671,38 @@ export function stateModelFactory(pluginManager: PluginManager) {
         const { assemblyManager } = getSession(self)
         const { isValidRefName } = assemblyManager
         const assemblyName = optAssemblyName || assemblyNames[0]
+        let parsedLocStrings
+        const inputs = locString
+          .split(/(\s+)/)
+          .map(f => f.trim())
+          .filter(f => !!f)
 
-        const parsedLocStrings = locString
-          .split(' ')
-          .filter(f => !!f.trim())
-          .map(l => parseLocString(l, ref => isValidRefName(ref, assemblyName)))
+        // first try interpreting as a whitespace-separated sequence of
+        // multiple locstrings
+        try {
+          parsedLocStrings = inputs.map(l =>
+            parseLocString(l, ref => isValidRefName(ref, assemblyName)),
+          )
+        } catch (e) {
+          // if this fails, try interpreting as a whitespace-separated refname,
+          // start, end if start and end are integer inputs
+          const [refName, start, end] = inputs
+          if (
+            `${e}`.match(/Unknown reference sequence/) &&
+            Number.isInteger(+start) &&
+            Number.isInteger(+end)
+          ) {
+            parsedLocStrings = [
+              parseLocString(refName + ':' + start + '..' + end, ref =>
+                isValidRefName(ref, assemblyName),
+              ),
+            ]
+          } else {
+            throw e
+          }
+        }
 
-        const locations = parsedLocStrings.map(region => {
+        const locations = parsedLocStrings?.map(region => {
           const asmName = region.assemblyName || assemblyName
           const asm = assemblyManager.get(asmName)
           const { refName } = region
@@ -1207,6 +1228,13 @@ export function stateModelFactory(pluginManager: PluginManager) {
             onClick: self.toggleHeaderOverview,
             disabled: self.hideHeader,
           },
+          {
+            label: 'Show no tracks active button',
+            icon: VisibilityIcon,
+            type: 'checkbox',
+            checked: !self.hideNoTracksActive,
+            onClick: self.toggleNoTracksActive,
+          },
           {
             label: 'Track labels',
             icon: LabelIcon,

package/src/index.ts

@@ -137,42 +137,47 @@ export default class LinearGenomeViewPlugin extends Plugin {
         loc: string
         tracks?: string[]
       }) => {
-        const { assemblyManager } = session
-        const view = session.addView('LinearGenomeView', {}) as LGV
+        try {
+          const { assemblyManager } = session
+          const view = session.addView('LinearGenomeView', {}) as LGV
 
-        await when(() => !!view.volatileWidth)
+          await when(() => !!view.volatileWidth)
 
-        if (!assembly) {
-          throw new Error(
-            'No assembly provided when launching linear genome view',
-          )
-        }
+          if (!assembly) {
+            throw new Error(
+              'No assembly provided when launching linear genome view',
+            )
+          }
 
-        const asm = await assemblyManager.waitForAssembly(assembly)
-        if (!asm) {
-          throw new Error(
-            `Assembly "${assembly}" not found when launching linear genome view`,
-          )
-        }
+          const asm = await assemblyManager.waitForAssembly(assembly)
+          if (!asm) {
+            throw new Error(
+              `Assembly "${assembly}" not found when launching linear genome view`,
+            )
+          }
 
-        view.navToLocString(loc, assembly)
-
-        const idsNotFound = [] as string[]
-        tracks.forEach(track => {
-          try {
-            view.showTrack(track)
-          } catch (e) {
-            if (`${e}`.match('Could not resolve identifier')) {
-              idsNotFound.push(track)
-            } else {
-              throw e
+          view.navToLocString(loc, assembly)
+
+          const idsNotFound = [] as string[]
+          tracks.forEach(track => {
+            try {
+              view.showTrack(track)
+            } catch (e) {
+              if (`${e}`.match('Could not resolve identifier')) {
+                idsNotFound.push(track)
+              } else {
+                throw e
+              }
             }
+          })
+          if (idsNotFound.length) {
+            throw new Error(
+              `Could not resolve identifiers: ${idsNotFound.join(',')}`,
+            )
           }
-        })
-        if (idsNotFound.length) {
-          throw new Error(
-            `Could not resolve identifiers: ${idsNotFound.join(',')}`,
-          )
+        } catch (e) {
+          session.notify(`${e}`, 'error')
+          throw e
         }
       },
     )