Fixing "access denied" visualization for locked-in students.

ReCodEx · May 21, 2024 · 416675e · 416675e
1 parent d61146d
commit 416675e
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git a/src/containers/App/App.js b/src/containers/App/App.js
@@ -33,7 +33,7 @@ import './recodex.css';
 
 library.add(regularIcons, solidIcons, brandIcons);
 
-const someStatusesFailed = (...statuses) =>
+const reloadIsRequired = (...statuses) =>
   statuses.includes(resourceStatus.FAILED) && !statuses.includes(resourceStatus.PENDING);
 
 class App extends Component {
@@ -66,27 +66,36 @@ class App extends Component {
   constructor() {
     super();
     this.isRefreshingToken = false;
+    this.reloadsCount = 0;
   }
 
   componentDidMount() {
     const hasCustomLoadGroups = pathHasCustomLoadGroups(this.props.location.pathname + this.props.location.search);
     this.props.loadAsync(this.props.userId, hasCustomLoadGroups);
+    this.reloadsCount = 0;
   }
 
   componentDidUpdate(prevProps) {
     this.checkAuthentication();
 
     const hadCustomLoadGroups = pathHasCustomLoadGroups(prevProps.location.pathname + prevProps.location.search);
     const hasCustomLoadGroups = pathHasCustomLoadGroups(this.props.location.pathname + this.props.location.search);
+
+    if (this.props.userId !== prevProps.userId || (hadCustomLoadGroups && !hasCustomLoadGroups)) {
+      this.reloadsCount = 0;
+    }
+
     if (
       this.props.userId !== prevProps.userId ||
       (hadCustomLoadGroups && !hasCustomLoadGroups) ||
-      someStatusesFailed(
-        this.props.fetchUserStatus,
-        !pathHasCustomLoadGroups && this.props.fetchManyGroupsStatus,
-        this.props.fetchManyUserInstancesStatus
-      )
+      (this.reloadsCount < 3 &&
+        reloadIsRequired(
+          this.props.fetchUserStatus,
+          !pathHasCustomLoadGroups && this.props.fetchManyGroupsStatus,
+          this.props.fetchManyUserInstancesStatus
+        ))
     ) {
+      this.reloadsCount++;
       this.props.loadAsync(this.props.userId, hasCustomLoadGroups);
     }
   }

diff --git a/src/pages/EditGroup/EditGroup.js b/src/pages/EditGroup/EditGroup.js
@@ -88,7 +88,7 @@ class EditGroup extends Component {
         title={<FormattedMessage id="app.editGroup.title" defaultMessage="Change Group Settings" />}>
         {group => (
           <div>
-            <GroupNavigation group={group} />
+            {group.privateData && <GroupNavigation group={group} />}
 
             {!hasOneOfPermissions(group, 'update', 'archive', 'remove', 'relocate') && (
               <Row>

diff --git a/src/pages/GroupAssignments/GroupAssignments.js b/src/pages/GroupAssignments/GroupAssignments.js
@@ -162,7 +162,7 @@ class GroupAssignments extends Component {
 
           return (
             <div>
-              <GroupNavigation group={data} emails={studentEmails || null} />
+              {data.privateData && <GroupNavigation group={data} emails={studentEmails || null} />}
 
               {canLeaveGroup && (
                 <div className="my-3">
@@ -183,7 +183,7 @@ class GroupAssignments extends Component {
                 </Row>
               )}
 
-              <GroupExamPending {...data} currentUser={currentUser} />
+              {data.privateData && <GroupExamPending {...data} currentUser={currentUser} />}
 
               {data.organizational && (
                 <Row>

diff --git a/src/pages/GroupExams/GroupExams.js b/src/pages/GroupExams/GroupExams.js
@@ -83,7 +83,7 @@ class GroupExams extends Component {
         title={<FormattedMessage id="app.groupExams.title" defaultMessage="Group Exam Terms" />}>
         {(group, currentUser) => (
           <div>
-            <GroupNavigation group={group} />
+            {group.privateData && <GroupNavigation group={group} />}
 
             <GroupArchivedWarning {...group} groupsDataAccessor={groupsAccessor} linkFactory={GROUP_EDIT_URI_FACTORY} />
 

diff --git a/src/pages/GroupInfo/GroupInfo.js b/src/pages/GroupInfo/GroupInfo.js
@@ -126,7 +126,7 @@ class GroupInfo extends Component {
         failed={<FailedGroupLoading />}>
         {(data, currentUser) => (
           <div>
-            <GroupNavigation group={data} />
+            {data.privateData && <GroupNavigation group={data} />}
 
             {!isAdmin &&
               !isSupervisor &&
@@ -137,7 +137,7 @@ class GroupInfo extends Component {
                 </div>
               )}
 
-            <GroupExamPending {...data} currentUser={currentUser} />
+            {data.privateData && <GroupExamPending {...data} currentUser={currentUser} />}
 
             <GroupArchivedWarning {...data} groupsDataAccessor={groupsAccessor} linkFactory={GROUP_INFO_URI_FACTORY} />
 

diff --git a/src/pages/GroupStudents/GroupStudents.js b/src/pages/GroupStudents/GroupStudents.js
@@ -153,7 +153,7 @@ class GroupStudents extends Component {
 
           return (
             <div>
-              <GroupNavigation group={data} emails={studentEmails || null} />
+              {data.privateData && <GroupNavigation group={data} emails={studentEmails || null} />}
 
               {canLeaveGroup && (
                 <div className="my-3">
@@ -174,7 +174,7 @@ class GroupStudents extends Component {
                 </Row>
               )}
 
-              {<GroupExamPending {...data} currentUser={loggedUser} />}
+              {data.privateData && <GroupExamPending {...data} currentUser={loggedUser} />}
 
               {data.organizational && (
                 <Row>

diff --git a/src/pages/GroupUserSolutions/GroupUserSolutions.js b/src/pages/GroupUserSolutions/GroupUserSolutions.js
@@ -394,9 +394,9 @@ class GroupUserSolutions extends Component {
         }>
         {(group, currentUser) => (
           <div>
-            <GroupNavigation group={group} userId={userId} />
+            {group.privateData && <GroupNavigation group={group} userId={userId} />}
 
-            <GroupExamPending {...group} currentUser={currentUser} />
+            {group.privateData && <GroupExamPending {...group} currentUser={currentUser} />}
 
             <GroupArchivedWarning
               {...group}