Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve error reporting on SV inspector/spreadsheet view on import form #3220

Merged
merged 9 commits into from
Sep 26, 2022
Merged

Improve error reporting on SV inspector/spreadsheet view on import form #3220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
748b252
Better error display on sv inspector/spreadsheet view
cmdcolin Sep 26, 2022
69ecd3b
Some typescripting
cmdcolin Sep 26, 2022
bc7f7cc
More typescripting
cmdcolin Sep 26, 2022
cc08634
Slightly better typescripting
cmdcolin Sep 26, 2022
b78aa6b
More typescripting
cmdcolin Sep 26, 2022
af19314
More space for importform yet still
cmdcolin Sep 26, 2022
2e2df26
More typescripting
cmdcolin Sep 26, 2022
446e127
More typescripting
cmdcolin Sep 26, 2022
57c2a35
More typescripting
cmdcolin Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions plugins/spreadsheet-view/src/SpreadsheetView/components/ImportWizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import { makeStyles } from 'tss-react/mui'
import { observer } from 'mobx-react'
import { getRoot } from 'mobx-state-tree'
import { getSession } from '@jbrowse/core/util'
import { FileSelector } from '@jbrowse/core/ui'
import AssemblySelector from '@jbrowse/core/ui/AssemblySelector'
import { FileSelector, ErrorMessage, AssemblySelector } from '@jbrowse/core/ui'

const useStyles = makeStyles()(theme => ({
buttonContainer: { marginTop: theme.spacing(1) },
Expand Down Expand Up @@ -52,6 +51,7 @@ const NumberEditor = observer(
)

const ErrorDisplay = observer(({ error }) => {
console.log({ error })
cmdcolin marked this conversation as resolved.
Show resolved Hide resolved
return (
<Typography variant="h6" color="error">
{`${error}`}
Expand All @@ -69,15 +69,18 @@ const ImportForm = observer(({ model }) => {
setFileType,
hasColumnNameLine,
toggleHasColumnNameLine,
error,
} = model
const [selected, setSelected] = useState(assemblyNames[0])
const err = assemblyManager.get(selected)?.error
const err = assemblyManager.get(selected)?.error || error
const showRowControls = model.fileType === 'CSV' || model.fileType === 'TSV'
const rootModel = getRoot(model)

console.log({ err })

return (
<Container>
{err ? <ErrorDisplay error={err} /> : null}
{err ? <ErrorMessage error={err} /> : null}
<Grid
style={{ width: '25rem', margin: '0 auto' }}
container
Expand Down Expand Up @@ -179,16 +182,7 @@ const ImportForm = observer(({ model }) => {

const ImportWizard = observer(({ model }) => {
const { classes } = useStyles()
return (
<>
{model.error ? (
<Container className={classes.errorContainer}>
<ErrorDisplay errorMessage={`${model.error}`} />
</Container>
) : null}
<ImportForm model={model} />
</>
)
return <ImportForm model={model} />
})

export default ImportWizard
23 changes: 14 additions & 9 deletions plugins/spreadsheet-view/src/SpreadsheetView/models/ImportWizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,20 @@ const ImportWizard = types
// not required for stat to succeed to proceed, but it is helpful
console.warn(e)
}
await filehandle
.readFile()
.then(buffer => (self.requiresUnzip ? unzip(buffer) : buffer))
.then(buffer => typeParser(buffer, self))
.then(spreadsheet => {
this.setLoaded()
// eslint-disable-next-line @typescript-eslint/no-explicit-any
getParent<any>(self).displaySpreadsheet(spreadsheet)
})

try {
await filehandle
.readFile()
.then(buffer => (self.requiresUnzip ? unzip(buffer) : buffer))
.then(buffer => typeParser(buffer, self))
.then(spreadsheet => {
this.setLoaded()
// eslint-disable-next-line @typescript-eslint/no-explicit-any
getParent<any>(self).displaySpreadsheet(spreadsheet)
})
} catch (e) {
this.setError(e)
}
},
}))

Expand Down