@jbrowse/plugin-data-management 1.5.0 → 1.5.4

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

@@ -1,9 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
-<div>
+<div
+  class="makeStyles-root"
+>
   <div
-    class="MuiFormControl-root MuiTextField-root makeStyles-searchBox MuiFormControl-fullWidth"
+    class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
   >
     <label
       class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated"
@@ -116,9 +118,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -137,9 +138,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -158,9 +158,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -179,9 +178,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -200,9 +198,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -221,9 +218,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -242,9 +238,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -263,9 +258,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -284,9 +278,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -305,9 +298,28 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
+                    focusable="false"
+                    title="This plugin was installed by an administrator, you cannot remove it."
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"
+                    />
+                  </svg>
+                  <p
+                    class="MuiTypography-root MuiTypography-body1"
+                  >
+                    GTFPlugin
+                  </p>
+                </li>
+                <li
+                  class="MuiListItem-root MuiListItem-gutters"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -326,9 +338,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -347,9 +358,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -368,9 +378,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -389,9 +398,28 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
+                    focusable="false"
+                    title="This plugin was installed by an administrator, you cannot remove it."
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"
+                    />
+                  </svg>
+                  <p
+                    class="MuiTypography-root MuiTypography-body1"
+                  >
+                    ArcRenderer
+                  </p>
+                </li>
+                <li
+                  class="MuiListItem-root MuiListItem-gutters"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -410,9 +438,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -431,9 +458,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -452,9 +478,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -473,9 +498,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -494,9 +518,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -515,9 +538,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -536,9 +558,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -557,9 +578,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -578,9 +598,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -599,9 +618,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >
@@ -620,9 +638,8 @@ exports[`<PluginStoreWidget /> renders with the available plugins 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="MuiSvgIcon-root"
+                    class="MuiSvgIcon-root makeStyles-lockedPluginTooltip"
                     focusable="false"
-                    style="margin-right: 0.5rem;"
                     title="This plugin was installed by an administrator, you cannot remove it."
                     viewBox="0 0 24 24"
                   >

package/src/SetDefaultSession/SetDefaultSession.test.tsx

@@ -23,108 +23,33 @@ const mockRootModel = {
     setDefaultSessionConf: jest.fn(),
   },
   session: {
-    savedSessions: {},
+    savedSessions: [],
+    notify: jest.fn(),
   },
 }
 
 describe('SetDefaultSession GUI', () => {
-  it('renders succesfully', () => {
-    const { getByText } = render(
-      <SetDefaultSession
-        rootModel={mockRootModel}
-        open
-        onClose={() => {}}
-        currentDefault="New session"
-      />,
-    )
-    expect(getByText('Set Default Session')).toBeTruthy()
-  })
-
   it('closes when the return button is clicked', () => {
     const onClose = jest.fn()
     const { getByText } = render(
-      <SetDefaultSession
-        rootModel={mockRootModel}
-        open
-        onClose={onClose}
-        currentDefault="New session"
-      />,
+      <SetDefaultSession rootModel={mockRootModel} onClose={onClose} />,
     )
-    fireEvent.click(getByText('Return'))
+    fireEvent.click(getByText('Cancel'))
     expect(onClose).toHaveBeenCalled()
   })
 
-  it('shows no sessions if none are saved', () => {
-    const { getByText } = render(
-      <SetDefaultSession
-        rootModel={mockRootModel}
-        open
-        onClose={() => {}}
-        currentDefault="New session"
-      />,
-    )
-    expect(getByText('No saved sessions found')).toBeTruthy()
-  })
-
-  it('lists the saved sessions', () => {
-    const MockSavedSessions = {
-      ...mockRootModel,
-      session: {
-        savedSessions: [
-          {
-            name: `New session`,
-          },
-        ],
-      },
-    }
-    const { getByText } = render(
-      <SetDefaultSession
-        rootModel={MockSavedSessions}
-        open
-        onClose={() => {}}
-        currentDefault="New session"
-      />,
-    )
-    expect(getByText('New session')).toBeTruthy()
-  })
-
-  it('sets to the default session when checked', () => {
-    const MockSession = {
-      ...mockRootModel,
-      session: {
-        name: `Moo session`,
-        savedSessions: [],
-        notify: jest.fn(),
-      },
-    }
-    const { getByRole } = render(
-      <SetDefaultSession
-        rootModel={MockSession}
-        open
-        onClose={() => {}}
-        currentDefault="New session"
-      />,
-    )
-    fireEvent.click(getByRole('radio'))
-    expect(MockSession.jbrowse.setDefaultSessionConf).toHaveBeenCalled()
-  })
-
   it('unsets to the default session with reset button', () => {
     const MockSession = {
       ...mockRootModel,
       session: {
+        ...mockRootModel.session,
         name: `Moo session`,
         savedSessions: [],
         notify: jest.fn(),
       },
     }
     const { getByText } = render(
-      <SetDefaultSession
-        rootModel={MockSession}
-        open
-        onClose={() => {}}
-        currentDefault="New session"
-      />,
+      <SetDefaultSession rootModel={MockSession} onClose={() => {}} />,
     )
     fireEvent.click(getByText('Clear default session'))
     expect(MockSession.jbrowse.setDefaultSessionConf).toHaveBeenCalledWith({

package/src/SetDefaultSession/SetDefaultSession.tsx

@@ -1,181 +1,70 @@
-import React, { useState } from 'react'
+import React from 'react'
 import { observer } from 'mobx-react'
-import Dialog from '@material-ui/core/Dialog'
-import { makeStyles } from '@material-ui/core/styles'
-import DialogTitle from '@material-ui/core/DialogTitle'
-import DialogContent from '@material-ui/core/DialogContent'
-import DialogActions from '@material-ui/core/DialogActions'
-import Button from '@material-ui/core/Button'
-import List from '@material-ui/core/List'
-import ListItem from '@material-ui/core/ListItem'
-import ListItemIcon from '@material-ui/core/ListItemIcon'
-import ListItemText from '@material-ui/core/ListItemText'
-import ListSubheader from '@material-ui/core/ListSubheader'
-import Paper from '@material-ui/core/Paper'
-import Typography from '@material-ui/core/Typography'
-import Radio from '@material-ui/core/Radio'
-import pluralize from 'pluralize'
-import { Grid } from '@material-ui/core'
+import {
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogActions,
+  Button,
+  Typography,
+} from '@material-ui/core'
 
-const useStyles = makeStyles(theme => ({
-  root: {
-    margin: theme.spacing(1),
-  },
-  message: {
-    padding: theme.spacing(3),
-  },
-  titleBox: {
-    color: '#fff',
-    backgroundColor: theme.palette.primary.main,
-    textAlign: 'center',
-  },
-  dialogContent: {
-    width: 600,
-  },
-  resetButton: {
-    justifyContent: 'center',
-    marginBottom: '6px',
-  },
-}))
-
-const CurrentSession = observer(
-  ({
-    session,
-    selectedDefault,
-    handleRadio,
-  }: {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    session: any
-    selectedDefault: string
-    handleRadio: Function
-  }) => {
-    const classes = useStyles()
-
-    return (
-      <Paper className={classes.root}>
-        <List subheader={<ListSubheader>Currently open session</ListSubheader>}>
-          <ListItem>
-            <ListItemIcon>
-              <Radio
-                checked={session.name === selectedDefault}
-                onChange={() => handleRadio(session)}
-              />
-            </ListItemIcon>
-            <ListItemText primary={session.name} />
-          </ListItem>
-        </List>
-      </Paper>
-    )
-  },
-)
+function canSetDefaultSession(obj: unknown): obj is {
+  jbrowse: { setDefaultSessionConf: Function }
+  session: unknown
+} {
+  return typeof obj === 'object' && !!obj && 'jbrowse' in obj
+}
 
 const SetDefaultSession = observer(
-  ({
-    rootModel,
-    open,
-    onClose,
-    currentDefault,
-  }: {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    rootModel: any
-    open: boolean
-    onClose: Function
-    currentDefault: string
-  }) => {
-    const classes = useStyles()
-    const { session } = rootModel
-    const [selectedDefault, setSelectedDefault] = useState(currentDefault)
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    function handleRadio(sessionSnapshot: any) {
-      setSelectedDefault(sessionSnapshot.name)
-      rootModel.jbrowse.setDefaultSessionConf(sessionSnapshot)
-      session.notify(
-        `Set default session to ${sessionSnapshot.name}`,
-        'success',
-      )
+  ({ rootModel, onClose }: { rootModel?: unknown; onClose: () => void }) => {
+    if (!rootModel) {
+      return null
     }
+    if (!canSetDefaultSession(rootModel)) {
+      console.error('Incorrect rootmodel')
+      return null
+    }
+    const { jbrowse, session } = rootModel
 
     return (
-      <Dialog open={open}>
-        <DialogTitle className={classes.titleBox}>
-          Set Default Session
-        </DialogTitle>
+      <Dialog open onClose={onClose}>
+        <DialogTitle>Set default session</DialogTitle>
         <DialogContent>
-          <Grid className={classes.resetButton} container>
-            <Grid item>
-              <Button
-                color="secondary"
-                variant="contained"
-                onClick={() => {
-                  setSelectedDefault('New session')
-                  rootModel.jbrowse.setDefaultSessionConf({
-                    name: `New session`,
-                  })
-                  session.notify('Reset default session', 'success')
-                }}
-              >
-                Clear default session
-              </Button>
-            </Grid>
-          </Grid>
-
-          <CurrentSession
-            session={session}
-            selectedDefault={selectedDefault}
-            handleRadio={handleRadio}
-          />
-          <Paper className={classes.root}>
-            <List subheader={<ListSubheader>Saved sessions</ListSubheader>}>
-              {session.savedSessions.length ? (
-                session.savedSessions.map(
-                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                  (sessionSnapshot: any) => {
-                    const { views = [] } = sessionSnapshot
-                    const totalTracks = views
-                      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                      .map((view: any) => view.tracks.length)
-                      .reduce((a: number, b: number) => a + b, 0)
-                    if (sessionSnapshot.name !== session.name) {
-                      return (
-                        <ListItem key={sessionSnapshot.name}>
-                          <ListItemIcon>
-                            <Radio
-                              checked={sessionSnapshot.name === selectedDefault}
-                              onChange={() => handleRadio(sessionSnapshot)}
-                            />
-                          </ListItemIcon>
-                          <ListItemText
-                            primary={sessionSnapshot.name}
-                            secondary={`${views.length} ${pluralize(
-                              'view',
-                              views.length,
-                            )}; ${totalTracks}
-                             open ${pluralize('track', totalTracks)}`}
-                          />
-                        </ListItem>
-                      )
-                    }
-                    return null
-                  },
-                )
-              ) : (
-                <Typography className={classes.message}>
-                  No saved sessions found
-                </Typography>
-              )}
-            </List>
-          </Paper>
+          <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.
+          </Typography>
         </DialogContent>
         <DialogActions>
+          <Button
+            variant="contained"
+            onClick={() => {
+              jbrowse.setDefaultSessionConf({
+                name: `New session`,
+              })
+              onClose()
+            }}
+          >
+            Clear default session
+          </Button>
           <Button
             color="secondary"
             variant="contained"
+            onClick={() => onClose()}
+          >
+            Cancel
+          </Button>
+          <Button
+            color="primary"
+            variant="contained"
             onClick={() => {
-              onClose(false)
+              jbrowse.setDefaultSessionConf(session)
+              onClose()
             }}
           >
-            Return
+            Set current session as default
           </Button>
         </DialogActions>
       </Dialog>