@apollo-annotation/jbrowse-plugin-apollo 0.3.6 → 0.3.8

package/src/components/AddFeature.tsx

@@ -1,12 +1,9 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
-/* eslint-disable @typescript-eslint/no-misused-promises */
+
 import { type AnnotationFeatureSnapshot } from '@apollo-annotation/mst'
 import { AddFeatureChange } from '@apollo-annotation/shared'
-import {
-  type AbstractSessionModel,
-  type Region,
-} from '@jbrowse/core/util/types'
+import { type Region } from '@jbrowse/core/util/types'
 import InfoIcon from '@mui/icons-material/Info'
 import {
   Box,
@@ -96,7 +93,6 @@ export function AddFeature({
   region,
   session,
 }: AddFeatureProps) {
-  const { notify } = session as unknown as AbstractSessionModel
   const [end, setEnd] = useState(String(region.end))
   const [start, setStart] = useState(String(region.start + 1))
   const [type, setType] = useState<NewFeature>(NewFeature.GENE_AND_SUBFEATURES)
@@ -104,7 +100,7 @@ export function AddFeature({
   const [strand, setStrand] = useState<1 | -1 | undefined>()
   const [errorMessage, setErrorMessage] = useState('')
 
-  async function onSubmit(event: React.FormEvent<HTMLFormElement>) {
+  function onSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault()
     setErrorMessage('')
 
@@ -120,7 +116,9 @@ export function AddFeature({
     }
 
     if (!refSeqId) {
-      setErrorMessage('Invalid refseq id')
+      setErrorMessage(
+        'Invalid refseq id. Make sure you have the Apollo annotation track open',
+      )
       return
     }
 
@@ -149,8 +147,9 @@ export function AddFeature({
           children,
         },
       })
-      await changeManager.submit(change)
-      notify('Feature added successfully', 'success')
+      void changeManager.submit(change).then(() => {
+        session.apolloSetSelectedFeature(id)
+      })
       handleClose()
       return
     }
@@ -167,8 +166,9 @@ export function AddFeature({
         assembly: region.assemblyName,
         addedFeature: mRNA,
       })
-      await changeManager.submit(change)
-      notify('Feature added successfully', 'success')
+      void changeManager.submit(change).then(() => {
+        session.apolloSetSelectedFeature(mRNA._id)
+      })
       handleClose()
       return
     }
@@ -191,8 +191,9 @@ export function AddFeature({
         strand,
       },
     })
-    await changeManager.submit(change)
-    notify('Feature added successfully', 'success')
+    void changeManager.submit(change).then(() => {
+      session.apolloSetSelectedFeature(id)
+    })
     handleClose()
     return
   }
@@ -231,7 +232,11 @@ export function AddFeature({
   }
 
   let submitDisabled: boolean = Boolean(error) || !(start && end && type)
-  if (type === NewFeature.CUSTOM && !customType) {
+  if (
+    (type === NewFeature.CUSTOM && !customType) ||
+    (!strand && type === NewFeature.GENE_AND_SUBFEATURES) ||
+    (!strand && type === NewFeature.TRANSCRIPT_AND_SUBFEATURES)
+  ) {
     submitDisabled = true
   }
 

package/src/components/AddRefSeqAliases.tsx

@@ -10,7 +10,7 @@ import {
   DialogContent,
   DialogContentText,
   FormControl,
-  Grid2,
+  Grid,
   InputLabel,
   MenuItem,
   Select,
@@ -212,8 +212,8 @@ export function AddRefSeqAliases({
       fullWidth
     >
       <DialogContent style={{ display: 'flex', flexDirection: 'column' }}>
-        <Grid2 container spacing={2}>
-          <Grid2>
+        <Grid container spacing={2}>
+          <Grid>
             <FormControl disabled={enableSubmit && !errorMessage} fullWidth>
               <InputLabel id="demo-simple-select-label">Assembly</InputLabel>
               <Select
@@ -225,13 +225,13 @@ export function AddRefSeqAliases({
               >
                 {assemblies.map((option) => (
                   <MenuItem key={option.name} value={option.name}>
-                    {option.displayName ?? option.name}
+                    {option.displayName}
                   </MenuItem>
                 ))}
               </Select>
             </FormControl>
-          </Grid2>
-          <Grid2>
+          </Grid>
+          <Grid>
             <InputLabel>Load RefName alias</InputLabel>
             <input
               type="file"
@@ -239,8 +239,8 @@ export function AddRefSeqAliases({
               ref={fileRef}
               disabled={(enableSubmit && !errorMessage) || !selectedAssembly}
             />
-          </Grid2>
-        </Grid2>
+          </Grid>
+        </Grid>
         {selectedAssembly && refNameAliasMap.size > 0 ? (
           <div style={{ height: 200, width: '100%', marginTop: 20 }}>
             <InputLabel>
@@ -256,7 +256,7 @@ export function AddRefSeqAliases({
               }}
               pageSizeOptions={[5, 10]}
               onRowSelectionModelChange={(ids) => {
-                rowSelectionChange(ids as number[])
+                rowSelectionChange(ids as unknown as number[])
               }}
               processRowUpdate={processRowUpdate}
               checkboxSelection

package/src/components/CopyFeature.tsx

@@ -83,7 +83,7 @@ export function CopyFeature({
   sourceAssemblyId,
   sourceFeature,
 }: CopyFeatureProps) {
-  const { assemblyManager, notify } = session as unknown as AbstractSessionModel
+  const { assemblyManager } = session as unknown as AbstractSessionModel
   const assemblies = assemblyManager.assemblyList
 
   const [selectedAssemblyId, setSelectedAssemblyId] = useState<
@@ -203,9 +203,9 @@ export function CopyFeature({
       copyFeature: true,
       allIds: featureIds,
     })
-    await changeManager.submit(change)
-
-    notify('Feature copied successfully', 'success')
+    void changeManager.submit(change).then(() => {
+      session.apolloSetSelectedFeature(newFeatureLine._id)
+    })
     handleClose()
     event.preventDefault()
   }