From 9ea05a51e8dd05596458169720394a7db0524254 Mon Sep 17 00:00:00 2001
From: Petr Stefan <ptr.stef@gmail.com>
Date: Thu, 26 Oct 2017 17:08:03 +0200
Subject: [PATCH] Evaluation detail props reorganization

---
 .../EvaluationDetail/EvaluationDetail.js      | 23 ++-----
 .../ReferenceSolutionEvaluationDetail.js      | 19 +++---
 .../EvaluationDetail/EvaluationDetail.js      | 68 +++++++------------
 .../SubmissionDetail/SubmissionDetail.js      | 31 ++++-----
 4 files changed, 55 insertions(+), 86 deletions(-)

diff --git a/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js b/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js
index a6d03e145..2d7cba726 100644
--- a/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js
+++ b/src/components/ReferenceSolutions/EvaluationDetail/EvaluationDetail.js
@@ -12,7 +12,7 @@ import { Table } from 'react-bootstrap';
 import Box from '../../widgets/Box';
 import { MaybeSucceededIcon } from '../../icons';
 
-const EvaluationDetail = ({ evaluation, note = '' }) => (
+const EvaluationDetail = ({ evaluation, isCorrect }) =>
   <Box
     title={
       <FormattedMessage
@@ -40,18 +40,6 @@ const EvaluationDetail = ({ evaluation, note = '' }) => (
           </td>
         </tr>
 
-        <tr>
-          <th>
-            <FormattedMessage
-              id="app.evaluationDetail.isValid"
-              defaultMessage="Evaluation is valid:"
-            />
-          </th>
-          <td className="text-center">
-            <MaybeSucceededIcon success={evaluation.isValid} />
-          </td>
-        </tr>
-
         <tr>
           <th>
             <FormattedMessage
@@ -74,8 +62,8 @@ const EvaluationDetail = ({ evaluation, note = '' }) => (
           <td
             className={classnames({
               'text-center': true,
-              'text-danger': !evaluation.isCorrect,
-              'text-success': evaluation.isCorrect
+              'text-danger': !isCorrect,
+              'text-success': isCorrect
             })}
           >
             <b>
@@ -85,12 +73,11 @@ const EvaluationDetail = ({ evaluation, note = '' }) => (
         </tr>
       </tbody>
     </Table>
-  </Box>
-);
+  </Box>;
 
 EvaluationDetail.propTypes = {
   evaluation: PropTypes.object.isRequired,
-  note: PropTypes.string
+  isCorrect: PropTypes.bool.isRequired
 };
 
 export default EvaluationDetail;
diff --git a/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js b/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js
index 7827949e7..effa86b60 100644
--- a/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js
+++ b/src/components/ReferenceSolutions/ReferenceSolutionEvaluationDetail/ReferenceSolutionEvaluationDetail.js
@@ -33,7 +33,7 @@ class ReferenceSolutionEvaluationDetail extends Component {
               exerciseId={exerciseId}
             />
             <Row>
-              {referenceSolution.solution.files.map(file => (
+              {referenceSolution.solution.files.map(file =>
                 <Col lg={6} md={12} key={file.id}>
                   <a
                     href="#"
@@ -45,19 +45,21 @@ class ReferenceSolutionEvaluationDetail extends Component {
                     <SourceCodeInfoBox {...file} />
                   </a>
                 </Col>
-              ))}
+              )}
             </Row>
-            {solutionEvaluation.evaluation && (
+            {solutionEvaluation.evaluation &&
               <CompilationLogs
                 initiationOutputs={
                   solutionEvaluation.evaluation.initiationOutputs
                 }
-              />
-            )}
+              />}
           </Col>
-          {solutionEvaluation.evaluation && (
+          {solutionEvaluation.evaluation &&
             <Col lg={6} sm={12}>
-              <EvaluationDetail evaluation={solutionEvaluation.evaluation} />
+              <EvaluationDetail
+                evaluation={solutionEvaluation.evaluation}
+                isCorrect={solutionEvaluation.isCorrect}
+              />
 
               <TestResults
                 evaluation={solutionEvaluation.evaluation}
@@ -71,8 +73,7 @@ class ReferenceSolutionEvaluationDetail extends Component {
                   </a>
                 </Col>
               </Row>
-            </Col>
-          )}
+            </Col>}
         </Row>
 
         <SourceCodeViewerContainer
diff --git a/src/components/Submissions/EvaluationDetail/EvaluationDetail.js b/src/components/Submissions/EvaluationDetail/EvaluationDetail.js
index d99ebde9f..45c9234ad 100644
--- a/src/components/Submissions/EvaluationDetail/EvaluationDetail.js
+++ b/src/components/Submissions/EvaluationDetail/EvaluationDetail.js
@@ -17,10 +17,10 @@ import BonusPoints from '../../Assignments/SubmissionsTable/BonusPoints';
 const EvaluationDetail = ({
   assignment: { firstDeadline, allowSecondDeadline, secondDeadline },
   evaluation,
-  note = '',
+  isCorrect,
   submittedAt,
   maxPoints
-}) => (
+}) =>
   <Box
     title={
       <FormattedMessage
@@ -56,40 +56,25 @@ const EvaluationDetail = ({
             />
           </th>
           <td className="text-center">
-            {submittedAt < firstDeadline ? (
-              <Icon name="check" className="text-success" />
-            ) : (
-              <Icon name="times" className="text-danger" />
-            )}
+            {submittedAt < firstDeadline
+              ? <Icon name="check" className="text-success" />
+              : <Icon name="times" className="text-danger" />}
           </td>
         </tr>
 
         {submittedAt >= firstDeadline &&
-          allowSecondDeadline === true && (
-            <tr>
-              <th>
-                <FormattedMessage
-                  id="app.evaluationDetail.beforeSecondDeadline"
-                  defaultMessage="Was submitted before the second deadline:"
-                />
-              </th>
-              <td className="text-center">
-                <MaybeSucceededIcon success={submittedAt < secondDeadline} />
-              </td>
-            </tr>
-          )}
-
-        <tr>
-          <th>
-            <FormattedMessage
-              id="app.evaluationDetail.isValid"
-              defaultMessage="Evaluation is valid:"
-            />
-          </th>
-          <td className="text-center">
-            <MaybeSucceededIcon success={evaluation.isValid} />
-          </td>
-        </tr>
+          allowSecondDeadline === true &&
+          <tr>
+            <th>
+              <FormattedMessage
+                id="app.evaluationDetail.beforeSecondDeadline"
+                defaultMessage="Was submitted before the second deadline:"
+              />
+            </th>
+            <td className="text-center">
+              <MaybeSucceededIcon success={submittedAt < secondDeadline} />
+            </td>
+          </tr>}
 
         <tr>
           <th>
@@ -113,8 +98,8 @@ const EvaluationDetail = ({
           <td
             className={classnames({
               'text-center': true,
-              'text-danger': !evaluation.isCorrect,
-              'text-success': evaluation.isCorrect
+              'text-danger': !isCorrect,
+              'text-success': isCorrect
             })}
           >
             <b>
@@ -142,7 +127,7 @@ const EvaluationDetail = ({
             {evaluation.points}/{maxPoints}
           </td>
         </tr>
-        {evaluation.bonusPoints !== 0 && (
+        {evaluation.bonusPoints !== 0 &&
           <tr>
             <th>
               <FormattedMessage
@@ -153,9 +138,8 @@ const EvaluationDetail = ({
             <td className="text-center">
               <BonusPoints bonus={evaluation.bonusPoints} />
             </td>
-          </tr>
-        )}
-        {evaluation.bonusPoints !== 0 && (
+          </tr>}
+        {evaluation.bonusPoints !== 0 &&
           <tr>
             <th>
               <FormattedMessage
@@ -178,12 +162,10 @@ const EvaluationDetail = ({
                 {evaluation.points + evaluation.bonusPoints}/{maxPoints}
               </b>
             </td>
-          </tr>
-        )}
+          </tr>}
       </tbody>
     </Table>
-  </Box>
-);
+  </Box>;
 
 EvaluationDetail.propTypes = {
   assignment: PropTypes.shape({
@@ -191,7 +173,7 @@ EvaluationDetail.propTypes = {
     allowSecondDeadline: PropTypes.bool.isRequired,
     secondDeadline: PropTypes.number
   }).isRequired,
-  note: PropTypes.string,
+  isCorrect: PropTypes.bool.isRequired,
   submittedAt: PropTypes.number.isRequired,
   evaluation: PropTypes.object,
   maxPoints: PropTypes.number.isRequired
diff --git a/src/components/Submissions/SubmissionDetail/SubmissionDetail.js b/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
index c6335b5e5..ea01ac235 100644
--- a/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
+++ b/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
@@ -32,7 +32,8 @@ class SubmissionDetail extends Component {
         evaluation,
         accepted,
         originalSubmissionId,
-        runtimeEnvironmentId
+        runtimeEnvironmentId,
+        isCorrect
       },
       assignment,
       isSupervisor
@@ -54,7 +55,7 @@ class SubmissionDetail extends Component {
               assignmentId={assignment.id}
             />
             <Row>
-              {files.map(file => (
+              {files.map(file =>
                 <Col lg={6} md={12} key={file.id}>
                   <a
                     href="#"
@@ -66,46 +67,43 @@ class SubmissionDetail extends Component {
                     <SourceCodeInfoBox {...file} />
                   </a>
                 </Col>
-              ))}
+              )}
             </Row>
-            {evaluation && (
+            {evaluation &&
               <CompilationLogs
                 initiationOutputs={evaluation.initiationOutputs}
-              />
-            )}
+              />}
             <CommentThreadContainer threadId={id} />
           </Col>
 
-          {evaluation && (
+          {evaluation &&
             <Col md={6} sm={12}>
               <EvaluationDetail
                 assignment={assignment}
                 evaluation={evaluation}
                 submittedAt={submittedAt}
                 maxPoints={maxPoints}
+                isCorrect={isCorrect}
               />
 
-              {isSupervisor && (
+              {isSupervisor &&
                 <BonusPointsContainer
                   submissionId={id}
                   evaluation={evaluation}
-                />
-              )}
+                />}
 
               <TestResults
                 evaluation={evaluation}
                 runtimeEnvironmentId={runtimeEnvironmentId}
               />
 
-              {isSupervisor && (
+              {isSupervisor &&
                 <Row>
                   <Col lg={6} md={12}>
                     <DownloadResultArchiveContainer submissionId={id} />
                   </Col>
-                </Row>
-              )}
-            </Col>
-          )}
+                </Row>}
+            </Col>}
         </Row>
 
         <SourceCodeViewerContainer
@@ -130,7 +128,8 @@ SubmissionDetail.propTypes = {
     maxPoints: PropTypes.number.isRequired,
     files: PropTypes.array,
     originalSubmissionId: PropTypes.string,
-    runtimeEnvironmentId: PropTypes.string
+    runtimeEnvironmentId: PropTypes.string,
+    isCorrect: PropTypes.bool
   }).isRequired,
   assignment: PropTypes.object.isRequired,
   isSupervisor: PropTypes.bool