Fixing leave button and links in archived groups for students.

ReCodEx · Jun 4, 2024 · dcb2160 · dcb2160
1 parent 7b3d09f
commit dcb2160
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/pages/GroupAssignments/GroupAssignments.js b/src/pages/GroupAssignments/GroupAssignments.js
@@ -147,8 +147,9 @@ class GroupAssignments extends Component {
           const canLeaveGroup =
             !isGroupAdmin &&
             !isGroupSupervisor &&
-            (data.public || (isGroupStudent && !data.privateData.detaining)) &&
-            !data.organizational;
+            !data.organizational &&
+            !data.archived &&
+            (data.public || (isGroupStudent && !data.privateData.detaining));
 
           const studentEmails =
             !data.organizational &&
@@ -201,7 +202,7 @@ class GroupAssignments extends Component {
               <GroupArchivedWarning
                 {...data}
                 groupsDataAccessor={groupsAccessor}
-                linkFactory={GROUP_ASSIGNMENTS_URI_FACTORY}
+                linkFactory={isGroupStudent ? null : GROUP_ASSIGNMENTS_URI_FACTORY}
               />
 
               {!data.organizational && hasPermissions(data, 'viewAssignments') && (

diff --git a/src/pages/GroupInfo/GroupInfo.js b/src/pages/GroupInfo/GroupInfo.js
@@ -136,16 +136,21 @@ class GroupInfo extends Component {
 
             {!isAdmin &&
               !isSupervisor &&
-              (data.public || (isStudent && !data.privateData.detaining)) &&
-              !data.organizational && (
+              !data.organizational &&
+              !data.archived &&
+              (data.public || (isStudent && !data.privateData.detaining)) && (
                 <div className="my-3">
                   <LeaveJoinGroupButtonContainer userId={userId} groupId={data.id} size={null} redirectAfterLeave />
                 </div>
               )}
 
             {data.privateData && <GroupExamPending {...data} currentUser={currentUser} />}
 
-            <GroupArchivedWarning {...data} groupsDataAccessor={groupsAccessor} linkFactory={GROUP_INFO_URI_FACTORY} />
+            <GroupArchivedWarning
+              {...data}
+              groupsDataAccessor={groupsAccessor}
+              linkFactory={isStudent ? null : GROUP_INFO_URI_FACTORY}
+            />
 
             {!hasPermissions(data, 'viewPublicDetail') && (
               <Row>

diff --git a/src/pages/GroupStudents/GroupStudents.js b/src/pages/GroupStudents/GroupStudents.js
@@ -138,8 +138,9 @@ class GroupStudents extends Component {
           const canLeaveGroup =
             !isGroupAdmin &&
             !isGroupSupervisor &&
-            (data.public || (isGroupStudent && !data.privateData.detaining)) &&
-            !data.organizational;
+            !data.organizational &&
+            !data.archived &&
+            (data.public || (isGroupStudent && !data.privateData.detaining));
 
           const studentEmails =
             !data.organizational &&
@@ -192,7 +193,7 @@ class GroupStudents extends Component {
               <GroupArchivedWarning
                 {...data}
                 groupsDataAccessor={groupsAccessor}
-                linkFactory={GROUP_STUDENTS_URI_FACTORY}
+                linkFactory={isGroupStudent ? null : GROUP_STUDENTS_URI_FACTORY}
               />
 
               {isStudentRole(effectiveRole) &&