Updating permission checks on group and assignment pages so that locked users are handled correctly.

Author: krulis-martin

src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js

@@ -177,6 +177,7 @@ class AssignmentsTable extends Component {
       isAdmin = false,
       showNames = true,
       showGroups = false,
+      noDiscussion = false,
       groupsAccessor = null,
       onlyCurrent = false,
       syncAssignment = null,
@@ -295,7 +296,7 @@ class AssignmentsTable extends Component {
                       showGroups={showGroups}
                       showSecondDeadline={showSecondDeadline}
                       groupsAccessor={groupsAccessor}
-                      discussionOpen={() => this.openDialog(assignment)}
+                      discussionOpen={noDiscussion ? null : () => this.openDialog(assignment)}
                       setSelected={multiActions ? this.selectAssignmentClickHandler(assignmentsPreprocessedAll) : null}
                       selected={Boolean(this.state.selectedAssignments[assignment.id])}
                       doubleClickPush={openOnDoubleclick ? navigate : null}
@@ -438,28 +439,30 @@ class AssignmentsTable extends Component {
           )}
         </UserUIDataContext.Consumer>
 
-        <Modal show={this.state.dialogAssignment !== null} backdrop="static" onHide={this.closeDialog} size="xl">
-          {this.state.dialogAssignment && (
-            <CommentThreadContainer
-              threadId={this.state.dialogAssignment.id}
-              title={
-                <>
-                  <FormattedMessage id="app.assignments.discussionModalTitle" defaultMessage="Public Discussion" />:{' '}
-                  <LocalizedExerciseName
-                    entity={{ name: '??', localizedTexts: this.state.dialogAssignment.localizedTexts }}
+        {!noDiscussion && (
+          <Modal show={this.state.dialogAssignment !== null} backdrop="static" onHide={this.closeDialog} size="xl">
+            {this.state.dialogAssignment && (
+              <CommentThreadContainer
+                threadId={this.state.dialogAssignment.id}
+                title={
+                  <>
+                    <FormattedMessage id="app.assignments.discussionModalTitle" defaultMessage="Public Discussion" />:{' '}
+                    <LocalizedExerciseName
+                      entity={{ name: '??', localizedTexts: this.state.dialogAssignment.localizedTexts }}
+                    />
+                  </>
+                }
+                additionalPublicSwitchNote={
+                  <FormattedMessage
+                    id="app.assignments.discussionModal.additionalSwitchNote"
+                    defaultMessage="(supervisors and students of this group)"
                   />
-                </>
-              }
-              additionalPublicSwitchNote={
-                <FormattedMessage
-                  id="app.assignments.discussionModal.additionalSwitchNote"
-                  defaultMessage="(supervisors and students of this group)"
-                />
-              }
-              displayAs="modal"
-            />
-          )}
-        </Modal>
+                }
+                displayAs="modal"
+              />
+            )}
+          </Modal>
+        )}
       </>
     );
   }
@@ -474,6 +477,7 @@ AssignmentsTable.propTypes = {
   isAdmin: PropTypes.bool,
   showNames: PropTypes.bool,
   showGroups: PropTypes.bool,
+  noDiscussion: PropTypes.bool,
   groupsAccessor: PropTypes.func,
   onlyCurrent: PropTypes.bool,
   syncAssignment: PropTypes.func,

src/components/Groups/GroupExamPending/GroupExamPending.js

@@ -1,14 +1,16 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
 
 import ExamLockButtonContainer from '../../../containers/ExamLockButtonContainer';
 import Callout from '../../widgets/Callout';
-import { InfoIcon, GroupExamsIcon } from '../../icons';
+import { InfoIcon, GroupExamsIcon, LinkIcon } from '../../icons';
 import DateTime from '../../widgets/DateTime';
 import Explanation from '../../widgets/Explanation';
 
 import { isStudentRole } from '../../helpers/usersRoles';
+import withLinks from '../../../helpers/withLinks';
 
 const REFRESH_INTERVAL = 1; // [s]
 
@@ -53,9 +55,24 @@ class GroupExamPending extends Component {
       currentUser: {
         privateData: { groupLock, isGroupLockStrict, ipLock, role },
       },
+      links: { GROUP_ASSIGNMENTS_URI_FACTORY },
     } = this.props;
     const isStudent = isStudentRole(role);
 
+    if (isStudent && groupLock && groupLock !== id) {
+      return (
+        <Callout variant="warning" icon={<GroupExamsIcon />}>
+          <FormattedMessage
+            id="app.groupExams.lockedElsewhere"
+            defaultMessage="You are already locked for an exam in a different group (you can see this group in a read-only mode now)."
+          />
+          <Link to={GROUP_ASSIGNMENTS_URI_FACTORY(groupLock)}>
+            <LinkIcon gapLeft className="text-primary" />
+          </Link>
+        </Callout>
+      );
+    }
+
     return (
       this.state.isExam && (
         <Callout variant={isStudent && !groupLock ? 'danger' : 'warning'} icon={<GroupExamsIcon />}>
@@ -254,6 +271,7 @@ GroupExamPending.propTypes = {
       role: PropTypes.string,
     }).isRequired,
   }),
+  links: PropTypes.object,
 };
 
-export default GroupExamPending;
+export default withLinks(GroupExamPending);

src/components/Groups/GroupsTree/GroupsTree.js

@@ -36,7 +36,7 @@ const defaultButtonsCreator = (
         </OverlayTrigger>
       )}
 
-      {hasPermissions(group, 'viewPublicDetail') && (
+      {hasPermissions(group, 'viewDetail') && (
         <OverlayTrigger
           placement="bottom"
           overlay={
@@ -52,7 +52,7 @@ const defaultButtonsCreator = (
         </OverlayTrigger>
       )}
 
-      {hasPermissions(group, 'viewDetail') && (
+      {hasPermissions(group, 'viewAssignments') && (
         <OverlayTrigger
           placement="bottom"
           overlay={

src/components/Solutions/SolutionDetail/SolutionDetail.js

@@ -22,6 +22,7 @@ import FailureReport from '../../SubmissionFailures/FailureReport';
 import Button from '../../widgets/TheButton';
 import Callout from '../../widgets/Callout';
 
+import { isStudentLocked } from '../../helpers/exams';
 import { safeGet, EMPTY_OBJ } from '../../../helpers/common';
 
 class SolutionDetail extends Component {
@@ -85,6 +86,7 @@ class SolutionDetail extends Component {
       canResubmit = false,
       assignmentSolversLoading,
       assignmentSolverSelector,
+      currentUser,
     } = this.props;
 
     const { openFileId, openFileName, openZipEntry, scoreDialogOpened } = this.state;
@@ -201,15 +203,17 @@ class SolutionDetail extends Component {
               />
             )}
 
-            <CommentThreadContainer
-              threadId={id}
-              additionalPublicSwitchNote={
-                <FormattedMessage
-                  id="app.solutionDetail.comments.additionalSwitchNote"
-                  defaultMessage="(author of the solution and supervisors of this group)"
-                />
-              }
-            />
+            {!isStudentLocked(currentUser) && (
+              <CommentThreadContainer
+                threadId={id}
+                additionalPublicSwitchNote={
+                  <FormattedMessage
+                    id="app.solutionDetail.comments.additionalSwitchNote"
+                    defaultMessage="(author of the solution and supervisors of this group)"
+                  />
+                }
+              />
+            )}
           </Col>
 
           {evaluations && (
@@ -311,6 +315,7 @@ SolutionDetail.propTypes = {
   assignmentSolverSelector: PropTypes.func.isRequired,
   assignment: PropTypes.object.isRequired,
   evaluations: PropTypes.object.isRequired,
+  currentUser: PropTypes.object.isRequired,
   runtimeEnvironments: PropTypes.array,
   editNote: PropTypes.func,
   deleteEvaluation: PropTypes.func,

src/components/helpers/exams.js

@@ -0,0 +1,23 @@
+/**
+ * Check whether given student (user) is locked in a group
+ * @param {Object} student being tested
+ * @param {string|null} groupId if null, any group lock is considered
+ * @param {number|null} now when the test is performed (unix ts), null = now
+ * @returns {Boolean} true if the student is locked in the group
+ */
+export const isStudentLocked = (student, groupId = null, now = null) => {
+  if (!student?.privateData?.groupLock) {
+    return false; // no lock
+  }
+
+  if (!now) {
+    now = Date.now() / 1000;
+  }
+
+  if (student?.privateData?.groupLockExpiration && student.privateData.groupLockExpiration < now) {
+    return false; // lock expired
+  }
+
+  // if groupId is set, only lock within that group counts
+  return groupId ? student.privateData.groupLock === groupId : true;
+};

src/containers/AssignmentsTableContainer/AssignmentsTableContainer.js

@@ -40,6 +40,7 @@ class AssignmentsTableContainer extends Component {
       stats,
       onlyCurrent = false,
       hideEmpty = false,
+      noDiscussion = false,
     } = this.props;
     return hideEmpty && assignments.size === 0 ? null : (
       <ResourceRenderer
@@ -60,6 +61,7 @@ class AssignmentsTableContainer extends Component {
               stats={userStats}
               statuses={userStats && userStats.assignments}
               onlyCurrent={onlyCurrent}
+              noDiscussion={noDiscussion}
             />
           );
         }}
@@ -73,6 +75,7 @@ AssignmentsTableContainer.propTypes = {
   userId: PropTypes.string,
   onlyCurrent: PropTypes.bool,
   hideEmpty: PropTypes.bool,
+  noDiscussion: PropTypes.bool,
   assignments: ImmutablePropTypes.list,
   assignmentEnvironmentsSelector: PropTypes.func,
   stats: ImmutablePropTypes.map,

src/pages/Assignment/Assignment.js

@@ -37,6 +37,7 @@ import {
   getAssignmentSolverSelector,
 } from '../../redux/selectors/solutions';
 import { loggedUserIsStudentOfSelector } from '../../redux/selectors/usersGroups';
+import { loggedInUserSelector } from '../../redux/selectors/users';
 
 import Page from '../../components/layout/Page';
 import { AssignmentNavigation } from '../../components/layout/Navigation';
@@ -53,6 +54,7 @@ import CommentThreadContainer from '../../containers/CommentThreadContainer';
 
 import LoadingSolutionsTable from '../../components/Assignments/SolutionsTable/LoadingSolutionsTable';
 import FailedLoadingSolutionsTable from '../../components/Assignments/SolutionsTable/FailedLoadingSolutionsTable';
+import { isStudentLocked } from '../../components/helpers/exams';
 import { hasPermissions } from '../../helpers/common';
 
 const getReason = ({ lockedReason }, locale) =>
@@ -96,6 +98,7 @@ class Assignment extends Component {
       submitting,
       userId,
       loggedInUserId,
+      currentUser,
       init,
       isStudentOf,
       canSubmit,
@@ -110,10 +113,10 @@ class Assignment extends Component {
 
     return (
       <Page
-        resource={assignment}
+        resource={[assignment, currentUser]}
         icon={<AssignmentIcon />}
         title={<FormattedMessage id="app.assignment.title" defaultMessage="Assignment Detail" />}>
-        {assignment => (
+        {(assignment, currentUser) => (
           <div>
             <AssignmentNavigation
               assignmentId={assignment.id}
@@ -261,21 +264,23 @@ class Assignment extends Component {
                       </Box>
                     )}
 
-                    <CommentThreadContainer
-                      threadId={assignment.id}
-                      title={
-                        <FormattedMessage
-                          id="app.assignments.discussionModalTitle"
-                          defaultMessage="Public Discussion"
-                        />
-                      }
-                      additionalPublicSwitchNote={
-                        <FormattedMessage
-                          id="app.assignments.discussionModal.additionalSwitchNote"
-                          defaultMessage="(supervisors and students of this group)"
-                        />
-                      }
-                    />
+                    {!isStudentLocked(currentUser) && (
+                      <CommentThreadContainer
+                        threadId={assignment.id}
+                        title={
+                          <FormattedMessage
+                            id="app.assignments.discussionModalTitle"
+                            defaultMessage="Public Discussion"
+                          />
+                        }
+                        additionalPublicSwitchNote={
+                          <FormattedMessage
+                            id="app.assignments.discussionModal.additionalSwitchNote"
+                            defaultMessage="(supervisors and students of this group)"
+                          />
+                        }
+                      />
+                    )}
                   </Col>
                 </Row>
               )}
@@ -290,6 +295,7 @@ class Assignment extends Component {
 Assignment.propTypes = {
   userId: PropTypes.string,
   loggedInUserId: PropTypes.string,
+  currentUser: ImmutablePropTypes.map,
   params: PropTypes.shape({
     assignmentId: PropTypes.string.isRequired,
     userId: PropTypes.string,
@@ -321,6 +327,7 @@ export default injectIntl(
         runtimeEnvironments: assignmentEnvironmentsSelector(state)(assignmentId),
         userId,
         loggedInUserId,
+        currentUser: loggedInUserSelector(state),
         isStudentOf: loggedUserIsStudentOfSelector(state),
         canSubmit: canSubmitSolution(assignmentId)(state),
         solutions: getUserSolutionsSortedData(state)(userId || loggedInUserId, assignmentId),

src/pages/Dashboard/Dashboard.js

@@ -183,7 +183,13 @@ class Dashboard extends Component {
                               }
                               unlimitedHeight>
                               <>
-                                <AssignmentsTableContainer userId={user.id} groupId={groupId} onlyCurrent hideEmpty />
+                                <AssignmentsTableContainer
+                                  userId={user.id}
+                                  groupId={groupId}
+                                  onlyCurrent
+                                  hideEmpty
+                                  noDiscussion
+                                />
                                 <ShadowAssignmentsTableContainer userId={user.id} groupId={groupId} hideEmpty />
                               </>
                             </Box>

src/pages/GroupAssignments/GroupAssignments.js

@@ -17,6 +17,7 @@ import ShadowAssignmentsTable from '../../components/Assignments/ShadowAssignmen
 import GroupArchivedWarning from '../../components/Groups/GroupArchivedWarning/GroupArchivedWarning';
 import GroupExamPending from '../../components/Groups/GroupExamPending';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
+import { isStudentLocked } from '../../components/helpers/exams';
 import LeaveJoinGroupButtonContainer from '../../containers/LeaveJoinGroupButtonContainer';
 import ExercisesListContainer from '../../containers/ExercisesListContainer';
 
@@ -220,6 +221,7 @@ class GroupAssignments extends Component {
                               stats={groupStats.find(item => item.userId === userId)}
                               userId={isGroupAdmin || isGroupSupervisor ? null : userId}
                               isAdmin={isGroupAdmin || isGroupSupervisor || isSuperadminRole(effectiveRole)}
+                              noDiscussion={isStudentLocked(currentUser)}
                             />
                           )}
                         </ResourceRenderer>