Interface for handling new "reviewed" flag of solutions. Refactoring "accepted" flag to use new universal set-flag API endpoint.

Author: Martin Krulis

src/components/Assignments/SolutionsTable/SolutionsTableRow.js

@@ -10,9 +10,10 @@ import Points from './Points';
 import EnvironmentsListItem from '../../helpers/EnvironmentsList/EnvironmentsListItem';
 import DeleteSolutionButtonContainer from '../../../containers/DeleteSolutionButtonContainer/DeleteSolutionButtonContainer';
 import AcceptSolutionContainer from '../../../containers/AcceptSolutionContainer';
+import ReviewSolutionContainer from '../../../containers/ReviewSolutionContainer';
 
 import CommentsIcon from './CommentsIcon';
-import { SendIcon } from '../../icons';
+import Icon, { SendIcon } from '../../icons';
 import DateTime from '../../widgets/DateTime';
 
 import withLinks from '../../../helpers/withLinks';
@@ -32,6 +33,7 @@ const SolutionsTableRow = ({
   actualPoints,
   solution: { createdAt },
   accepted = false,
+  reviewed = false,
   isBestSolution = false,
   runtimeEnvironment = null,
   commentsStats = null,
@@ -68,6 +70,22 @@ const SolutionsTableRow = ({
             accepted={accepted}
             isBestSolution={isBestSolution}
           />
+
+          {reviewed && (
+            <OverlayTrigger
+              placement="right"
+              overlay={
+                <Tooltip id={`reviewed-${id}`}>
+                  <FormattedMessage
+                    id="app.solutionsTable.reviewedTooltip"
+                    defaultMessage="The solution has been reviewed by the supervisor."
+                  />
+                </Tooltip>
+              }>
+              <Icon icon="stamp" className="text-muted" gapLeft={!splitOnTwoLines} />
+            </OverlayTrigger>
+          )}
+
           <CommentsIcon id={id} commentsStats={commentsStats} gapLeft={!splitOnTwoLines} />
         </td>
 
@@ -122,8 +140,11 @@ const SolutionsTableRow = ({
               <FormattedMessage id="generic.detail" defaultMessage="Detail" />
             </Link>
           )}
-          {permissionHints && permissionHints.setAccepted && (
-            <AcceptSolutionContainer id={id} locale={locale} shortLabel bsSize="xs" />
+          {permissionHints && permissionHints.setFlag && (
+            <React.Fragment>
+              <AcceptSolutionContainer id={id} locale={locale} shortLabel bsSize="xs" />
+              <ReviewSolutionContainer id={id} locale={locale} bsSize="xs" />
+            </React.Fragment>
           )}
           {permissionHints && permissionHints.delete && (
             <DeleteSolutionButtonContainer id={id} groupId={groupId} bsSize="xs" />
@@ -165,6 +186,7 @@ SolutionsTableRow.propTypes = {
     createdAt: PropTypes.number.isRequired,
   }),
   accepted: PropTypes.bool,
+  reviewed: PropTypes.bool,
   isBestSolution: PropTypes.bool,
   commentsStats: PropTypes.object,
   runtimeEnvironment: PropTypes.object,

src/components/Solutions/SolutionDetail/SolutionDetail.js

@@ -39,6 +39,7 @@ class SolutionDetail extends Component {
         bonusPoints,
         actualPoints,
         accepted,
+        reviewed,
         runtimeEnvironmentId,
         lastSubmission,
         permissionHints = EMPTY_OBJ,
@@ -72,6 +73,7 @@ class SolutionDetail extends Component {
               submittedBy={submittedBy}
               note={note}
               accepted={accepted}
+              reviewed={reviewed}
               assignment={assignment}
               actualPoints={actualPoints}
               maxPoints={maxPoints}
@@ -222,7 +224,8 @@ SolutionDetail.propTypes = {
     bonusPoints: PropTypes.number.isRequired,
     overriddenPoints: PropTypes.number,
     actualPoints: PropTypes.number,
-    accepted: PropTypes.bool,
+    accepted: PropTypes.bool.isRequired,
+    reviewed: PropTypes.bool.isRequired,
     runtimeEnvironmentId: PropTypes.string,
     permissionHints: PropTypes.object,
   }).isRequired,

src/components/Solutions/SolutionStatus/SolutionStatus.js

@@ -20,6 +20,7 @@ const SolutionStatus = ({
   submittedBy,
   note,
   accepted,
+  reviewed,
   environment,
   maxPoints,
   bonusPoints,
@@ -125,65 +126,44 @@ const SolutionStatus = ({
 
         <tr>
           <td className="text-center">
+            <AssignmentStatusIcon id={String(submittedAt)} status={evaluationStatus} accepted={accepted} />
+          </td>
+          <th className="text-nowrap">
+            <FormattedMessage id="app.solution.scoredPoints" defaultMessage="Final score" />:
+          </th>
+          <td
+            className={classnames({
+              'text-danger': actualPoints + bonusPoints <= 0,
+              'text-success': actualPoints + bonusPoints > 0,
+            })}>
             <b>
-              <AssignmentStatusIcon id={String(submittedAt)} status={evaluationStatus} accepted={accepted} />
+              {actualPoints || 0}
+              {bonusPoints !== 0 ? (bonusPoints >= 0 ? '+' : '') + bonusPoints : ''} / {maxPoints}
             </b>
           </td>
+        </tr>
+
+        <tr>
+          <td className="text-center">
+            <Icon icon="check-circle" />
+          </td>
           <th className="text-nowrap">
-            <FormattedMessage id="app.solution.lastEvaluationStatus" defaultMessage="Last evaluation status" />:
+            <FormattedMessage id="app.solution.acceptedAsFinal" defaultMessage="Accepted as final" />:
           </th>
           <td>
-            <em>
-              {evaluationStatus === 'done' && (
-                <FormattedMessage
-                  id="app.submission.evaluation.status.isCorrect"
-                  defaultMessage="The solution is correct and meets all criteria."
-                />
-              )}
-              {evaluationStatus === 'work-in-progress' && (
-                <FormattedMessage
-                  id="app.submission.evaluation.status.workInProgress"
-                  defaultMessage="The solution has not been evaluated yet."
-                />
-              )}
-              {evaluationStatus === 'failed' && (
-                <FormattedMessage
-                  id="app.submission.evaluation.status.failed"
-                  defaultMessage="The solution does not meet the defined criteria."
-                />
-              )}
-              {evaluationStatus === 'evaluation-failed' && (
-                <FormattedMessage
-                  id="app.submission.evaluation.status.systemFailiure"
-                  defaultMessage="Evaluation process failed and your submission could not have been evaluated. Please submit the solution once more. If you keep receiving errors please contact the administrator of this project."
-                />
-              )}
-              {evaluationStatus === 'missing-submission' && (
-                <FormattedMessage
-                  id="app.submission.evaluation.status.solutionMissingSubmission"
-                  defaultMessage="The solution was not submitted for evaluation. This was probably caused by an error in the assignment configuration."
-                />
-              )}
-            </em>
+            <SuccessOrFailureIcon success={accepted} />
           </td>
         </tr>
 
         <tr>
           <td className="text-center">
-            <Icon icon={['far', 'star']} />
+            <Icon icon="stamp" />
           </td>
           <th className="text-nowrap">
-            <FormattedMessage id="app.solution.scoredPoints" defaultMessage="Final score" />:
+            <FormattedMessage id="app.solution.reviewed" defaultMessage="Reviewed" />:
           </th>
-          <td
-            className={classnames({
-              'text-danger': actualPoints + bonusPoints <= 0,
-              'text-success': actualPoints + bonusPoints > 0,
-            })}>
-            <b>
-              {actualPoints || 0}
-              {bonusPoints !== 0 ? (bonusPoints >= 0 ? '+' : '') + bonusPoints : ''} / {maxPoints}
-            </b>
+          <td>
+            <SuccessOrFailureIcon success={reviewed} />
           </td>
         </tr>
       </tbody>
@@ -202,7 +182,8 @@ SolutionStatus.propTypes = {
   userId: PropTypes.string.isRequired,
   submittedBy: PropTypes.string,
   note: PropTypes.string,
-  accepted: PropTypes.bool,
+  accepted: PropTypes.bool.isRequired,
+  reviewed: PropTypes.bool.isRequired,
   environment: PropTypes.object,
   maxPoints: PropTypes.number.isRequired,
   bonusPoints: PropTypes.number.isRequired,

src/components/buttons/AcceptSolution/AcceptSolution.js

@@ -6,7 +6,7 @@ import Icon from '../../icons';
 
 const AcceptSolution = ({ accepted, acceptPending, accept, unaccept, shortLabel = false, bsSize = undefined }) =>
   accepted === true ? (
-    <Button bsStyle="info" bsSize={bsSize} onClick={unaccept} disabled={acceptPending}>
+    <Button bsStyle="warning" bsSize={bsSize} onClick={unaccept} disabled={acceptPending}>
       <Icon icon="check-circle" gapRight />
       {shortLabel ? (
         <FormattedMessage id="app.acceptSolution.acceptedShort" defaultMessage="Revoke" />
@@ -15,7 +15,7 @@ const AcceptSolution = ({ accepted, acceptPending, accept, unaccept, shortLabel
       )}
     </Button>
   ) : (
-    <Button bsStyle="primary" bsSize={bsSize} onClick={accept} disabled={acceptPending}>
+    <Button bsStyle="success" bsSize={bsSize} onClick={accept} disabled={acceptPending}>
       <Icon icon={['far', 'check-circle']} gapRight />
       {shortLabel ? (
         <FormattedMessage id="app.acceptSolution.notAcceptedShort" defaultMessage="Accept" />

src/components/buttons/ReviewSolution/ReviewSolution.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import Button from '../../widgets/FlatButton';
+import Icon from '../../icons';
+
+const ReviewSolution = ({ reviewed, reviewPending, setReviewed, unsetReviewed, bsSize = undefined }) =>
+  reviewed === true ? (
+    <Button bsStyle="info" bsSize={bsSize} onClick={unsetReviewed} disabled={reviewPending}>
+      <Icon icon="eraser" gapRight />
+      <FormattedMessage id="app.reviewedSolution.revoke" defaultMessage="Revoke Review" />
+    </Button>
+  ) : (
+    <Button bsStyle="primary" bsSize={bsSize} onClick={setReviewed} disabled={reviewPending}>
+      <Icon icon="stamp" gapRight />
+      <FormattedMessage id="app.reviewedSolution.set" defaultMessage="Review" />
+    </Button>
+  );
+
+ReviewSolution.propTypes = {
+  reviewed: PropTypes.bool.isRequired,
+  reviewPending: PropTypes.bool.isRequired,
+  setReviewed: PropTypes.func.isRequired,
+  unsetReviewed: PropTypes.func.isRequired,
+  bsSize: PropTypes.string,
+};
+
+export default ReviewSolution;

src/components/buttons/ReviewSolution/index.js

@@ -0,0 +1,2 @@
+import ReviewSolution from './ReviewSolution';
+export default ReviewSolution;

src/containers/AcceptSolutionContainer/AcceptedSolutionContainer.js

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import AcceptSolution from '../../components/buttons/AcceptSolution';
-import { acceptSolution, unacceptSolution } from '../../redux/modules/solutions';
-import { isAccepted, isAcceptPending } from '../../redux/selectors/solutions';
+import { setSolutionFlag } from '../../redux/modules/solutions';
+import { isAccepted, isSetFlagPending } from '../../redux/selectors/solutions';
 
 const AcceptSolutionContainer = ({ accepted, acceptPending, accept, unaccept, ...props }) => {
   return (
@@ -22,12 +22,12 @@ AcceptSolutionContainer.propTypes = {
 
 const mapStateToProps = (state, { id }) => ({
   accepted: isAccepted(id)(state),
-  acceptPending: isAcceptPending(id)(state),
+  acceptPending: isSetFlagPending(id, 'accepted')(state),
 });
 
 const mapDispatchToProps = (dispatch, { id }) => ({
-  accept: () => dispatch(acceptSolution(id)),
-  unaccept: () => dispatch(unacceptSolution(id)),
+  accept: () => dispatch(setSolutionFlag(id, 'accepted', true)),
+  unaccept: () => dispatch(setSolutionFlag(id, 'accepted', false)),
 });
 
 export default connect(

src/containers/ReviewSolutionContainer/ReviewSolutionContainer.js

@@ -0,0 +1,42 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+
+import ReviewSolution from '../../components/buttons/ReviewSolution';
+import { setSolutionFlag } from '../../redux/modules/solutions';
+import { isReviewed, isSetFlagPending } from '../../redux/selectors/solutions';
+
+const ReviewSolutionContainer = ({ reviewed, reviewPending, setReviewed, unsetReviewed, ...props }) => {
+  return (
+    <ReviewSolution
+      reviewed={reviewed}
+      reviewPending={reviewPending}
+      setReviewed={setReviewed}
+      unsetReviewed={unsetReviewed}
+      {...props}
+    />
+  );
+};
+
+ReviewSolutionContainer.propTypes = {
+  id: PropTypes.string.isRequired,
+  reviewed: PropTypes.bool.isRequired,
+  reviewPending: PropTypes.bool.isRequired,
+  setReviewed: PropTypes.func.isRequired,
+  unsetReviewed: PropTypes.func.isRequired,
+};
+
+const mapStateToProps = (state, { id }) => ({
+  reviewed: isReviewed(id)(state),
+  reviewPending: isSetFlagPending(id, 'reviewed')(state),
+});
+
+const mapDispatchToProps = (dispatch, { id }) => ({
+  setReviewed: () => dispatch(setSolutionFlag(id, 'reviewed', true)),
+  unsetReviewed: () => dispatch(setSolutionFlag(id, 'reviewed', false)),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ReviewSolutionContainer);

src/containers/ReviewSolutionContainer/index.js

@@ -0,0 +1,2 @@
+import ReviewSolutionContainer from './ReviewSolutionContainer';
+export default ReviewSolutionContainer;

src/locales/cs.json

@@ -1092,6 +1092,8 @@
   "app.resultsArchiveInfoBox.description": "Detailní logy a výpisy",
   "app.resultsArchiveInfoBox.title": "Archiv s výsledky",
   "app.resultsTable.total": "Celkem",
+  "app.reviewedSolution.revoke": "Zrušit revizi",
+  "app.reviewedSolution.set": "Revidovat",
   "app.roles.description.empoweredSupervisor": "Privilegovaná verze role vedoucího, která navíc přidává možnost vytvářet vlastní pipelines a použít tyto pipelines pro složitější konfigurace úloh.",
   "app.roles.description.student": "Student je nejméně privilegovanou rolí, která má práva nahlížet pouze do skupin jejichž je členem a v těchto skupinách odevzdávat řešení úloh.",
   "app.roles.description.superadmin": "Všemohoucí a vševidoucí uživatel, který může bez omezení provést cokoli v instancích, do kterých patří. Podobně jako root v linuxu nebo Q ve Startreku.",
@@ -1181,12 +1183,13 @@
   "app.sisSupervisor.sisGroupsCreate": "Zakládání skupin asociovaných s kurzy ze SISu UK",
   "app.sisSupervisor.sisGroupsCreateExplain": "SIS kurzy, které vyučujete v určitém semestru a které mají mapování do ReCodExu. Můžete vytvořit novou skupinu s vazbou na SIS, nebo svázat existující skupinu na tyto kurzy.",
   "app.sisSupervisor.yearTerm": "Rok a semestr:",
+  "app.solution.acceptedAsFinal": "Akceptováno jako finální",
   "app.solution.beforeFirstDeadline": "Před prvním termínem",
   "app.solution.beforeSecondDeadline": "Před druhým termínem",
   "app.solution.environment": "Cílový jazyk:",
   "app.solution.environmentNotAllowedCannotResubmit": "Zadaná úloha již nepodporuje běhové prostředí, pod kterým bylo toto řešení odevzdáno. Řešení není možné znovu vyhodnotit.",
-  "app.solution.lastEvaluationStatus": "Stav posledního vyhodnocení",
   "app.solution.note": "Poznámka:",
+  "app.solution.reviewed": "Revidováno",
   "app.solution.scoredPoints": "Výsledné body",
   "app.solution.submittedAt": "Odevzdáno",
   "app.solution.title": "Řešení",
@@ -1200,6 +1203,7 @@
   "app.solutionsTable.noSolutionsFound": "Zatím nebyla odevzdána žádná řešení.",
   "app.solutionsTable.note": "Poznámka",
   "app.solutionsTable.receivedPoints": "Body",
+  "app.solutionsTable.reviewedTooltip": "Řešení bylo posouzeno vedoucím.",
   "app.solutionsTable.rowsCount": "Celkem záznamů: {count}",
   "app.solutionsTable.solutionValidity": "Správnost",
   "app.solutionsTable.submissionDate": "Datum odevzdání",