Skip to content

Commit dc9c9d2

Browse files
Bugfix: Detect file compression correctly in AddAssembly dialog (GMOD#715)
* Fixes for AddAssembly dialog * Fix PR workflow path matcher
1 parent 8e44a07 commit dc9c9d2

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Pull Request
33
on:
44
pull_request:
55
paths:
6-
- '**.ts'
6+
- '**.tsx?'
77

88
jobs:
99
build:

packages/jbrowse-plugin-apollo/src/components/AddAssembly.tsx

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export function AddAssembly({
178178
const formData = new FormData()
179179
let filename = file.name
180180
const isGzip =
181-
(fileType === FileType.FAI &&
181+
(fileType === FileType.FASTA &&
182182
(!sequenceIsEditable || fastaGzipChecked)) ||
183183
(fileType === FileType.GFF3 && gff3GzipChecked)
184184

@@ -515,7 +515,13 @@ export function AddAssembly({
515515
onChange={(
516516
e: React.ChangeEvent<HTMLInputElement>,
517517
) => {
518-
setFastaFile(e.target.files?.item(0) ?? null)
518+
const file = e.target.files?.item(0)
519+
if (file) {
520+
setFastaFile(file)
521+
if (file.name.endsWith('.gz')) {
522+
setFastaGzipChecked(true)
523+
}
524+
}
519525
}}
520526
disabled={submitted && !errorMessage}
521527
/>
@@ -712,8 +718,14 @@ export function AddAssembly({
712718
type="file"
713719
disabled={submitted && !errorMessage}
714720
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
715-
setFastaFile(e.target.files?.item(0) ?? null)
716-
setFileType(FileType.GFF3)
721+
const file = e.target.files?.item(0)
722+
if (file) {
723+
setFastaFile(file)
724+
setFileType(FileType.GFF3)
725+
if (file.name.endsWith('.gz')) {
726+
setGff3GzipChecked(true)
727+
}
728+
}
717729
}}
718730
/>
719731
<FormGroup style={{ display: 'grid' }}>

0 commit comments

Comments
 (0)