Reload evaluations after resubmit

ReCodEx · Dec 14, 2017 · 2a6ccb4 · 2a6ccb4
1 parent 9a1c1fb
commit 2a6ccb4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git a/src/components/Submissions/SubmissionDetail/SubmissionDetail.js b/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
@@ -28,6 +28,14 @@ class SubmissionDetail extends Component {
     });
   }
 
+  componentWillReceiveProps(newProps) {
+    if (this.props.evaluations.size !== newProps.evaluations.size) {
+      this.setState({
+        activeSubmissionId: newProps.submission.lastSubmission.id
+      });
+    }
+  }
+
   render() {
     const {
       submission: {

diff --git a/src/containers/EvaluationProgressContainer/EvaluationProgressContainer.js b/src/containers/EvaluationProgressContainer/EvaluationProgressContainer.js
@@ -147,9 +147,10 @@ class EvaluationProgressContainer extends Component {
   };
 
   finish = () => {
-    const { push, link, finishProcessing } = this.props;
+    const { push, link, finishProcessing, onFinish } = this.props;
     finishProcessing();
     this.closeSocket();
+    onFinish && onFinish();
     push(link);
   };
 
@@ -234,7 +235,8 @@ EvaluationProgressContainer.propTypes = {
   messages: PropTypes.object,
   intl: PropTypes.object.isRequired,
   push: PropTypes.func.isRequired,
-  onUserClose: PropTypes.func
+  onUserClose: PropTypes.func,
+  onFinish: PropTypes.func
 };
 
 export default connect(

diff --git a/src/containers/ResubmitSolutionContainer/ResubmitSolutionContainer.js b/src/containers/ResubmitSolutionContainer/ResubmitSolutionContainer.js
@@ -3,22 +3,28 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import ResubmitSolution from '../../components/buttons/ResubmitSolution';
-import { resubmitSubmission } from '../../redux/modules/submissions';
+import {
+  resubmitSubmission,
+  fetchUsersSubmissions
+} from '../../redux/modules/submissions';
 import {
   isProcessing,
   getMonitorParams,
   getSubmissionId
 } from '../../redux/selectors/submission';
 import EvaluationProgressContainer from '../EvaluationProgressContainer';
 import withLinks from '../../hoc/withLinks';
+import { fetchSubmissionEvaluationsForSolution } from '../../redux/modules/submissionEvaluations';
 
 const ResubmitSolutionContainer = ({
   id,
   assignmentId,
+  userId,
   resubmit,
   monitor,
   isProcessing,
   newSubmissionId,
+  fetchSubmissions,
   isDebug = true,
   links: { SUBMISSION_DETAIL_URI_FACTORY }
 }) => {
@@ -29,6 +35,7 @@ const ResubmitSolutionContainer = ({
         isOpen={isProcessing}
         monitor={monitor}
         link={SUBMISSION_DETAIL_URI_FACTORY(assignmentId, newSubmissionId)}
+        onFinish={() => fetchSubmissions(userId)}
       />
     </span>
   );
@@ -43,7 +50,9 @@ ResubmitSolutionContainer.propTypes = {
   isProcessing: PropTypes.bool,
   newSubmissionId: PropTypes.string,
   links: PropTypes.object.isRequired,
-  isDebug: PropTypes.bool
+  isDebug: PropTypes.bool,
+  userId: PropTypes.string,
+  fetchSubmissions: PropTypes.func
 };
 
 const mapStateToProps = state => ({
@@ -52,8 +61,16 @@ const mapStateToProps = state => ({
   newSubmissionId: getSubmissionId(state)
 });
 
-const mapDispatchToProps = (dispatch, { id, isPrivate = false }) => ({
-  resubmit: isDebug => dispatch(resubmitSubmission(id, isPrivate, isDebug))
+const mapDispatchToProps = (
+  dispatch,
+  { id, isPrivate = false, assignmentId }
+) => ({
+  resubmit: isDebug => dispatch(resubmitSubmission(id, isPrivate, isDebug)),
+  fetchSubmissions: userId =>
+    Promise.all([
+      dispatch(fetchSubmissionEvaluationsForSolution(id)),
+      dispatch(fetchUsersSubmissions(userId, assignmentId))
+    ])
 });
 
 export default withLinks(

diff --git a/src/containers/SubmitSolutionContainer/SubmitSolutionContainer.js b/src/containers/SubmitSolutionContainer/SubmitSolutionContainer.js
@@ -101,6 +101,7 @@ class SubmitSolutionContainer extends Component {
             monitor={monitor}
             link={SUBMISSION_DETAIL_URI_FACTORY(id, submissionId)}
             onUserClose={fetchSubmissions}
+            onFinish={fetchSubmissions}
           />}
       </div>
     );

diff --git a/src/pages/Submission/Submission.js b/src/pages/Submission/Submission.js
@@ -122,11 +122,13 @@ class Submission extends Component {
                     id={submission.id}
                     assignmentId={assignment.id}
                     isDebug={false}
+                    userId={submission.solution.userId}
                   />
                   <ResubmitSolutionContainer
                     id={submission.id}
                     assignmentId={assignment.id}
                     isDebug={true}
+                    userId={submission.solution.userId}
                   />
                 </p>}
               <FetchManyResourceRenderer fetchManyStatus={fetchStatus}>