Skip to content

[BI-1618] Import File Selection Behavior #262

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

Merged
davedrp merged 1 commit into from
Jun 30, 2023
Merged

[BI-1618] Import File Selection Behavior #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/org/breedinginsight/brapps/importer/services/FileImportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private Table parseUploadedFile(CompletedFileUpload file) throws UnsupportedType
//TODO: Allow them to pass in header row index in the future
df = FileUtil.parseTableFromExcel(file.getInputStream(), 0);
} catch (IOException | ParsingException e) {
throw new HttpStatusException(HttpStatus.BAD_REQUEST, String.format("Error(s) detected in file, %s. %s. Import cannot proceed.", file.getFilename(), e.getMessage()));
throw new HttpStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
}
} else {
throw new UnsupportedTypeException("Unsupported mime type");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/breedinginsight/services/TraitUploadService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public ProgramUpload updateTraitUpload(UUID programId, CompletedFileUpload file,
traits = parser.parseExcel(new BOMInputStream(file.getInputStream(), false));
} catch(IOException | ParsingException e) {
log.error(e.getMessage());
throw new HttpStatusException( HttpStatus.BAD_REQUEST, String.format("Error(s) detected in file, %s. %s. Import cannot proceed.", file.getFilename(), e.getMessage()) );
throw new HttpStatusException( HttpStatus.BAD_REQUEST, e.getMessage() );
}
} else {
throw new UnsupportedTypeException("Unsupported mime type");
Expand Down