Add @material-ui/data-grid alias to @mui/x-data-grid

GMOD · Oct 7, 2021 · e3d95f6 · e3d95f6
1 parent 7523941
commit e3d95f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 60 deletions.
diff --git a/packages/core/ReExports/modules.ts b/packages/core/ReExports/modules.ts
@@ -96,6 +96,7 @@ const libs = {
   // end special case
   '@material-ui/lab': MUILab,
   '@mui/x-data-grid': MUIDataGrid,
+  '@material-ui/data-grid': MUIDataGrid,
 
   // material-ui subcomponents, should get rid of these
   '@material-ui/core/colors': MUIColors,

diff --git a/products/jbrowse-desktop/public/electron.ts b/products/jbrowse-desktop/public/electron.ts
@@ -7,7 +7,7 @@ import url from 'url'
 import windowStateKeeper from 'electron-window-state'
 import { autoUpdater } from 'electron-updater'
 
-const { unlink, rename, readdir, readFile, copyFile, writeFile } = fs.promises
+const { unlink, rename, readdir, readFile, writeFile } = fs.promises
 
 const { app, ipcMain, shell, BrowserWindow, Menu } = electron
 
@@ -44,24 +44,15 @@ const devServerUrl = url.parse(
 )
 
 const sessionDir = path.join(app.getPath('userData'), 'sessions')
-const quickstartDir = path.join(app.getPath('userData'), 'quickstart')
 
 function getPath(sessionName: string, ext = 'json') {
   return path.join(sessionDir, `${encodeURIComponent(sessionName)}.${ext}`)
 }
 
-function getQuickstartPath(sessionName: string, ext = 'json') {
-  return path.join(quickstartDir, `${encodeURIComponent(sessionName)}.${ext}`)
-}
-
 if (!fs.lstatSync(sessionDir).isDirectory()) {
   fs.mkdirSync(sessionDir, { recursive: true })
 }
 
-if (!fs.lstatSync(quickstartDir).isDirectory()) {
-  fs.mkdirSync(quickstartDir, { recursive: true })
-}
-
 interface SessionSnap {
   defaultSession: {
     name: string
@@ -267,19 +258,13 @@ ipcMain.handle('listSessions', async () => {
   )
 })
 
-ipcMain.handle(
-  'addToQuickstartList',
-  async (_event: unknown, sessionName: string) => {
-    await copyFile(getPath(sessionName), getQuickstartPath(sessionName))
-  },
-)
-
 ipcMain.handle('loadExternalConfig', (_event: unknown, sessionPath) => {
   return readFile(sessionPath, 'utf8')
 })
 
 ipcMain.handle('loadSession', async (_event: unknown, sessionName: string) => {
-  return JSON.parse(await readFile(getPath(sessionName), 'utf8'))
+  const data = await readFile(getPath(sessionName), 'utf8')
+  return JSON.parse(data)
 })
 
 ipcMain.handle(

diff --git a/products/jbrowse-desktop/src/StartScreen/RecentSessionsPanel.tsx b/products/jbrowse-desktop/src/StartScreen/RecentSessionsPanel.tsx
@@ -59,13 +59,11 @@ function RecentSessionsList({
   setSelectedSessions,
   setSessionToRename,
   setPluginManager,
-  addToQuickstartList,
 }: {
   setError: (e: unknown) => void
   setSessionToRename: (e: string) => void
   setPluginManager: (pm: PluginManager) => void
   setSelectedSessions: (arg: string[]) => void
-  addToQuickstartList: (arg: string) => void
   sortedSessions: Session[]
 }) {
   const classes = useStyles()
@@ -88,24 +86,6 @@ function RecentSessionsList({
         )
       },
     },
-    {
-      field: 'quickstart',
-      minWidth: 40,
-      width: 40,
-      sortable: false,
-      filterable: false,
-      headerName: ' ',
-      renderCell: (params: GridCellParams) => {
-        const { value } = params
-        return (
-          <IconButton onClick={() => addToQuickstartList(value as string)}>
-            <Tooltip title="Add to quickstart list">
-              <StarIcon />
-            </Tooltip>
-          </IconButton>
-        )
-      },
-    },
     {
       field: 'name',
       headerName: 'Session name',
@@ -182,14 +162,12 @@ function RecentSessionsCards({
   setSessionsToDelete,
   setSessionToRename,
   setPluginManager,
-  addToQuickstartList,
 }: {
   setError: (e: unknown) => void
   setSessionsToDelete: (e: string[]) => void
   setSessionToRename: (e: string) => void
   setPluginManager: (pm: PluginManager) => void
   sortedSessions: Session[]
-  addToQuickstartList: (arg: string) => void
 }) {
   return (
     <Grid container spacing={4}>
@@ -211,7 +189,6 @@ function RecentSessionsCards({
             }}
             onDelete={(del: string) => setSessionsToDelete([del])}
             onRename={setSessionToRename}
-            onAddToQuickstartList={addToQuickstartList}
           />
         </Grid>
       ))}
@@ -285,10 +262,6 @@ export default function RecentSessionPanel({
     )
   }
 
-  async function addToQuickstartList(arg: string) {
-    await ipcRenderer.invoke('addToQuickstartList', arg)
-  }
-
   return (
     <div>
       <RenameSessionDialog
@@ -340,7 +313,6 @@ export default function RecentSessionPanel({
       {sortedSessions.length ? (
         displayMode === 'grid' ? (
           <RecentSessionsCards
-            addToQuickstartList={addToQuickstartList}
             setPluginManager={setPluginManager}
             sortedSessions={sortedSessions}
             setError={setError}
@@ -349,7 +321,6 @@ export default function RecentSessionPanel({
           />
         ) : (
           <RecentSessionsList
-            addToQuickstartList={addToQuickstartList}
             setPluginManager={setPluginManager}
             sortedSessions={sortedSessions}
             setError={setError}

diff --git a/products/jbrowse-desktop/src/StartScreen/SessionCard.tsx b/products/jbrowse-desktop/src/StartScreen/SessionCard.tsx
@@ -38,15 +38,13 @@ function RecentSessionCard({
   onClick,
   onDelete,
   onRename,
-  onAddToQuickstartList,
 }: {
   sessionName: string
   sessionStats?: { mtime: Date }
   sessionScreenshot: string
   onClick: Function
   onDelete: Function
   onRename: Function
-  onAddToQuickstartList: Function
 }) {
   const classes = useStyles()
   const [hovered, setHovered] = useState(false)
@@ -125,17 +123,6 @@ function RecentSessionCard({
           </ListItemIcon>
           <Typography variant="inherit">Delete</Typography>
         </MenuItem>
-        <MenuItem
-          onClick={() => {
-            onAddToQuickstartList(sessionName)
-            setMenuAnchorEl(null)
-          }}
-        >
-          <ListItemIcon>
-            <StarIcon color="secondary" />
-          </ListItemIcon>
-          <Typography variant="inherit">Add to quickstart list</Typography>
-        </MenuItem>
       </Menu>
     </>
   )