From 0d8a97d99dd6c01b522ce0a2be94868893568d21 Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Thu, 11 Mar 2021 22:34:15 +0100
Subject: [PATCH] fix
---
src/components/forms/AddSolutionForm.js | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index eb37e52..5f87836 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -35,16 +35,14 @@ const allowedFileTypes = [
'application/x-zip',
];
-// const allowedFileEnds = ['.zip', '.jpeg', '.jpg', '.jpe', '.png'];
+const allowedFileEnds = ['.zip', '.jpeg', '.jpg', '.jpe', '.png'];
function validateFileName(fileNameToValidate) {
- return true;
-
- // return (
- // allowedFileEnds.find((typeName) => {
- // return fileNameToValidate.toLowerCase().endsWith(typeName);
- // }).length > 0
- // );
+ return (
+ allowedFileEnds.find((typeName) => {
+ return fileNameToValidate.toLowerCase().endsWith(typeName);
+ }).length > 0
+ );
}
// in megabytes
@@ -223,7 +221,7 @@ class AddSolutionForm extends Component {
!description ||
(!file
? false
- : validateFileName(file.name) ||
+ : !validateFileName(file.name) ||
file.size > maxFileSize * 1024 ** 2)
}
inverted
@@ -282,7 +280,7 @@ class AddSolutionForm extends Component {
!description ||
(!file
? false
- : !allowedFileTypes.includes(file.type) ||
+ : !validateFileName(file.name) ||
file.size > maxFileSize * 1024 ** 2)
}
onClick={() => {
--
GitLab