@jbrowse/plugin-data-management 2.4.0 → 2.4.1

package/src/PluginStoreWidget/components/PluginStoreWidget.test.tsx

@@ -34,17 +34,17 @@ beforeEach(() => {
   model = session.addWidget('PluginStoreWidget', 'pluginStoreWidget')
   const { location } = window
 
-  // @ts-ignore
+  // @ts-expect-error
   delete window.location
   window.location = {
     ...location,
     reload: jest.fn(),
   }
 
-  // @ts-ignore
+  // @ts-expect-error
   fetch.resetMocks()
 
-  // @ts-ignore
+  // @ts-expect-error
   fetch.mockResponse(JSON.stringify(plugins))
 })
 

package/src/PluginStoreWidget/components/__snapshots__/PluginStoreWidget.test.tsx.snap

@@ -789,7 +789,7 @@ exports[`renders with the available plugins 1`] = `
                     class="MuiTypography-root MuiTypography-h5 css-1ldbtdh-MuiTypography-root"
                   >
                     <a
-                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-1py4a5k-MuiTypography-root-MuiLink-root"
+                      class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-ygjubp-MuiTypography-root-MuiLink-root"
                       href="https://github.com/GMOD/jbrowse-plugin-msaview#readme"
                       rel="noopener"
                       target="_blank"

package/src/index.ts

@@ -3,12 +3,10 @@ import Plugin from '@jbrowse/core/Plugin'
 import PluginManager from '@jbrowse/core/PluginManager'
 import UCSCTrackHubConnectionF from './ucsc-trackhub'
 import AddTrackWidgetF from './AddTrackWidget'
-import { AddTrackModel } from './AddTrackWidget/model'
+
 import AddConnectionWidgetF from './AddConnectionWidget'
 import PluginStoreWidgetF from './PluginStoreWidget'
-import HierarchicalTrackSelectorWidgetF, {
-  HierarchicalTrackSelectorModel,
-} from './HierarchicalTrackSelectorWidget'
+import HierarchicalTrackSelectorWidgetF from './HierarchicalTrackSelectorWidget'
 
 const SetDefaultSession = lazy(() => import('./SetDefaultSession'))
 
@@ -34,4 +32,6 @@ export default class extends Plugin {
 }
 
 export { AssemblyManager, SetDefaultSession }
-export type { HierarchicalTrackSelectorModel, AddTrackModel }
+
+export { type AddTrackModel } from './AddTrackWidget/model'
+export { type HierarchicalTrackSelectorModel } from './HierarchicalTrackSelectorWidget'

package/src/ucsc-trackhub/ucscTrackHub.ts

@@ -6,9 +6,6 @@ import {
   generateUnsupportedTrackConf,
   generateUnknownTrackConf,
 } from '@jbrowse/core/util/tracks'
-import ucscAssemblies from './ucscAssemblies'
-
-export { ucscAssemblies }
 
 export async function fetchHubFile(hubLocation: FileLocation) {
   try {
@@ -63,16 +60,16 @@ export function generateTracks(
 ) {
   const tracks: any = []
 
-  trackDb.forEach((track, trackName) => {
-    const trackKeys = Array.from(track.keys())
-    const parentTrackKeys = [
+  for (const [trackName, track] of trackDb.entries()) {
+    const trackKeys = [...track.keys()]
+    const parentTrackKeys = new Set([
       'superTrack',
       'compositeTrack',
       'container',
       'view',
-    ]
-    if (trackKeys.some(key => parentTrackKeys.includes(key))) {
-      return
+    ])
+    if (trackKeys.some(key => parentTrackKeys.has(key))) {
+      continue
     }
     const parentTracks = []
     let currentTrackName = trackName
@@ -99,7 +96,7 @@ export function generateTracks(
       trackId: `ucsc-trackhub-${objectHash(res)}`,
       assemblyNames: [assemblyName],
     })
-  })
+  }
 
   return tracks
 }
@@ -324,3 +321,5 @@ function makeTrackConfig(
       return generateUnknownTrackConf(name, baseTrackType, categories)
   }
 }
+
+export { default as ucscAssemblies } from './ucscAssemblies'