Merge pull request #1017 from nk-coding/bugfix/csv_import

fix csv upload: accept correct content type
TMS-Uni-Stuttgart · Oct 23, 2022 · 8bfe403 · 8bfe403
2 parents f313021 + 531c264
commit 8bfe403
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/client/src/components/UploadFileButton.tsx b/client/src/components/UploadFileButton.tsx
@@ -39,18 +39,14 @@ function UploadFileButton({
     async (file: File) => {
       setLoading(true);
 
-      if (!supportedFileTypes.includes(file.type)) {
-        return;
-      }
-
       const content: string = await file.text();
       const cb = onFileSelect(content, file);
 
       await Promise.resolve(cb);
 
       setLoading(false);
     },
-    [supportedFileTypes, onFileSelect]
+    [onFileSelect]
   );
 
   const handleFileUpload = useCallback(
@@ -77,7 +73,7 @@ function UploadFileButton({
     >
       <Box display='flex'>
         <input
-          accept='.csv'
+          accept={supportedFileTypes.join(',')}
           style={{ display: 'none' }}
           id='icon-button-file'
           type='file'

diff --git a/client/src/components/import-csv/components/ImportCSVFromFile.tsx b/client/src/components/import-csv/components/ImportCSVFromFile.tsx
@@ -1,6 +1,5 @@
 import { Box, Grow, Typography } from '@material-ui/core';
 import { FileCheckOutline as FileSelectedIcon } from 'mdi-material-ui';
-import React from 'react';
 import OutlinedBox from '../../OutlinedBox';
 import UploadFileButton from '../../UploadFileButton';
 
@@ -18,7 +17,7 @@ function ImportCSVFromFile({ fileInfo, onFileInfoChanged }: ImportCSVFromFilePro
   return (
     <>
       <UploadFileButton
-        supportedFileTypes={['application/vnd.ms-excel']}
+        supportedFileTypes={['text/csv']}
         onFileSelect={(content: string, file: File) =>
           onFileInfoChanged({ content, fileName: file.name })
         }