Create autosave files for launcher panel entries

products/jbrowse-desktop/public/electron.ts

@@ -51,11 +51,16 @@ const defaultSessionName = `jbrowse_session.json`
 const userData = app.getPath('userData')
 const recentSessionsPath = path.join(userData, 'recent_sessions.json')
 const quickstartDir = path.join(userData, 'quickstart')
+const autosaveDir = path.join(userData, 'autosaved')
 
 function getQuickstartPath(sessionName: string, ext = 'json') {
   return path.join(quickstartDir, `${encodeURIComponent(sessionName)}.${ext}`)
 }
 
+function getAutosavePath(sessionName: string, ext = 'json') {
+  return path.join(autosaveDir, `${encodeURIComponent(sessionName)}.${ext}`)
+}
+
 if (!fs.existsSync(recentSessionsPath)) {
   fs.writeFileSync(recentSessionsPath, stringify([]), 'utf8')
 }
@@ -64,6 +69,10 @@ if (!fs.existsSync(quickstartDir)) {
   fs.mkdirSync(quickstartDir, { recursive: true })
 }
 
+if (!fs.existsSync(autosaveDir)) {
+  fs.mkdirSync(autosaveDir, { recursive: true })
+}
+
 interface SessionSnap {
   defaultSession: {
     name: string
@@ -268,9 +277,20 @@ ipcMain.handle('quit', () => {
   app.quit()
 })
 
-ipcMain.handle('listSessions', async () => {
-  return JSON.parse(await readFile(recentSessionsPath, 'utf8'))
-})
+ipcMain.handle(
+  'listSessions',
+  async (_event: unknown, showAutosaves: boolean) => {
+    const sessions = JSON.parse(await readFile(recentSessionsPath, 'utf8')) as {
+      path: string
+    }[]
+
+    if (!showAutosaves) {
+      return sessions.filter(f => !f.path.startsWith(autosaveDir))
+    } else {
+      return sessions
+    }
+  },
+)
 
 ipcMain.handle('loadExternalConfig', (_event: unknown, sessionPath) => {
   return readFile(sessionPath, 'utf8')
@@ -341,6 +361,36 @@ ipcMain.handle(
     })
   },
 )
+
+// creates an initial entry in autosave folder
+ipcMain.handle(
+  'createInitialAutosaveFile',
+  async (_event: unknown, snap: SessionSnap) => {
+    const rows = JSON.parse(fs.readFileSync(recentSessionsPath, 'utf8')) as [
+      { path: string; updated: number },
+    ]
+    const idx = rows.findIndex(r => r.path === path)
+    const path = getAutosavePath(`${+Date.now()}`)
+    const entry = {
+      path,
+      updated: +Date.now(),
+      name: snap.defaultSession?.name,
+    }
+    if (idx === -1) {
+      rows.unshift(entry)
+    } else {
+      rows[idx] = entry
+    }
+    await Promise.all([
+      writeFile(recentSessionsPath, stringify(rows)),
+      writeFile(path, stringify(snap)),
+    ])
+
+    return path
+  },
+)
+
+// snapshots page and saves to path
 ipcMain.handle(
   'saveSession',
   async (_event: unknown, path: string, snap: SessionSnap) => {
@@ -368,7 +418,6 @@ ipcMain.handle(
   },
 )
 
-
 ipcMain.handle('promptOpenFile', async (_event: unknown) => {
   const toLocalPath = path.join(app.getPath('desktop'), defaultSessionName)
   const choice = await dialog.showOpenDialog({

products/jbrowse-desktop/src/JBrowse.tsx

@@ -10,7 +10,7 @@ import { AssemblyManager } from '@jbrowse/plugin-data-management'
 import { RootModel } from './rootModel'
 
 const JBrowse = observer(
-  ({ pluginManager }: { pluginManager: PluginManager; }) => {
+  ({ pluginManager }: { pluginManager: PluginManager }) => {
     const { rootModel } = pluginManager
 
     return rootModel ? (

products/jbrowse-desktop/src/Loader.tsx

@@ -5,7 +5,7 @@ import { CssBaseline, ThemeProvider, makeStyles } from '@material-ui/core'
 import { createJBrowseTheme } from '@jbrowse/core/ui'
 import { StringParam, useQueryParam } from 'use-query-params'
 import { ipcRenderer } from 'electron'
-import { createPluginManager } from './StartScreen/util'
+import { loadPluginManager } from './StartScreen/util'
 
 import JBrowse from './JBrowse'
 import StartScreen from './StartScreen'
@@ -77,10 +77,10 @@ const Loader = observer(() => {
       // @ts-ignore
       pm.rootModel?.setOpenNewSessionCallback(async () => {
         const path = await ipcRenderer.invoke('promptOpenFile')
-        const data = await ipcRenderer.invoke('loadSession', path)
-        const pm = await createPluginManager(data)
-        handleSetPluginManager(pm)
+        handleSetPluginManager(await loadPluginManager(path))
       })
+
+      // @ts-ignore
       setPluginManager(pm)
       setError(undefined)
       setSnapshotError('')
@@ -93,9 +93,7 @@ const Loader = observer(() => {
     ;(async () => {
       if (config) {
         try {
-          const data = await ipcRenderer.invoke('loadSession', config)
-          const pm = await createPluginManager(data)
-          handleSetPluginManager(pm)
+          handleSetPluginManager(await loadPluginManager(config))
         } catch (e) {
           handleError(e)
         }

products/jbrowse-desktop/src/StartScreen/LauncherPanel.tsx

@@ -1,9 +1,10 @@
 import React, { useState } from 'react'
 import { Button, Typography, makeStyles } from '@material-ui/core'
 import PluginManager from '@jbrowse/core/PluginManager'
+import { ipcRenderer } from 'electron'
 import QuickstartPanel from './QuickstartPanel'
 import OpenSequenceDialog from '../OpenSequenceDialog'
-import { createPluginManager } from './util'
+import { loadPluginManager } from './util'
 
 const useStyles = makeStyles(theme => ({
   form: {
@@ -50,13 +51,16 @@ export default function StartScreenOptionsPanel({
             if (conf) {
               // note this can throw before dialog closes, but this is handled
               // by the dialog itself
-              const pm = await createPluginManager({
-                assemblies: [conf],
-                defaultSession: {
-                  name: 'New Session ' + new Date().toLocaleString('en-US'),
+              const path = await ipcRenderer.invoke(
+                'createInitialAutosaveFile',
+                {
+                  assemblies: [conf],
+                  defaultSession: {
+                    name: 'New Session ' + new Date().toLocaleString('en-US'),
+                  },
                 },
-              })
-              setPluginManager(pm)
+              )
+              setPluginManager(await loadPluginManager(path))
             }
             setSequenceDialogOpen(false)
           }}

products/jbrowse-desktop/src/StartScreen/QuickstartPanel.tsx

@@ -22,7 +22,7 @@ import { ipcRenderer } from 'electron'
 import deepmerge from 'deepmerge'
 
 // locals
-import { createPluginManager } from './util'
+import { loadPluginManager } from './util'
 
 const useStyles = makeStyles(theme => ({
   button: {
@@ -43,7 +43,7 @@ const useStyles = makeStyles(theme => ({
   },
 }))
 
-function PreloadedDatasetSelector({
+function QuickstartPanel({
   setPluginManager,
 }: {
   setPluginManager: (arg0: PluginManager) => void
@@ -111,8 +111,11 @@ function PreloadedDatasetSelector({
           config.defaultSession.name = `New session ${new Date().toLocaleString(
             'en-US',
           )}`
-          const pm = await createPluginManager(config)
-          setPluginManager(pm)
+          const path = await ipcRenderer.invoke(
+            'createInitialAutosaveFile',
+            config,
+          )
+          setPluginManager(await loadPluginManager(path))
         }}
         variant="contained"
         color="primary"
@@ -211,4 +214,4 @@ function PreloadedDatasetSelector({
   )
 }
 
-export default PreloadedDatasetSelector
+export default QuickstartPanel

products/jbrowse-desktop/src/StartScreen/RecentSessionsPanel.tsx

@@ -1,7 +1,9 @@
 import React, { useState, useEffect, useMemo } from 'react'
 import {
+  Checkbox,
   CircularProgress,
   FormControl,
+  FormControlLabel,
   Grid,
   IconButton,
   Link,
@@ -29,7 +31,7 @@ import PlaylistAddIcon from '@material-ui/icons/PlaylistAdd'
 // locals
 import RenameSessionDialog from './dialogs/RenameSessionDialog'
 import DeleteSessionDialog from './dialogs/DeleteSessionDialog'
-import { useLocalStorage, createPluginManager } from './util'
+import { useLocalStorage, loadPluginManager } from './util'
 import SessionCard from './SessionCard'
 
 const useStyles = makeStyles(theme => ({
@@ -99,12 +101,7 @@ function RecentSessionsList({
             className={classes.pointer}
             onClick={async () => {
               try {
-                const data = await ipcRenderer.invoke(
-                  'loadSession',
-                  params.row.path,
-                )
-                const pm = await createPluginManager(data)
-                setPluginManager(pm)
+                setPluginManager(await loadPluginManager(params.row.path))
               } catch (e) {
                 console.error(e)
                 setError(e)
@@ -197,9 +194,7 @@ function RecentSessionsCards({
             sessionData={session}
             onClick={async () => {
               try {
-                const pm = await createPluginManager(
-                  await ipcRenderer.invoke('loadSession', session.path),
-                )
+                const pm = await loadPluginManager(session.path)
                 setPluginManager(pm)
               } catch (e) {
                 console.error(e)
@@ -242,6 +237,10 @@ export default function RecentSessionPanel({
   const [updateSessionsList, setUpdateSessionsList] = useState(0)
   const [selectedSessions, setSelectedSessions] = useState<RecentSessions>()
   const [sessionsToDelete, setSessionsToDelete] = useState<RecentSessions>()
+  const [showAutosaves, setShowAutosaves] = useLocalStorage(
+    'showAutosaves',
+    'false',
+  )
 
   const sortedSessions = useMemo(
     () => sessions?.sort((a, b) => b.updated - a.updated),
@@ -251,14 +250,17 @@ export default function RecentSessionPanel({
   useEffect(() => {
     ;(async () => {
       try {
-        const sessions = await ipcRenderer.invoke('listSessions')
+        const sessions = await ipcRenderer.invoke(
+          'listSessions',
+          showAutosaves === 'true',
+        )
         setSessions(sessions)
       } catch (e) {
         console.error(e)
         setError(e)
       }
     })()
-  }, [setError, updateSessionsList])
+  }, [setError, updateSessionsList, showAutosaves])
 
   if (!sessions) {
     return (
@@ -338,6 +340,18 @@ export default function RecentSessionPanel({
         </ToggleButtonGroup>
       </FormControl>
 
+      <FormControlLabel
+        control={
+          <Checkbox
+            checked={showAutosaves === 'true'}
+            onChange={() =>
+              setShowAutosaves(showAutosaves === 'true' ? 'false' : 'true')
+            }
+          />
+        }
+        label="Show autosaves"
+      />
+
       {sortedSessions.length ? (
         displayMode === 'grid' ? (
           <RecentSessionsCards

products/jbrowse-desktop/src/StartScreen/util.tsx

@@ -3,6 +3,7 @@ import PluginManager from '@jbrowse/core/PluginManager'
 import PluginLoader from '@jbrowse/core/PluginLoader'
 import { readConfObject } from '@jbrowse/core/configuration'
 import deepmerge from 'deepmerge'
+import { ipcRenderer } from 'electron'
 
 import JBrowseRootModelFactory from '../rootModel'
 import corePlugins from '../corePlugins'
@@ -50,6 +51,14 @@ const defaultInternetAccounts = [
   },
 ]
 
+export async function loadPluginManager(filePath: string) {
+  const snap = await ipcRenderer.invoke('loadSession', filePath)
+  const pm = await createPluginManager(snap)
+  // @ts-ignore
+  pm.rootModel?.setSessionPath(filePath)
+  return pm
+}
+
 export async function createPluginManager(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   configSnapshot: any,
@@ -79,9 +88,9 @@ export async function createPluginManager(
 
   const ids = jbrowse.internetAccounts.map(o => o.internetAccountId)
 
+  // remove duplicates while mixing in default internet accounts
   jbrowse.internetAccounts = jbrowse.internetAccounts.filter(
-    ({ internetAccountId }, index) =>
-      !ids.includes(internetAccountId, index + 1),
+    (arg, index) => !ids.includes(arg.internetAccountId, index + 1),
   )
 
   const rootModel = JBrowseRootModel.create(

products/jbrowse-desktop/src/rootModel.ts

@@ -79,7 +79,9 @@ export default function rootModelFactory(pluginManager: PluginManager) {
     .volatile(() => ({
       error: undefined as unknown,
       textSearchManager: new TextSearchManager(pluginManager),
-      openNewSessionCallback: () => { console.error('openNewSessionCallback unimplemented') }
+      openNewSessionCallback: () => {
+        console.error('openNewSessionCallback unimplemented')
+      },
     }))
     .actions(self => ({
       async saveSession(val: unknown) {
@@ -237,7 +239,7 @@ export default function rootModelFactory(pluginManager: PluginManager) {
               onClick: async () => {
                 try {
                   await self.openNewSessionCallback()
-                } catch(e) {
+                } catch (e) {
                   console.error(e)
                   self.session?.notify(`${e}`, 'error')
                 }
@@ -392,8 +394,13 @@ export default function rootModelFactory(pluginManager: PluginManager) {
         }
 
         const url = window.location.href.split('?')[0]
-        const name = self.session?.name || ''
-        window.location.href = `${url}?config=${encodeURIComponent(name)}`
+        if (!self.sessionPath) {
+          self.session?.notify('You must save your session first')
+        } else {
+          window.location.href = `${url}?config=${encodeURIComponent(
+            self.sessionPath,
+          )}`
+        }
       },
       /**
        * Add a top-level menu