From d5a744193446779cccc773e8a00cf89c891c12a3 Mon Sep 17 00:00:00 2001 From: Bsandor453 <32219422+Bsandor453@users.noreply.github.com> Date: Sat, 9 Mar 2019 21:53:12 +0100 Subject: [PATCH] Refactored some falsy checks --- src/components/forms/CorrectSolutionForm.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/components/forms/CorrectSolutionForm.js b/src/components/forms/CorrectSolutionForm.js index 0be41ec..35e039b 100644 --- a/src/components/forms/CorrectSolutionForm.js +++ b/src/components/forms/CorrectSolutionForm.js @@ -23,14 +23,13 @@ class CorrectSolutionForm extends Component { } = this.props; const taskSolutionsProfile = taskSolutions.filter(solution => solution.created_by === studentId); - const relevantSolution = taskSolutionsProfile[taskSolutionsProfile.length - 1]; + const relevantSolution = taskSolutionsProfile.slice(-1)[0]; const relevantDocuments = this.props.homeworks.documents.filter(document => document.solution === relevantSolution.id).filter(document => document.uploaded_by_name === studentFullName); - const relevantDocument = relevantDocuments[relevantDocuments.length - 1]; + const relevantDocument = relevantDocuments.slice(-1)[0]; let fileLink; - if (relevantDocument !== undefined && relevantDocument !== null && - relevantDocument.file !== undefined && relevantDocument.file !== null) { + if (relevantDocument && relevantDocument.file) { fileLink = `/media${relevantDocument.file.split('media')[1]}`; } else { fileLink = null; @@ -69,15 +68,15 @@ class CorrectSolutionForm extends Component { : <p>Nincs cĂm.</p> } <Header as='h5'>A megoldĂĄs leĂrĂĄsa:</Header> - { (relevantDocument !== undefined && relevantDocument !== null && - relevantDocument.description !== undefined && relevantDocument.description !== null - && relevantDocument.description !== '') + {(relevantDocument && relevantDocument.description) ? relevantDocument.description.split('\n').map(s => (<p key={Math.random()}>{s}</p>)) - : <p>Nincs leĂrĂĄs.</p>} + : <p>Nincs leĂrĂĄs.</p> + } <Header as='h5'>A beadott dokumentum:</Header> - {fileLink === null ? - <p>Nincs fĂĄjl.</p> : - <a href={fileLink}>FĂĄjl letĂśltĂŠse</a>} + {fileLink + ? <a href={fileLink}>FĂĄjl letĂśltĂŠse</a> + : <p>Nincs fĂĄjl.</p> + } <Header as='h5'>KijavĂtĂĄs ĂĄllapotĂĄnak vĂĄltoztatĂĄsa:</Header> <Button color='orange' -- GitLab