@apollo-annotation/jbrowse-plugin-apollo 0.3.4 → 0.3.5

package/src/components/AddAssembly.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-enum-comparison */
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
@@ -11,31 +10,35 @@ import {
 } from '@apollo-annotation/shared'
 import { readConfObject } from '@jbrowse/core/configuration'
 import { AbstractSessionModel } from '@jbrowse/core/util'
-import LinkIcon from '@mui/icons-material/Link'
 import {
-  Box,
   Button,
-  Checkbox,
   DialogActions,
   DialogContent,
   DialogContentText,
-  FormControl,
-  FormControlLabel,
+  Accordion,
+  AccordionSummary,
+  AccordionDetails,
+  Typography,
+  Box,
   FormGroup,
-  FormLabel,
-  MenuItem,
-  Radio,
-  RadioGroup,
-  Select,
-  SelectChangeEvent,
+  FormControlLabel,
+  Checkbox,
+  LinearProgress,
   TextField,
-  Typography,
+  Tooltip,
+  IconButton,
+  Table,
+  TableCell,
+  TableBody,
+  InputAdornment,
+  TableRow,
 } from '@mui/material'
-import InputAdornment from '@mui/material/InputAdornment'
-import LinearProgress from '@mui/material/LinearProgress'
+
+import { makeStyles } from 'tss-react/mui'
+
 import ObjectID from 'bson-objectid'
 import { getRoot } from 'mobx-state-tree'
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 
 import { ApolloInternetAccountModel } from '../ApolloInternetAccount/model'
 import { ChangeManager } from '../ChangeManager'
@@ -44,6 +47,12 @@ import { ApolloRootModel } from '../types'
 import { createFetchErrorMessage } from '../util'
 import { Dialog } from './Dialog'
 
+import RadioButtonUncheckedIcon from '@mui/icons-material/RadioButtonUnchecked'
+import RadioButtonCheckedIcon from '@mui/icons-material/RadioButtonChecked'
+
+import InfoIcon from '@mui/icons-material/Info'
+import LinkIcon from '@mui/icons-material/Link'
+
 interface AddAssemblyProps {
   session: ApolloSessionModel
   handleClose(): void
@@ -53,14 +62,71 @@ interface AddAssemblyProps {
 enum FileType {
   GFF3 = 'text/x-gff3',
   FASTA = 'text/x-fasta',
+  BGZIP_FASTA = 'application/x-bgzip-fasta',
+  FAI = 'text/x-fai',
+  GZI = 'application/x-gzi',
   EXTERNAL = 'text/x-external',
 }
 
+const useStyles = makeStyles()((theme) => ({
+  accordion: {
+    border: `1px solid ${theme.palette.divider}`,
+    '&:not(:last-child)': {
+      borderBottom: 0,
+    },
+  },
+  accordionSummary: {
+    flexDirection: 'row-reverse',
+  },
+  accordionDetails: {
+    padding: theme.spacing(2),
+    borderTop: '1px solid rgba(0, 0, 0, .125)',
+  },
+  radioIcon: {
+    color: theme?.palette?.tertiary?.contrastText,
+  },
+  dialog: {
+    // minHeight: 500,
+    minWidth: 550,
+    maxWidth: 800,
+  },
+}))
+
+function checkSumbission(
+  validAsm: boolean,
+  sequenceIsEditable: boolean,
+  fileType: FileType,
+  fastaFile: File | null,
+  fastaIndexFile: File | null,
+  fastaGziIndexFile: File | null,
+  validFastaUrl: boolean,
+  validFastaIndexUrl: boolean,
+  validFastaGziIndexUrl: boolean,
+) {
+  if (!validAsm) {
+    return false
+  }
+  if (sequenceIsEditable && fastaFile) {
+    return true
+  }
+  if (fileType === FileType.GFF3 && fastaFile) {
+    return true
+  }
+  if (fastaFile && fastaIndexFile && fastaGziIndexFile) {
+    return true
+  }
+  if (validFastaUrl && validFastaIndexUrl && validFastaGziIndexUrl) {
+    return true
+  }
+  return false
+}
+
 export function AddAssembly({
   changeManager,
   handleClose,
   session,
 }: AddAssemblyProps) {
+  const { classes } = useStyles()
   const { internetAccounts } = getRoot<ApolloRootModel>(session)
   const { notify } = session as unknown as AbstractSessionModel
   const apolloInternetAccounts = internetAccounts.filter(
@@ -72,62 +138,39 @@ export function AddAssembly({
   const [assemblyName, setAssemblyName] = useState('')
   const [errorMessage, setErrorMessage] = useState('')
   const [validAsm, setValidAsm] = useState(false)
-  const [file, setFile] = useState<File | null>(null)
-  const [fileType, setFileType] = useState(FileType.GFF3)
+  const [fileType, setFileType] = useState(FileType.BGZIP_FASTA)
   const [importFeatures, setImportFeatures] = useState(true)
+  const [sequenceIsEditable, setSequenceIsEditable] = useState(false)
   const [submitted, setSubmitted] = useState(false)
-  const [selectedInternetAccount, setSelectedInternetAccount] = useState(
-    apolloInternetAccounts[0],
-  )
-  const [fastaFile, setFastaFile] = useState('')
-  const [fastaIndexFile, setFastaIndexFile] = useState('')
-  const [fastaGziIndexFile, setFastaGziIndexFile] = useState('')
+
+  const [fastaFile, setFastaFile] = useState<File | null>(null)
+  const [fastaIndexFile, setFastaIndexFile] = useState<File | null>(null)
+  const [fastaGziIndexFile, setFastaGziIndexFile] = useState<File | null>(null)
+
+  const [fastaUrl, setFastaUrl] = useState<string>('')
+  const [fastaIndexUrl, setFastaIndexUrl] = useState<string>('')
+  const [fastaGziIndexUrl, setFastaGziIndexUrl] = useState<string>('')
+
   const [loading, setLoading] = useState(false)
+  const [isGzip, setIsGzip] = useState<boolean>(false)
 
-  function handleChangeInternetAccount(e: SelectChangeEvent) {
-    setSubmitted(false)
-    const newlySelectedInternetAccount = apolloInternetAccounts.find(
-      (ia) => ia.internetAccountId === e.target.value,
-    )
-    if (!newlySelectedInternetAccount) {
-      throw new Error(
-        `Could not find internetAccount with ID "${e.target.value}"`,
-      )
-    }
-    setSelectedInternetAccount(newlySelectedInternetAccount)
-  }
+  useEffect(() => {
+    setFastaIndexUrl(fastaUrl ? `${fastaUrl}.fai` : '')
+  }, [fastaUrl])
 
-  function handleChangeFile(e: React.ChangeEvent<HTMLInputElement>) {
-    if (!e.target.files) {
-      return
-    }
-    const selectedFile = e.target.files.item(0)
-    setFile(selectedFile)
-    if (!selectedFile) {
-      return
-    }
-    const fileNameLower = selectedFile.name.toLowerCase()
-    if (
-      fileNameLower.endsWith('.fasta') ||
-      fileNameLower.endsWith('.fna') ||
-      fileNameLower.endsWith('.fa')
-    ) {
-      setFileType(FileType.FASTA)
-    } else if (
-      fileNameLower.endsWith('.gff3') ||
-      fileNameLower.endsWith('.gff')
-    ) {
-      setFileType(FileType.GFF3)
-    }
-  }
+  useEffect(() => {
+    setFastaGziIndexUrl(fastaUrl ? `${fastaUrl}.gzi` : '')
+  }, [fastaUrl])
 
-  function handleChangeFileType(e: React.ChangeEvent<HTMLInputElement>) {
-    setFileType(e.target.value as FileType)
-    setImportFeatures(e.target.value === FileType.GFF3)
-    setFastaFile('')
-    setFastaIndexFile('')
-    setFile(null)
-  }
+  useEffect(() => {
+    if (sequenceIsEditable || fileType === FileType.GFF3) {
+      setIsGzip(
+        fastaFile?.name.toLocaleLowerCase().endsWith('.gz') ? true : false,
+      )
+    } else {
+      setIsGzip(true)
+    }
+  }, [fastaFile, sequenceIsEditable, fileType])
 
   function checkAssemblyName(assembly: string) {
     const { assemblies } = session as unknown as AbstractSessionModel
@@ -143,6 +186,70 @@ export function AddAssembly({
     }
   }
 
+  async function uploadFile(file: File, fileType: FileType): Promise<string> {
+    const { jobsManager } = session
+    const controller = new AbortController()
+
+    const [{ baseURL, getFetcher }] = apolloInternetAccounts
+    const url = new URL('files', baseURL)
+
+    url.searchParams.set('type', fileType)
+    const uri = url.href
+    const formData = new FormData()
+    let filename = file.name
+
+    if (fileType === FileType.FAI || fileType === FileType.GZI) {
+      filename = `${filename}.txt`
+    } else if (isGzip && !file.name.toLocaleLowerCase().endsWith('.gz')) {
+      filename = `${filename}.gz`
+    } else if (!isGzip && file.name.toLocaleLowerCase().endsWith('.gz')) {
+      filename = `${filename}.txt`
+    }
+    formData.append('file', file, filename)
+    formData.append('type', fileType)
+    const apolloFetchFile = getFetcher({
+      locationType: 'UriLocation',
+      uri,
+    })
+    if (apolloFetchFile) {
+      const job = {
+        name: `UploadAssemblyFile for ${assemblyName}`,
+        statusMessage: 'Pre-validating',
+        progressPct: 0,
+        cancelCallback: () => {
+          controller.abort()
+          jobsManager.abortJob(job.name)
+        },
+      }
+      jobsManager.runJob(job)
+      jobsManager.update(
+        job.name,
+        `Uploading ${file.name}, this may take awhile`,
+      )
+      const { signal } = controller
+
+      const response = await apolloFetchFile(uri, {
+        method: 'POST',
+        body: formData,
+        signal,
+      })
+      if (!response.ok) {
+        const newErrorMessage = await createFetchErrorMessage(
+          response,
+          'Error when inserting new assembly (while uploading file)',
+        )
+        jobsManager.abortJob(job.name, newErrorMessage)
+        setErrorMessage(newErrorMessage)
+        return ''
+      }
+      const result = await response.json()
+      const fileId = result._id as string
+      jobsManager.done(job)
+      return fileId
+    }
+    throw new Error('Failed to fetch')
+  }
+
   async function onSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault()
     setErrorMessage('')
@@ -153,158 +260,137 @@ export function AddAssembly({
     handleClose()
     event.preventDefault()
 
-    const { jobsManager } = session
-    const controller = new AbortController()
-
-    const job = {
-      name: `UploadAssemblyFile for ${assemblyName}`,
-      statusMessage: 'Pre-validating',
-      progressPct: 0,
-      cancelCallback: () => {
-        controller.abort()
-        jobsManager.abortJob(job.name)
-      },
-    }
-
-    jobsManager.runJob(job)
-
-    let fileId = ''
-    const { baseURL, getFetcher, internetAccountId } = selectedInternetAccount
-    if (fileType !== FileType.EXTERNAL && file) {
-      // First upload file
-      const url = new URL('files', baseURL)
-      url.searchParams.set('type', fileType)
-      const uri = url.href
-      const formData = new FormData()
-      formData.append('file', file)
-      formData.append('fileName', file.name)
-      formData.append('type', fileType)
-      const apolloFetchFile = getFetcher({
-        locationType: 'UriLocation',
-        uri,
-      })
-      if (apolloFetchFile) {
-        jobsManager.update(job.name, 'Uploading file, this may take awhile')
-        const { signal } = controller
-        const response = await apolloFetchFile(uri, {
-          method: 'POST',
-          body: formData,
-          signal,
-        })
-        if (!response.ok) {
-          const newErrorMessage = await createFetchErrorMessage(
-            response,
-            'Error when inserting new assembly (while uploading file)',
-          )
-          jobsManager.abortJob(job.name, newErrorMessage)
-          setErrorMessage(newErrorMessage)
-          return
-        }
-        const result = await response.json()
-        fileId = result._id
-      }
-    }
-
     let change:
       | AddAssemblyFromExternalChange
       | AddAssemblyAndFeaturesFromFileChange
       | AddAssemblyFromFileChange
+
     if (fileType === FileType.EXTERNAL) {
       change = new AddAssemblyFromExternalChange({
         typeName: 'AddAssemblyFromExternalChange',
-
         assembly: new ObjectID().toHexString(),
         assemblyName,
         externalLocation: {
-          fa: fastaFile,
-          fai: fastaIndexFile,
-          ...(fastaGziIndexFile ? { gzi: fastaGziIndexFile } : {}),
+          fa: fastaUrl,
+          fai: fastaIndexUrl,
+          gzi: fastaGziIndexUrl,
         },
       })
     } else {
-      const fileUploadChangeBase = {
-        assembly: new ObjectID().toHexString(),
-        assemblyName,
-        fileIds: { fa: fileId },
+      if (!fastaFile) {
+        throw new Error('Missing fasta file')
       }
-      change =
-        fileType === FileType.GFF3 && importFeatures
-          ? new AddAssemblyAndFeaturesFromFileChange({
-              typeName: 'AddAssemblyAndFeaturesFromFileChange',
-              ...fileUploadChangeBase,
-            })
-          : new AddAssemblyFromFileChange({
-              typeName: 'AddAssemblyFromFileChange',
-              ...fileUploadChangeBase,
-            })
-    }
+      if (fileType === FileType.GFF3 && importFeatures) {
+        const faId = await uploadFile(fastaFile, FileType.GFF3)
+        change = new AddAssemblyAndFeaturesFromFileChange({
+          typeName: 'AddAssemblyAndFeaturesFromFileChange',
+          assembly: new ObjectID().toHexString(),
+          assemblyName,
+          fileIds: { fa: faId },
+        })
+      } else if (fileType === FileType.GFF3) {
+        const faId = await uploadFile(fastaFile, FileType.GFF3)
+        change = new AddAssemblyFromFileChange({
+          typeName: 'AddAssemblyFromFileChange',
+          assembly: new ObjectID().toHexString(),
+          assemblyName,
+          fileIds: {
+            fa: faId,
+          },
+        })
+      } else if (sequenceIsEditable) {
+        const faId = await uploadFile(fastaFile, FileType.FASTA)
+        change = new AddAssemblyFromFileChange({
+          typeName: 'AddAssemblyFromFileChange',
+          assembly: new ObjectID().toHexString(),
+          assemblyName,
+          fileIds: {
+            fa: faId,
+          },
+        })
+      } else {
+        if (!fastaIndexFile || !fastaGziIndexFile) {
+          throw new Error('Missing fasta index files')
+        }
+        const faId = await uploadFile(fastaFile, FileType.BGZIP_FASTA)
+        const faiId = await uploadFile(fastaIndexFile, FileType.FAI)
+        const gziId = await uploadFile(fastaGziIndexFile, FileType.GZI)
 
-    jobsManager.done(job)
+        change = new AddAssemblyFromFileChange({
+          typeName: 'AddAssemblyFromFileChange',
+          assembly: new ObjectID().toHexString(),
+          assemblyName,
+          fileIds: {
+            fa: faId,
+            fai: faiId,
+            gzi: gziId,
+          },
+        })
+      }
+    }
 
+    const [{ internetAccountId }] = apolloInternetAccounts
     await changeManager.submit(change, {
       internetAccountId,
       updateJobsManager: true,
     })
-
     setSubmitted(false)
     setLoading(false)
   }
 
-  let validFastaFile = false
+  let validFastaUrl = false
   try {
-    const url = new URL(fastaFile)
+    const url = new URL(fastaUrl)
     if (url.protocol === 'http:' || url.protocol === 'https:') {
-      validFastaFile = true
+      validFastaUrl = true
     }
   } catch {
     // pass
   }
-  let validFastaIndexFile = false
+  let validFastaIndexUrl = false
   try {
-    const url = new URL(fastaIndexFile)
+    const url = new URL(fastaIndexUrl)
     if (url.protocol === 'http:' || url.protocol === 'https:') {
-      validFastaIndexFile = true
+      validFastaIndexUrl = true
     }
   } catch {
     // pass
   }
-  let validFastaGziIndexFile = false
+  let validFastaGziIndexUrl = false
   try {
-    const url = new URL(fastaGziIndexFile)
+    const url = new URL(fastaGziIndexUrl)
     if (url.protocol === 'http:' || url.protocol === 'https:') {
-      validFastaGziIndexFile = true
+      validFastaGziIndexUrl = true
     }
   } catch {
     // pass
   }
 
+  const [expanded, setExpanded] = React.useState<string>('panelFastaInput')
+
+  const handleAccordionChange =
+    (panel: string) => (event: React.SyntheticEvent, newExpanded: boolean) => {
+      if (newExpanded) {
+        setExpanded(panel)
+      }
+      if (panel === 'panelGffInput') {
+        setIsGzip(false)
+      } else {
+        setIsGzip(true)
+      }
+    }
+
   return (
     <Dialog
-      open
-      maxWidth={false}
+      open={true}
+      handleClose={handleClose}
       data-testid="add-assembly-dialog"
       title="Add new assembly"
-      handleClose={handleClose}
+      maxWidth={false}
     >
-      {loading ? <LinearProgress /> : null}
-      <form onSubmit={onSubmit}>
-        <DialogContent style={{ display: 'flex', flexDirection: 'column' }}>
-          {apolloInternetAccounts.length > 1 ? (
-            <>
-              <DialogContentText>Select account</DialogContentText>
-              <Select
-                value={selectedInternetAccount.internetAccountId}
-                onChange={handleChangeInternetAccount}
-                disabled={submitted && !errorMessage}
-              >
-                {internetAccounts.map((option) => (
-                  <MenuItem key={option.id} value={option.internetAccountId}>
-                    {option.name}
-                  </MenuItem>
-                ))}
-              </Select>
-            </>
-          ) : null}
+      <form onSubmit={onSubmit} data-testid="submit-form">
+        <DialogContent className={classes.dialog}>
+          {loading ? <LinearProgress /> : null}
           <TextField
             margin="dense"
             id="name"
@@ -319,147 +405,378 @@ export function AddAssembly({
             }}
             disabled={submitted && !errorMessage}
           />
-          <FormControl style={{ marginTop: 20 }}>
-            <FormLabel>Select GFF3, FASTA or EXTERNAL option</FormLabel>
-            <RadioGroup
-              aria-labelledby="demo-radio-buttons-group-label"
-              defaultValue={FileType.GFF3}
-              name="radio-buttons-group"
-              onChange={handleChangeFileType}
-              value={fileType}
+
+          <Accordion
+            disableGutters
+            elevation={0}
+            square
+            className={classes.accordion}
+            expanded={expanded === 'panelFastaInput'}
+            onChange={handleAccordionChange('panelFastaInput')}
+          >
+            <AccordionSummary
+              className={classes.accordionSummary}
+              expandIcon={
+                expanded === 'panelFastaInput' ? (
+                  <RadioButtonCheckedIcon
+                    className={classes.radioIcon}
+                    sx={{ fontSize: '1.2rem', ml: 5 }}
+                  />
+                ) : (
+                  <RadioButtonUncheckedIcon
+                    className={classes.radioIcon}
+                    sx={{ fontSize: '1.2rem', mr: 5 }}
+                  />
+                )
+              }
+              aria-controls="panelFastaInputd-content"
+              id="panelFastaInputd-header"
             >
-              <FormControlLabel
-                value={FileType.GFF3}
-                control={<Radio />}
-                label="GFF3"
-                disabled={submitted && !errorMessage}
-              />
-              <FormControlLabel
-                value={FileType.FASTA}
-                control={<Radio />}
-                label="FASTA"
-                disabled={submitted && !errorMessage}
-              />
-              <FormControlLabel
-                value={FileType.EXTERNAL}
-                control={<Radio />}
-                label="External"
-                disabled={submitted && !errorMessage}
-              />
-            </RadioGroup>
-          </FormControl>
-          {fileType === FileType.EXTERNAL ? (
-            <Box style={{ marginTop: 20 }}>
-              <Typography variant="caption">
-                Enter FASTA and FASTA index(es) URL
-              </Typography>
-              <TextField
-                margin="dense"
-                helperText="Can be bgz-compressed"
-                id="fasta"
-                label="FASTA"
-                type="TextField"
-                fullWidth
-                variant="outlined"
-                error={!validFastaFile}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setFastaFile(e.target.value)
-                }}
-                disabled={submitted && !errorMessage}
-                InputProps={{
-                  startAdornment: (
-                    <InputAdornment position="start">
-                      <LinkIcon />
-                    </InputAdornment>
-                  ),
-                }}
-              />
-              <TextField
-                margin="dense"
-                id="fasta-index"
-                label="FASTA Index"
-                helperText=".fai or .gz.fai"
-                type="TextField"
-                fullWidth
-                variant="outlined"
-                error={!validFastaIndexFile}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setFastaIndexFile(e.target.value)
-                }}
-                disabled={submitted && !errorMessage}
-                InputProps={{
-                  startAdornment: (
-                    <InputAdornment position="start">
-                      <LinkIcon />
-                    </InputAdornment>
-                  ),
-                }}
-              />
-              <TextField
-                margin="dense"
-                id="fasta-gzi-index"
-                label="FASTA GZI Index"
-                helperText="Only for bgz-compressed FASTA, .gz.gzi"
-                type="TextField"
-                fullWidth
-                variant="outlined"
-                error={Boolean(fastaGziIndexFile) && !validFastaGziIndexFile}
-                onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                  setFastaGziIndexFile(e.target.value)
-                }}
-                disabled={submitted && !errorMessage}
-                InputProps={{
-                  startAdornment: (
-                    <InputAdornment position="start">
-                      <LinkIcon />
-                    </InputAdornment>
-                  ),
-                }}
-              />
-            </Box>
-          ) : (
-            <Box style={{ marginTop: 20 }}>
-              <input
-                type="file"
-                onChange={handleChangeFile}
-                disabled={submitted && !errorMessage}
-              />
+              <Typography component="span">FASTA input</Typography>
+            </AccordionSummary>
+            <AccordionDetails className={classes.accordionDetails}>
               <FormGroup>
                 <FormControlLabel
+                  data-testid="files-on-url-checkbox"
                   control={
                     <Checkbox
-                      checked={fileType === FileType.GFF3 && importFeatures}
                       onChange={() => {
-                        setImportFeatures(!importFeatures)
+                        setFileType(
+                          fileType === FileType.EXTERNAL
+                            ? FileType.BGZIP_FASTA
+                            : FileType.EXTERNAL,
+                        )
+                        if (fileType === FileType.EXTERNAL) {
+                          setSequenceIsEditable(false)
+                        }
                       }}
+                      checked={fileType === FileType.EXTERNAL}
                       disabled={
-                        fileType !== FileType.GFF3 ||
-                        (submitted && !errorMessage)
+                        sequenceIsEditable && fileType !== FileType.GFF3
                       }
                     />
                   }
-                  label="Also load features from GFF3 file"
+                  label={
+                    <Box display="flex" alignItems="center">
+                      Use external URLs
+                      <Tooltip
+                        title="Use external URLs to provide FASTA and index files. Does not copy the files to the Apollo collaboration server, so ensure the URLs are stable."
+                        placement="top-start"
+                      >
+                        <IconButton size="small">
+                          <InfoIcon sx={{ fontSize: 18 }} />
+                        </IconButton>
+                      </Tooltip>
+                    </Box>
+                  }
                 />
+
+                <FormControlLabel
+                  data-testid="sequence-is-editable-checkbox"
+                  control={
+                    <Checkbox
+                      onChange={() => {
+                        setSequenceIsEditable(!sequenceIsEditable)
+                      }}
+                    />
+                  }
+                  checked={sequenceIsEditable}
+                  disabled={fileType === FileType.EXTERNAL}
+                  label={
+                    <Box display="flex" alignItems="center">
+                      Store sequence in database
+                      <Tooltip
+                        title="Enables users to edit the genomic sequence, but comes with performance impacts. Use with care."
+                        placement="top-start"
+                      >
+                        <IconButton size="small">
+                          <InfoIcon sx={{ fontSize: 18 }} />
+                        </IconButton>
+                      </Tooltip>
+                    </Box>
+                  }
+                />
+                <FormControlLabel
+                  data-testid="fasta-is-gzip-checkbox"
+                  control={
+                    <Checkbox
+                      checked={isGzip}
+                      onChange={() => {
+                        if (sequenceIsEditable) {
+                          setIsGzip(!isGzip)
+                        } else {
+                          setIsGzip(true)
+                        }
+                      }}
+                      disabled={!sequenceIsEditable}
+                    />
+                  }
+                  label="FASTA is gzip compressed"
+                />
+
+                {fileType === FileType.BGZIP_FASTA ||
+                fileType === FileType.GFF3 ? (
+                  <Table size="small" sx={{ mt: 2 }}>
+                    <TableBody>
+                      <TableRow />
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <Box display="flex" alignItems="center">
+                          <span>FASTA</span>
+                          <Tooltip title='Unless "Store sequence in database" enabled, FASTA input must be compressed with bgzip and indexed with samtools faidx (or equivalent). Compression is optional for sequences stored in the database.'>
+                            <IconButton size="small">
+                              <InfoIcon sx={{ fontSize: 18 }} />
+                            </IconButton>
+                          </Tooltip>
+                        </Box>
+                      </TableCell>
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <input
+                          data-testid="fasta-input-file"
+                          type="file"
+                          onChange={(
+                            e: React.ChangeEvent<HTMLInputElement>,
+                          ) => {
+                            setFastaFile(e.target.files?.item(0) ?? null)
+                          }}
+                          disabled={submitted && !errorMessage}
+                        />
+                      </TableCell>
+
+                      <TableRow />
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        FASTA index (.fai)
+                      </TableCell>
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <input
+                          data-testid="fai-input-file"
+                          type="file"
+                          onChange={(
+                            e: React.ChangeEvent<HTMLInputElement>,
+                          ) => {
+                            setFastaIndexFile(e.target.files?.item(0) ?? null)
+                          }}
+                          disabled={
+                            (submitted && !errorMessage) || sequenceIsEditable
+                          }
+                        />
+                      </TableCell>
+
+                      <TableRow />
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        FASTA binary index (.gzi)
+                      </TableCell>
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <input
+                          data-testid="gzi-input-file"
+                          type="file"
+                          onChange={(
+                            e: React.ChangeEvent<HTMLInputElement>,
+                          ) => {
+                            setFastaGziIndexFile(
+                              e.target.files?.item(0) ?? null,
+                            )
+                          }}
+                          disabled={
+                            (submitted && !errorMessage) || sequenceIsEditable
+                          }
+                        />
+                      </TableCell>
+                    </TableBody>
+                  </Table>
+                ) : (
+                  <Table size="small" sx={{ mt: 2 }}>
+                    <TableBody>
+                      <TableRow />
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <Box display="flex" alignItems="center">
+                          <span>FASTA</span>
+                          <Tooltip title="Remote FASTA input must be compressed with bgzip and indexed with samtools faidx (or equivalent)">
+                            <IconButton size="small">
+                              <InfoIcon sx={{ fontSize: 18 }} />
+                            </IconButton>
+                          </Tooltip>
+                        </Box>
+                      </TableCell>
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <TextField
+                          data-testid="fasta-input-url"
+                          variant="outlined"
+                          value={fastaUrl}
+                          error={!validFastaUrl}
+                          onChange={(
+                            e: React.ChangeEvent<HTMLInputElement>,
+                          ) => {
+                            setFastaUrl(e.target.value)
+                          }}
+                          disabled={submitted && !errorMessage}
+                          slotProps={{
+                            input: {
+                              startAdornment: (
+                                <InputAdornment position="start">
+                                  <LinkIcon />
+                                </InputAdornment>
+                              ),
+                            },
+                          }}
+                        />
+                      </TableCell>
+
+                      <TableRow />
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        FASTA index (.fai)
+                      </TableCell>
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <TextField
+                          data-testid="fai-input-url"
+                          variant="outlined"
+                          value={fastaIndexUrl}
+                          error={!validFastaIndexUrl}
+                          onChange={(
+                            e: React.ChangeEvent<HTMLInputElement>,
+                          ) => {
+                            setFastaIndexUrl(e.target.value)
+                          }}
+                          disabled={submitted && !errorMessage}
+                          slotProps={{
+                            input: {
+                              startAdornment: (
+                                <InputAdornment position="start">
+                                  <LinkIcon />
+                                </InputAdornment>
+                              ),
+                            },
+                          }}
+                        />
+                      </TableCell>
+
+                      <TableRow />
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        FASTA binary index (.gzi)
+                      </TableCell>
+                      <TableCell style={{ borderBottomWidth: 0 }}>
+                        <TextField
+                          data-testid="gzi-input-url"
+                          variant="outlined"
+                          value={fastaGziIndexUrl}
+                          error={!validFastaGziIndexUrl}
+                          onChange={(
+                            e: React.ChangeEvent<HTMLInputElement>,
+                          ) => {
+                            setFastaGziIndexUrl(e.target.value)
+                          }}
+                          disabled={submitted && !errorMessage}
+                          slotProps={{
+                            input: {
+                              startAdornment: (
+                                <InputAdornment position="start">
+                                  <LinkIcon />
+                                </InputAdornment>
+                              ),
+                            },
+                          }}
+                        />
+                      </TableCell>
+                    </TableBody>
+                  </Table>
+                )}
               </FormGroup>
-            </Box>
-          )}
+            </AccordionDetails>
+          </Accordion>
+          <Accordion
+            disableGutters
+            elevation={0}
+            square
+            className={classes.accordion}
+            expanded={expanded === 'panelGffInput'}
+            onChange={handleAccordionChange('panelGffInput')}
+          >
+            <AccordionSummary
+              className={classes.accordionSummary}
+              expandIcon={
+                expanded === 'panelGffInput' ? (
+                  <RadioButtonCheckedIcon
+                    className={classes.radioIcon}
+                    sx={{ fontSize: '1.2rem', ml: 5 }}
+                  />
+                ) : (
+                  <RadioButtonUncheckedIcon
+                    className={classes.radioIcon}
+                    sx={{ fontSize: '1.2rem', mr: 5 }}
+                  />
+                )
+              }
+              aria-controls="panelGffInputd-content"
+            >
+              <Typography component="span">
+                GFF3 input
+                <Tooltip title="GFF3 must includes FASTA sequences. File can be gzip compressed.">
+                  <InfoIcon
+                    className={classes.radioIcon}
+                    sx={{ fontSize: 18 }}
+                  />
+                </Tooltip>
+              </Typography>
+            </AccordionSummary>
+            <AccordionDetails className={classes.accordionDetails}>
+              <Box style={{ marginTop: 20 }}>
+                <input
+                  data-testid="gff3-input-file"
+                  type="file"
+                  disabled={submitted && !errorMessage}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+                    setFastaFile(e.target.files?.item(0) ?? null)
+                    setFileType(FileType.GFF3)
+                  }}
+                />
+                <FormGroup style={{ display: 'grid' }}>
+                  <FormControlLabel
+                    control={
+                      <Checkbox
+                        checked={importFeatures}
+                        onChange={() => {
+                          setImportFeatures(!importFeatures)
+                        }}
+                        disabled={submitted && !errorMessage}
+                      />
+                    }
+                    label="Load features from GFF3 file"
+                  />
+                  <FormControlLabel
+                    data-testid="gff3-is-gzip-checkbox"
+                    control={
+                      <Checkbox
+                        checked={isGzip}
+                        onChange={() => {
+                          setIsGzip(!isGzip)
+                        }}
+                        disabled={submitted && !errorMessage}
+                      />
+                    }
+                    label="GFF3 is gzip compressed"
+                  />
+                </FormGroup>
+              </Box>
+            </AccordionDetails>
+          </Accordion>
         </DialogContent>
         <DialogActions>
           <Button
             disabled={
-              !validAsm ||
-              !(
-                (assemblyName && file) ??
-                (assemblyName &&
-                  fastaFile &&
-                  fastaIndexFile &&
-                  validFastaFile &&
-                  validFastaIndexFile)
-              ) ||
-              submitted
+              !checkSumbission(
+                validAsm,
+                sequenceIsEditable,
+                fileType,
+                fastaFile,
+                fastaIndexFile,
+                fastaGziIndexFile,
+                validFastaUrl,
+                validFastaIndexUrl,
+                validFastaGziIndexUrl,
+              ) || submitted
             }
             variant="contained"
             type="submit"
+            data-testid="submit-button"
           >
             {submitted ? 'Submitting...' : 'Submit'}
           </Button>