From 110768c365b3e8dc1dbb05d9032d4ec1acfd6406 Mon Sep 17 00:00:00 2001
From: Bereczki Sandor <bsandor453@gmail.com>
Date: Sat, 23 Feb 2019 01:03:13 +0100
Subject: [PATCH] Proper state updates for correction modals, key fixes

---
 src/components/forms/SolutionDetailsForm.js | 15 +++++++++------
 src/components/pages/Homework.js            |  3 ---
 src/reducers/HomeworksReducer.js            |  6 ++++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/forms/SolutionDetailsForm.js b/src/components/forms/SolutionDetailsForm.js
index 0b39f79..f503b6c 100644
--- a/src/components/forms/SolutionDetailsForm.js
+++ b/src/components/forms/SolutionDetailsForm.js
@@ -6,6 +6,7 @@ import { emptyMessage } from '../pages/Homework';
 import './Forms.css';
 import {
   getSolutions,
+  getDocuments,
 } from '../../actions/homework';
 
 class SolutionDetailsForm extends Component {
@@ -25,7 +26,7 @@ class SolutionDetailsForm extends Component {
     const noAcceptStudents = [];
     const acceptedStudents = [];
 
-    this.props.homeworks.profiles.forEach(profile => {
+    this.props.homeworks.profiles.forEach((profile) => {
       const profileSolutions = taskSolutions.filter(solution =>
         solution.created_by === profile.id);
 
@@ -53,6 +54,7 @@ class SolutionDetailsForm extends Component {
             onClick={() => {
               this.setState({ showModal: true });
               this.props.getSolutions();
+              this.props.getDocuments();
             }}
           >
             <Icon name='external' />
@@ -65,13 +67,13 @@ class SolutionDetailsForm extends Component {
         </Modal.Header>
         <Modal.Content>
           <Header as='h3'>A feladat leĂ­rĂĄsa:</Header>
-          {this.props.taskdesc.split('\n').map(s => (<p>{s}</p>))}
+          {this.props.taskdesc.split('\n').map(s => (<p key={Math.random()}>{s}</p>))}
           <Divider />
           <Header as='h3'>Nem ĂŠrkezett mĂŠg megoldĂĄs:</Header>
           {noSubmitStudents.length === 0 ?
               emptyMessage(emptyStudentText) :
               noSubmitStudents.map(student => (
-                <Button color='blue' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
+                <Button key={Math.random()} color='blue' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
               ))
           }
           <Divider />
@@ -80,6 +82,7 @@ class SolutionDetailsForm extends Component {
             emptyMessage(emptyStudentText) :
             waitForCorrectionStudents.map(student => (
               <CorrectSolutionForm
+                key={Math.random()}
                 studentName={student.nick}
                 studentFullName={student.full_name}
                 studentId={student.id}
@@ -93,7 +96,7 @@ class SolutionDetailsForm extends Component {
           {noAcceptStudents.length === 0 ?
             emptyMessage(emptyStudentText) :
             noAcceptStudents.map(student => (
-              <Button color='red' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
+              <Button key={Math.random()} color='red' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
             ))
         }
           <Divider />
@@ -101,7 +104,7 @@ class SolutionDetailsForm extends Component {
           {acceptedStudents.length === 0 ?
             emptyMessage(emptyStudentText) :
             acceptedStudents.map(student => (
-              <Button color='green' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
+              <Button key={Math.random()} color='green' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button>
             ))
         }
         </Modal.Content>
@@ -124,5 +127,5 @@ class SolutionDetailsForm extends Component {
 const mapStateToProps = ({ homeworks, user }) => ({ homeworks, user });
 
 export default connect(mapStateToProps, {
-  getSolutions,
+  getSolutions, getDocuments,
 })(SolutionDetailsForm);
diff --git a/src/components/pages/Homework.js b/src/components/pages/Homework.js
index 84b954b..5c20fd4 100644
--- a/src/components/pages/Homework.js
+++ b/src/components/pages/Homework.js
@@ -18,7 +18,6 @@ import {
   deleteTask,
   addDocument,
   getProfiles,
-  getDocuments,
 } from '../../actions/homework';
 import AddTaskForm from '../forms/AddTaskForm';
 import AddSolutionForm from '../forms/AddSolutionForm';
@@ -70,7 +69,6 @@ class Homework extends Component {
     this.props.getTasks();
     this.props.getProfiles();
     this.props.getSolutions(this.props.user.id);
-    this.props.getDocuments();
   }
 
   getTaskDisplayStyle(task) {
@@ -337,6 +335,5 @@ export default connect(
     deleteTask,
     addDocument,
     getProfiles,
-    getDocuments,
   },
 )(Homework);
diff --git a/src/reducers/HomeworksReducer.js b/src/reducers/HomeworksReducer.js
index fa60aee..870c476 100644
--- a/src/reducers/HomeworksReducer.js
+++ b/src/reducers/HomeworksReducer.js
@@ -1,5 +1,6 @@
 import { GET_TASKS,
   GET_SOLUTIONS,
+  CORRECT_SOLUTION,
   ADD_TASK,
   DELETE_TASK,
   EDIT_TASK,
@@ -22,6 +23,11 @@ export default (state = INITIAL_STATE, action) => {
       return { ...state, tasks: action.payload };
     case GET_SOLUTIONS:
       return { ...state, solutions: action.payload };
+    case CORRECT_SOLUTION:
+      const modifiedSolution = state.solutions.find(sol => sol.id === action.payload.id);
+      const modifiedSolutions = state.solutions.slice();
+      modifiedSolutions.splice(state.solutions.indexOf(modifiedSolution), 1, action.payload);
+      return { ...state, solutions: [...modifiedSolutions] };
     case ADD_SOLUTION:
       return { ...state, solutions: [action.payload, ...state.solutions], id: action.payload.id };
     case ADD_TASK:
-- 
GitLab