Display resubmission author and runtime environment on ReferenceSolutionDetail page

Author: Neloop

src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js

@@ -45,6 +45,7 @@ class ReferenceSolutionDetail extends Component {
       evaluations,
       deleteEvaluation = null,
       refreshSolutionEvaluations = null,
+      runtimeEnvironments,
     } = this.props;
     const { openFileId } = this.state;
     const evaluationsJS = evaluations && evaluations.toJS();
@@ -60,8 +61,15 @@ class ReferenceSolutionDetail extends Component {
           <Col md={6} sm={12}>
             <ReferenceSolutionStatus
               description={description}
-              solution={{ createdAt, userId }}
+              submittedAt={createdAt}
+              userId={userId}
+              submittedBy={submittedBy}
               exerciseId={exercise.id}
+              environment={
+                runtimeEnvironments &&
+                runtimeEnvironmentId &&
+                runtimeEnvironments.find(({ id }) => id === runtimeEnvironmentId)
+              }
             />
             <Row>
               {files.map(file => (
@@ -177,6 +185,7 @@ ReferenceSolutionDetail.propTypes = {
   evaluations: PropTypes.object.isRequired,
   deleteEvaluation: PropTypes.func,
   refreshSolutionEvaluations: PropTypes.func,
+  runtimeEnvironments: PropTypes.array,
 };
 
 export default ReferenceSolutionDetail;

src/components/ReferenceSolutions/ReferenceSolutionStatus/ReferenceSolutionStatus.js

@@ -8,11 +8,12 @@ import DateTime from '../../widgets/DateTime';
 import UsersNameContainer from '../../../containers/UsersNameContainer';
 import ExercisesNameContainer from '../../../containers/ExercisesNameContainer';
 import Icon, { EditIcon, CodeIcon } from '../../icons';
+import EnvironmentsListItem from '../../helpers/EnvironmentsList/EnvironmentsListItem';
 
-const ReferenceSolutionStatus = ({ description, solution: { userId, createdAt }, exerciseId }) => (
+const ReferenceSolutionStatus = ({ description, userId, submittedAt, submittedBy, exerciseId, environment }) => (
   <Box
     title={
-      <FormattedMessage id="app.referenceSolutionDetail.title.details" defaultMessage="Reference solution detail" />
+      <FormattedMessage id="app.referenceSolutionDetail.title.details" defaultMessage="Reference Solution Detail" />
     }
     noPadding={true}
     collapsable={true}
@@ -28,6 +29,7 @@ const ReferenceSolutionStatus = ({ description, solution: { userId, createdAt },
           </th>
           <td>{exerciseId && <ExercisesNameContainer exerciseId={exerciseId} />}</td>
         </tr>
+
         <tr>
           <td className="text-center">
             <EditIcon />
@@ -37,6 +39,7 @@ const ReferenceSolutionStatus = ({ description, solution: { userId, createdAt },
           </th>
           <td>{description}</td>
         </tr>
+
         <tr>
           <td className="text-center">
             <Icon icon={['far', 'clock']} />
@@ -45,9 +48,10 @@ const ReferenceSolutionStatus = ({ description, solution: { userId, createdAt },
             <FormattedMessage id="generic.uploadedAt" defaultMessage="Uploaded at" />:
           </th>
           <td>
-            <DateTime unixts={createdAt} showRelative />
+            <DateTime unixts={submittedAt} showRelative />
           </td>
         </tr>
+
         <tr>
           <td className="text-center">
             <Icon icon="user" />
@@ -59,18 +63,46 @@ const ReferenceSolutionStatus = ({ description, solution: { userId, createdAt },
             <UsersNameContainer userId={userId} />
           </td>
         </tr>
+
+        {Boolean(submittedBy) && submittedBy !== userId && (
+          <tr>
+            <td className="text-center">
+              <Icon icon="user" />
+            </td>
+            <th className="text-nowrap">
+              <FormattedMessage id="app.referenceSolution.reevaluatedBy" defaultMessage="Re-evaluated by" />:
+            </th>
+            <td>
+              <UsersNameContainer userId={submittedBy} showEmail="icon" />
+            </td>
+          </tr>
+        )}
+
+        {Boolean(environment) && Boolean(environment.name) && (
+          <tr>
+            <td className="text-center">
+              <CodeIcon />
+            </td>
+            <th className="text-nowrap">
+              <FormattedMessage id="app.solution.environment" defaultMessage="Target language:" />
+            </th>
+            <td>
+              <EnvironmentsListItem runtimeEnvironment={environment} longNames={true} />
+            </td>
+          </tr>
+        )}
       </tbody>
     </Table>
   </Box>
 );
 
 ReferenceSolutionStatus.propTypes = {
   description: PropTypes.string.isRequired,
-  solution: PropTypes.shape({
-    userId: PropTypes.string.isRequired,
-    createdAt: PropTypes.number.isRequired,
-  }).isRequired,
+  userId: PropTypes.string.isRequired,
+  submittedBy: PropTypes.string.isRequired,
+  submittedAt: PropTypes.number.isRequired,
   exerciseId: PropTypes.string.isRequired,
+  environment: PropTypes.object,
 };
 
 export default ReferenceSolutionStatus;

src/locales/cs.json

@@ -969,6 +969,7 @@
   "app.randomMessages.m9": "Nakreslit hrocha",
   "app.referenceSolution.exerciseBroken": "Úloha je rozbitá, a proto není v tuto chvíli možné nechat toto vzorové řešení znovu vyhodnotit.",
   "app.referenceSolution.exerciseNoLongerHasEnvironment": "Úloha již nepodporuje běhové prostředí, pod kterým bylo toto řešení odevzdáno. Řešení není možné znovu vyhodnotit.",
+  "app.referenceSolution.reevaluatedBy": "Nechal znovu vyhodnotit",
   "app.referenceSolutionDetail.exercise": "Úloha",
   "app.referenceSolutionDetail.title.details": "Detail referenčního řešení",
   "app.referenceSolutionTable.noDescription": "popis nebyl uveden",

src/locales/en.json

@@ -513,8 +513,8 @@
   "app.exercise.noReferenceSolutions": "There are no reference solutions for this exercise yet.",
   "app.exercise.overview": "Exercise overview",
   "app.exercise.referenceSolution.deleteConfirm": "Are you sure you want to delete the reference solution? This cannot be undone.",
-  "app.exercise.referenceSolutionDetail": "Reference solution detail",
-  "app.exercise.referenceSolutionTitle": "Reference solution overview",
+  "app.exercise.referenceSolutionDetail": "Reference Solution Detail",
+  "app.exercise.referenceSolutionTitle": "Reference Solution Overview",
   "app.exercise.referenceSolutionsBox": "Reference Solutions",
   "app.exercise.runtimes": "Runtime environments",
   "app.exercise.submitReferenceSoution": "Submit New Reference Solution",
@@ -969,8 +969,9 @@
   "app.randomMessages.m9": "Draw hippopotamus",
   "app.referenceSolution.exerciseBroken": "The exercise is broken. This reference solution may not be resubmitted at the moment.",
   "app.referenceSolution.exerciseNoLongerHasEnvironment": "The exercise no longer supports the environment for which this solution was evaluated. Resubmission is not possible.",
+  "app.referenceSolution.reevaluatedBy": "Re-evaluated by",
   "app.referenceSolutionDetail.exercise": "Exercise",
-  "app.referenceSolutionDetail.title.details": "Reference solution detail",
+  "app.referenceSolutionDetail.title.details": "Reference Solution Detail",
   "app.referenceSolutionTable.noDescription": "no description given",
   "app.registration.description": "Start using ReCodEx today",
   "app.registration.title": "Create a new ReCodEx account",

src/locales/whitelist_en.json

@@ -969,6 +969,7 @@
   "app.randomMessages.m9",
   "app.referenceSolution.exerciseBroken",
   "app.referenceSolution.exerciseNoLongerHasEnvironment",
+  "app.referenceSolution.reevaluatedBy",
   "app.referenceSolutionDetail.exercise",
   "app.referenceSolutionDetail.title.details",
   "app.referenceSolutionTable.noDescription",

src/pages/ReferenceSolution/ReferenceSolution.js

@@ -30,7 +30,7 @@ import { hasPermissions } from '../../helpers/common';
 const messages = defineMessages({
   title: {
     id: 'app.exercise.referenceSolutionTitle',
-    defaultMessage: 'Reference solution overview',
+    defaultMessage: 'Reference Solution Overview',
   },
 });
 
@@ -87,7 +87,7 @@ class ReferenceSolution extends Component {
           },
           {
             text: (
-              <FormattedMessage id="app.exercise.referenceSolutionDetail" defaultMessage="Reference solution detail" />
+              <FormattedMessage id="app.exercise.referenceSolutionDetail" defaultMessage="Reference Solution Detail" />
             ),
             iconName: ['far', 'gem'],
           },
@@ -129,6 +129,7 @@ class ReferenceSolution extends Component {
                       exercise={exercise}
                       deleteEvaluation={deleteEvaluation}
                       refreshSolutionEvaluations={refreshSolutionEvaluations}
+                      runtimeEnvironments={exercise.runtimeEnvironments}
                     />
                   )}
                 </FetchManyResourceRenderer>

src/redux/middleware/apiMiddleware.js

@@ -48,7 +48,6 @@ const lastLocation = {
   search: null,
 };
 
-
 const middleware = ({ dispatch, getState }) => next => action => {
   switch (action && action.type) {
     case CALL_API: