Showing the lockedReason from can-submit endpoint if the submissions …

…are locked out.
ReCodEx · Oct 29, 2023 · f233473 · f233473
1 parent 73b474d
commit f233473
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 61 deletions.
diff --git a/src/locales/cs.json b/src/locales/cs.json
@@ -175,6 +175,8 @@
   "app.assignments.hideAllButton": "Skrýt studentům",
   "app.assignments.hidePastAssignments": "Celkem {count} {count, plural, one {zadaná úloha má} =2 {zadané úlohy mají} =3 {zadané úlohy mají} =4 {zadané úlohy mají} other {zadaných úloh má}} termín v minulosti. <a>Skrýt staré úlohy.</a>",
   "app.assignments.invertSelection": "Invertovat",
+  "app.assignments.lockedSubmissions.reason": "Důvod",
+  "app.assignments.lockedSubmissions.title": "Odevzdávání řešení je v tuto chvíli zablokováno",
   "app.assignments.maxPoints": "Maximum bodů",
   "app.assignments.maxPointsShort": "Max. bodů",
   "app.assignments.name": "Název zadání",

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -175,6 +175,8 @@
   "app.assignments.hideAllButton": "Set Hidden",
   "app.assignments.hidePastAssignments": "Total {count} {count, plural, one {assignment} other {assignments}} {count, plural, one {is past its} other {are past their}} deadline. <a>Hide old assignments.</a>",
   "app.assignments.invertSelection": "Invert",
+  "app.assignments.lockedSubmissions.reason": "Reason",
+  "app.assignments.lockedSubmissions.title": "Submissions are currently locked out",
   "app.assignments.maxPoints": "Max. Points",
   "app.assignments.maxPointsShort": "Max. points",
   "app.assignments.name": "Assignment name",

diff --git a/src/pages/Assignment/Assignment.js b/src/pages/Assignment/Assignment.js
@@ -2,11 +2,12 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Col, Row } from 'react-bootstrap';
 
 import Box from '../../components/widgets/Box';
 import Callout from '../../components/widgets/Callout';
+import OptionalPopoverWrapper from '../../components/widgets/OptionalPopoverWrapper';
 
 import { fetchAssignmentIfNeeded, syncWithExercise } from '../../redux/modules/assignments';
 import { canSubmit } from '../../redux/modules/canSubmit';
@@ -54,6 +55,11 @@ import LoadingSolutionsTable from '../../components/Assignments/SolutionsTable/L
 import FailedLoadingSolutionsTable from '../../components/Assignments/SolutionsTable/FailedLoadingSolutionsTable';
 import { hasPermissions } from '../../helpers/common';
 
+const getReason = ({ lockedReason }, locale) =>
+  typeof lockedReason === 'object'
+    ? lockedReason[locale] || lockedReason.en || Object.values(lockedReason)[0] || 'Reason unknown.'
+    : lockedReason;
+
 class Assignment extends Component {
   static loadAsync = ({ assignmentId }, dispatch, { userId }) =>
     Promise.all([
@@ -99,6 +105,7 @@ class Assignment extends Component {
       fetchManyStatus,
       assignmentSolversLoading,
       assignmentSolverSelector,
+      intl: { locale },
     } = this.props;
 
     return (
@@ -179,21 +186,50 @@ class Assignment extends Component {
                         <p className="text-center">
                           <ResourceRenderer loading={<SubmitSolutionButton disabled={true} />} resource={canSubmit}>
                             {canSubmitObj => (
-                              <SubmitSolutionButton onClick={init(assignment.id)} disabled={!canSubmitObj.canSubmit} />
+                              <OptionalPopoverWrapper
+                                container={this}
+                                popoverId={`submit-locked-${assignment.id}`}
+                                placement="bottom"
+                                hide={!canSubmitObj.lockedReason}
+                                title={
+                                  <FormattedMessage
+                                    id="app.assignments.lockedSubmissions.title"
+                                    defaultMessage="Submissions are currently locked out"
+                                  />
+                                }
+                                contents={
+                                  <>
+                                    <strong>
+                                      <FormattedMessage
+                                        id="app.assignments.lockedSubmissions.reason"
+                                        defaultMessage="Reason"
+                                      />
+                                      :
+                                    </strong>{' '}
+                                    {getReason(canSubmitObj, locale)}
+                                  </>
+                                }>
+                                <SubmitSolutionButton
+                                  onClick={init(assignment.id)}
+                                  disabled={!canSubmitObj.canSubmit}
+                                />
+                              </OptionalPopoverWrapper>
                             )}
                           </ResourceRenderer>
                         </p>
-                        <SubmitSolutionContainer
-                          userId={loggedInUserId}
-                          id={assignment.id}
-                          onSubmit={submitSolution}
-                          presubmitValidation={presubmitSolution}
-                          afterEvaluationStarts={this.reloadAfterSubmit}
-                          onReset={init}
-                          isOpen={submitting}
-                          solutionFilesLimit={assignment.solutionFilesLimit}
-                          solutionSizeLimit={assignment.solutionSizeLimit}
-                        />
+                        {canSubmitObj.canSubmit && (
+                          <SubmitSolutionContainer
+                            userId={loggedInUserId}
+                            id={assignment.id}
+                            onSubmit={submitSolution}
+                            presubmitValidation={presubmitSolution}
+                            afterEvaluationStarts={this.reloadAfterSubmit}
+                            onReset={init}
+                            isOpen={submitting}
+                            solutionFilesLimit={assignment.solutionFilesLimit}
+                            solutionSizeLimit={assignment.solutionSizeLimit}
+                          />
+                        )}
                       </div>
                     )}
 
@@ -272,30 +308,33 @@ Assignment.propTypes = {
   assignmentSolverSelector: PropTypes.func.isRequired,
   reloadCanSubmit: PropTypes.func.isRequired,
   reloadSolvers: PropTypes.func.isRequired,
+  intl: PropTypes.object.isRequired,
 };
 
-export default connect(
-  (state, { params: { assignmentId, userId = null } }) => {
-    const loggedInUserId = loggedInUserIdSelector(state);
-    return {
-      assignment: getAssignment(state, assignmentId),
-      submitting: isSubmitting(state),
-      runtimeEnvironments: assignmentEnvironmentsSelector(state)(assignmentId),
-      userId,
-      loggedInUserId,
-      isStudentOf: loggedUserIsStudentOfSelector(state),
-      canSubmit: canSubmitSolution(assignmentId)(state),
-      solutions: getUserSolutionsSortedData(state)(userId || loggedInUserId, assignmentId),
-      fetchManyStatus: fetchManyUserSolutionsStatus(state)(userId || loggedInUserId, assignmentId),
-      assignmentSolversLoading: isAssignmentSolversLoading(state),
-      assignmentSolverSelector: getAssignmentSolverSelector(state),
-    };
-  },
-  (dispatch, { params: { assignmentId } }) => ({
-    init: userId => () => dispatch(init(userId, assignmentId)),
-    loadAsync: userId => Assignment.loadAsync({ assignmentId }, dispatch, { userId }),
-    exerciseSync: () => dispatch(syncWithExercise(assignmentId)),
-    reloadCanSubmit: () => dispatch(canSubmit(assignmentId)),
-    reloadSolvers: (assignmentId, userId) => dispatch(fetchAssignmentSolvers({ assignmentId, userId })),
-  })
-)(Assignment);
+export default injectIntl(
+  connect(
+    (state, { params: { assignmentId, userId = null } }) => {
+      const loggedInUserId = loggedInUserIdSelector(state);
+      return {
+        assignment: getAssignment(state, assignmentId),
+        submitting: isSubmitting(state),
+        runtimeEnvironments: assignmentEnvironmentsSelector(state)(assignmentId),
+        userId,
+        loggedInUserId,
+        isStudentOf: loggedUserIsStudentOfSelector(state),
+        canSubmit: canSubmitSolution(assignmentId)(state),
+        solutions: getUserSolutionsSortedData(state)(userId || loggedInUserId, assignmentId),
+        fetchManyStatus: fetchManyUserSolutionsStatus(state)(userId || loggedInUserId, assignmentId),
+        assignmentSolversLoading: isAssignmentSolversLoading(state),
+        assignmentSolverSelector: getAssignmentSolverSelector(state),
+      };
+    },
+    (dispatch, { params: { assignmentId } }) => ({
+      init: userId => () => dispatch(init(userId, assignmentId)),
+      loadAsync: userId => Assignment.loadAsync({ assignmentId }, dispatch, { userId }),
+      exerciseSync: () => dispatch(syncWithExercise(assignmentId)),
+      reloadCanSubmit: () => dispatch(canSubmit(assignmentId)),
+      reloadSolvers: (assignmentId, userId) => dispatch(fetchAssignmentSolvers({ assignmentId, userId })),
+    })
+  )(Assignment)
+);
diff --git a/src/pages/Solution/Solution.js b/src/pages/Solution/Solution.js
@@ -206,29 +206,28 @@ class Solution extends Component {
               )}
 
               {isStudent && (
-                <Row>
-                  <Col xs={12} className="mb-3 text-right">
-                    <ResourceRenderer loading={<SubmitSolutionButton disabled={true} />} resource={canSubmit}>
-                      {canSubmitObj => (
-                        <SubmitSolutionButton
-                          onClick={initCanSubmit(assignment.id)}
-                          disabled={!canSubmitObj.canSubmit}
-                        />
-                      )}
-                    </ResourceRenderer>
-                    <SubmitSolutionContainer
-                      userId={loggedInUserId}
-                      id={assignment.id}
-                      onSubmit={submitSolution}
-                      presubmitValidation={presubmitSolution}
-                      afterEvaluationStarts={reloadCanSubmit}
-                      onReset={initCanSubmit}
-                      isOpen={submitting}
-                      solutionFilesLimit={assignment.solutionFilesLimit}
-                      solutionSizeLimit={assignment.solutionSizeLimit}
-                    />
-                  </Col>
-                </Row>
+                <ResourceRenderer resource={canSubmit}>
+                  {canSubmitObj =>
+                    canSubmitObj.canSubmit && (
+                      <Row>
+                        <Col xs={12} className="mb-3 text-right">
+                          <SubmitSolutionButton onClick={initCanSubmit(assignment.id)} />
+                          <SubmitSolutionContainer
+                            userId={loggedInUserId}
+                            id={assignment.id}
+                            onSubmit={submitSolution}
+                            presubmitValidation={presubmitSolution}
+                            afterEvaluationStarts={reloadCanSubmit}
+                            onReset={initCanSubmit}
+                            isOpen={submitting}
+                            solutionFilesLimit={assignment.solutionFilesLimit}
+                            solutionSizeLimit={assignment.solutionSizeLimit}
+                          />
+                        </Col>
+                      </Row>
+                    )
+                  }
+                </ResourceRenderer>
               )}
 
               {hasPermissions(solution, 'review') &&