@jbrowse/plugin-data-management 1.6.7 → 1.7.0

package/src/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.js

@@ -29,7 +29,7 @@ import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown'
 import ArrowRightIcon from '@material-ui/icons/ArrowRight'
 import MenuIcon from '@material-ui/icons/Menu'
 import MoreIcon from '@material-ui/icons/MoreHoriz'
-import PowerOutlinedIcon from '@material-ui/icons/PowerOutlined'
+import { Cable } from '@jbrowse/core/ui/Icons'
 
 // other
 import AutoSizer from 'react-virtualized-auto-sizer'
@@ -46,7 +46,7 @@ const ToggleConnectionsDialog = lazy(() => import('./ToggleConnectionsDialog'))
 
 const useStyles = makeStyles(theme => ({
   searchBox: {
-    marginBottom: theme.spacing(2),
+    margin: theme.spacing(2),
   },
   menuIcon: {
     marginRight: theme.spacing(1),
@@ -316,48 +316,56 @@ const HierarchicalTrackSelectorContainer = observer(
           toolbarHeight={toolbarHeight}
           overrideDimensions={overrideDimensions}
         />
-        <Fab
-          color="secondary"
-          className={classes.fab}
-          onClick={event => {
-            setAnchorEl(event.currentTarget)
-          }}
-        >
-          <AddIcon />
-        </Fab>
-        <Menu
-          anchorEl={anchorEl}
-          open={Boolean(anchorEl)}
-          onClose={() => setAnchorEl(null)}
-        >
-          <MenuItem
-            onClick={() => {
-              handleFabClose()
-              const widget = session.addWidget(
-                'AddConnectionWidget',
-                'addConnectionWidget',
-              )
-              session.showWidget(widget)
-            }}
-          >
-            Add connection
-          </MenuItem>
-          <MenuItem
-            onClick={() => {
-              handleFabClose()
-              const widget = session.addWidget(
-                'AddTrackWidget',
-                'addTrackWidget',
-                {
-                  view: model.view.id,
-                },
-              )
-              session.showWidget(widget)
-            }}
-          >
-            Add track
-          </MenuItem>
-        </Menu>
+        {session.addConnectionConf || session.addTrackConf ? (
+          <>
+            <Fab
+              color="secondary"
+              className={classes.fab}
+              onClick={event => {
+                setAnchorEl(event.currentTarget)
+              }}
+            >
+              <AddIcon />
+            </Fab>
+            <Menu
+              anchorEl={anchorEl}
+              open={Boolean(anchorEl)}
+              onClose={() => setAnchorEl(null)}
+            >
+              {session.addConnectionConf ? (
+                <MenuItem
+                  onClick={() => {
+                    handleFabClose()
+                    const widget = session.addWidget(
+                      'AddConnectionWidget',
+                      'addConnectionWidget',
+                    )
+                    session.showWidget(widget)
+                  }}
+                >
+                  Add connection
+                </MenuItem>
+              ) : null}
+              {session.addTrackConf ? (
+                <MenuItem
+                  onClick={() => {
+                    handleFabClose()
+                    const widget = session.addWidget(
+                      'AddTrackWidget',
+                      'addTrackWidget',
+                      {
+                        view: model.view.id,
+                      },
+                    )
+                    session.showWidget(widget)
+                  }}
+                >
+                  Add track
+                </MenuItem>
+              ) : null}
+            </Menu>
+          </>
+        ) : null}
       </Wrapper>
     )
   },
@@ -402,11 +410,24 @@ const HierarchicalTrackSelectorHeader = observer(
         label: 'Turn on/off connections...',
         onClick: () => setConnectionToggleOpen(true),
       },
-      {
+    ]
+
+    if (session.addConnectionConf) {
+      connectionMenuItems.unshift({
+        label: 'Add connection',
+        onClick: () => {
+          session.showWidget(
+            session.addWidget('AddConnectionWidget', 'addConnectionWidget'),
+          )
+        },
+      })
+
+      connectionMenuItems.push({
         label: 'Delete connections...',
         onClick: () => setConnectionManagerOpen(true),
-      },
-    ]
+      })
+    }
+
     const assemblyMenuItems =
       assemblyNames.length > 1
         ? [
@@ -443,22 +464,28 @@ const HierarchicalTrackSelectorHeader = observer(
         data-testid="hierarchical_track_selector"
       >
         <div style={{ display: 'flex' }}>
-          <IconButton
-            className={classes.menuIcon}
-            onClick={event => {
-              setMenuAnchorEl(event.currentTarget)
-            }}
-          >
-            <MenuIcon />
-          </IconButton>
-          <IconButton
-            className={classes.menuIcon}
-            onClick={event => {
-              setConnectionAnchorEl(event.currentTarget)
-            }}
-          >
-            <PowerOutlinedIcon />
-          </IconButton>
+          {session.addTrackConf && (
+            <IconButton
+              className={classes.menuIcon}
+              onClick={event => {
+                setMenuAnchorEl(event.currentTarget)
+              }}
+            >
+              <MenuIcon />
+            </IconButton>
+          )}
+
+          {session.makeConnection && (
+            <IconButton
+              className={classes.menuIcon}
+              onClick={event => {
+                setConnectionAnchorEl(event.currentTarget)
+              }}
+            >
+              <Cable />
+            </IconButton>
+          )}
+
           <TextField
             className={classes.searchBox}
             label="Filter tracks"
@@ -476,7 +503,6 @@ const HierarchicalTrackSelectorHeader = observer(
             }}
           />
         </div>
-
         <JBrowseMenu
           anchorEl={connectionAnchorEl}
           open={Boolean(connectionAnchorEl)}
@@ -484,25 +510,9 @@ const HierarchicalTrackSelectorHeader = observer(
             callback()
             setConnectionAnchorEl(undefined)
           }}
-          onClose={() => {
-            setConnectionAnchorEl(undefined)
-          }}
-          menuItems={[
-            {
-              label: 'Add connection',
-              onClick: () => {
-                session.showWidget(
-                  session.addWidget(
-                    'AddConnectionWidget',
-                    'addConnectionWidget',
-                  ),
-                )
-              },
-            },
-            ...connectionMenuItems,
-          ]}
+          onClose={() => setConnectionAnchorEl(undefined)}
+          menuItems={connectionMenuItems}
         />
-
         <JBrowseMenu
           anchorEl={menuAnchorEl}
           open={Boolean(menuAnchorEl)}
@@ -510,12 +520,9 @@ const HierarchicalTrackSelectorHeader = observer(
             callback()
             setMenuAnchorEl(undefined)
           }}
-          onClose={() => {
-            setMenuAnchorEl(undefined)
-          }}
+          onClose={() => setMenuAnchorEl(undefined)}
           menuItems={menuItems}
         />
-
         <Suspense fallback={<div />}>
           {modalInfo ? (
             <CloseConnectionDialog
@@ -525,9 +532,7 @@ const HierarchicalTrackSelectorHeader = observer(
             />
           ) : deleteDialogDetails ? (
             <DeleteConnectionDialog
-              handleClose={() => {
-                setDeleteDialogDetails(undefined)
-              }}
+              handleClose={() => setDeleteDialogDetails(undefined)}
               deleteDialogDetails={deleteDialogDetails}
               session={session}
             />

package/src/HierarchicalTrackSelectorWidget/components/HierarchicalTrackSelector.test.js

@@ -3,6 +3,7 @@ import { createTheme, ThemeProvider } from '@material-ui/core/styles'
 import { cleanup, render } from '@testing-library/react'
 import React from 'react'
 import HierarchicalTrackSelector from './HierarchicalTrackSelector'
+jest.mock('@jbrowse/web/src/makeWorkerInstance', () => () => {})
 
 window.requestIdleCallback = cb => cb()
 window.cancelIdleCallback = () => {}

package/src/HierarchicalTrackSelectorWidget/components/__snapshots__/HierarchicalTrackSelector.test.js.snap

@@ -71,7 +71,7 @@ exports[`HierarchicalTrackSelector widget renders with a couple of categorized t
           viewBox="0 0 24 24"
         >
           <path
-            d="M16 9v4.66l-3.5 3.51V19h-1v-1.83L8 13.65V9h8m0-6h-2v4h-4V3H8v4h-.01C6.9 6.99 6 7.89 6 8.98v5.52L9.5 18v3h5v-3l3.5-3.51V9c0-1.1-.9-2-2-2V3z"
+            d="M20 5V4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1v1h-1v4c0 .55.45 1 1 1h1v7c0 1.1-.9 2-2 2s-2-.9-2-2V7c0-2.21-1.79-4-4-4S5 4.79 5 7v7H4c-.55 0-1 .45-1 1v4h1v1c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-1h1v-4c0-.55-.45-1-1-1H7V7c0-1.1.9-2 2-2s2 .9 2 2v10c0 2.21 1.79 4 4 4s4-1.79 4-4v-7h1c.55 0 1-.45 1-1V5h-1z"
           />
         </svg>
       </span>
@@ -175,7 +175,7 @@ exports[`HierarchicalTrackSelector widget renders with a couple of uncategorized
           viewBox="0 0 24 24"
         >
           <path
-            d="M16 9v4.66l-3.5 3.51V19h-1v-1.83L8 13.65V9h8m0-6h-2v4h-4V3H8v4h-.01C6.9 6.99 6 7.89 6 8.98v5.52L9.5 18v3h5v-3l3.5-3.51V9c0-1.1-.9-2-2-2V3z"
+            d="M20 5V4c0-.55-.45-1-1-1h-2c-.55 0-1 .45-1 1v1h-1v4c0 .55.45 1 1 1h1v7c0 1.1-.9 2-2 2s-2-.9-2-2V7c0-2.21-1.79-4-4-4S5 4.79 5 7v7H4c-.55 0-1 .45-1 1v4h1v1c0 .55.45 1 1 1h2c.55 0 1-.45 1-1v-1h1v-4c0-.55-.45-1-1-1H7V7c0-1.1.9-2 2-2s2 .9 2 2v10c0 2.21 1.79 4 4 4s4-1.79 4-4v-7h1c.55 0 1-.45 1-1V5h-1z"
           />
         </svg>
       </span>

package/src/PluginStoreWidget/components/CustomPluginForm.tsx

@@ -132,7 +132,7 @@ function CustomPluginForm({
         <DialogContent className={classes.dialogContent}>
           <DialogContentText>
             Enter the name of the plugin and its URL. The name should match what
-            is defined in the plugin's build.
+            is defined in the plugin&apos;s build.
           </DialogContentText>
           <TextField
             id="umd-name-input"

package/src/PluginStoreWidget/components/InstalledPlugin.tsx

@@ -19,8 +19,10 @@ import LockIcon from '@material-ui/icons/Lock'
 
 import PluginManager from '@jbrowse/core/PluginManager'
 import { getSession } from '@jbrowse/core/util'
-import { BasePlugin } from '@jbrowse/core/util/types'
-import { isSessionWithSessionPlugins } from '@jbrowse/core/util/types'
+import {
+  BasePlugin,
+  isSessionWithSessionPlugins,
+} from '@jbrowse/core/util/types'
 import { PluginStoreModel } from '../model'
 
 const useStyles = makeStyles(() => ({

package/src/PluginStoreWidget/components/PluginCard.tsx

@@ -3,8 +3,10 @@ import PluginManager from '@jbrowse/core/PluginManager'
 import { observer } from 'mobx-react'
 import { getEnv, getParent } from 'mobx-state-tree'
 import { getSession } from '@jbrowse/core/util'
-import { JBrowsePlugin } from '@jbrowse/core/util/types'
-import { isSessionWithSessionPlugins } from '@jbrowse/core/util/types'
+import {
+  JBrowsePlugin,
+  isSessionWithSessionPlugins,
+} from '@jbrowse/core/util/types'
 import {
   Card,
   CardActions,

package/src/PluginStoreWidget/components/PluginStoreWidget.test.js

@@ -4,6 +4,7 @@ import { render, cleanup, fireEvent, waitFor } from '@testing-library/react'
 import { createTestSession } from '@jbrowse/web/src/rootModel'
 
 import PluginStoreWidget from './PluginStoreWidget'
+jest.mock('@jbrowse/web/src/makeWorkerInstance', () => () => {})
 
 const plugins = {
   plugins: [

package/src/PluginStoreWidget/model.test.js

@@ -1,4 +1,5 @@
 import { createTestSession } from '@jbrowse/web/src/rootModel'
+jest.mock('@jbrowse/web/src/makeWorkerInstance', () => () => {})
 
 describe('PluginStoreModel', () => {
   it('filters plugins correctly', () => {

package/src/SetDefaultSession/SetDefaultSession.tsx

@@ -32,9 +32,10 @@ const SetDefaultSession = observer(
         <DialogTitle>Set default session</DialogTitle>
         <DialogContent>
           <Typography>
-            Select "Set current session as default" to make your current session
-            saved to the config file. You can also hit "Clear default session",
-            which would remove the default session from the config.
+            Select &quot;Set current session as default&quot; to make your
+            current session saved to the config file. You can also hit
+            &quot;Clear default session&quot;, which would remove the default
+            session from the config.
           </Typography>
         </DialogContent>
         <DialogActions>