From 681d6971cae516722031abc708570da66b0ca738 Mon Sep 17 00:00:00 2001
From: Bsandor453 <32219422+Bsandor453@users.noreply.github.com>
Date: Tue, 12 Mar 2019 20:53:36 +0100
Subject: [PATCH] Refactor and fix homework validation
---
src/components/forms/AddSolutionForm.js | 18 ++++++++++--------
src/components/forms/ConfirmModal.js | 5 +----
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index e0b82c0..8b73573 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -33,6 +33,7 @@ class AddSolutionForm extends Component {
const sentences = this.props.taskdesc.split('\n');
const note = '';
const disabledText = 'A hatĂĄridĹ lejĂĄrt, tovĂĄbbi beadĂĄs nem lehetsĂŠges.';
+
return (
<Modal
open={this.state.showModal}
@@ -99,19 +100,16 @@ class AddSolutionForm extends Component {
button={
<Button
disabled={
- name === '' ||
- description === '' ||
- (file === '' ? false :
- !allowedFileTypes.includes(file.type) ||
- file.size > (maxFileSize) * (1024 ** 2)
- )
+ !name || !description ||
+ (!file ? false : !allowedFileTypes.includes(file.type) ||
+ file.size > (maxFileSize) * (1024 ** 2))
}
inverted
color='green'
>
<Icon name='checkmark' /> BeadĂĄs
</Button>
- }
+ }
text='beadod az Ăşj megoldĂĄst, ami felĂźlĂrja az elĹzĹt'
onAccept={() => {
this.props.addSolution({
@@ -126,7 +124,11 @@ class AddSolutionForm extends Component {
<Button
inverted
color='green'
- disabled={(name === '' || description === '')}
+ disabled={
+ !name || !description ||
+ (!file ? false : !allowedFileTypes.includes(file.type) ||
+ file.size > (maxFileSize) * (1024 ** 2))
+ }
onClick={() => {
this.props.addSolution({
task, accepted, corrected, note, name, description, file,
diff --git a/src/components/forms/ConfirmModal.js b/src/components/forms/ConfirmModal.js
index a78c45f..3998252 100644
--- a/src/components/forms/ConfirmModal.js
+++ b/src/components/forms/ConfirmModal.js
@@ -45,10 +45,7 @@ class ConfirmModal extends Component {
<Button
color='green'
inverted
- onClick={() => { onAccept();
- this.close();
- }
- }
+ onClick={() => { onAccept(); this.close(); }}
>
<Icon name='checkmark' /> Igen
</Button>
--
GitLab