Add profile tooltip and change profile viewing logic to be more restrictive

Author: edwardneo

csm_web/frontend/src/components/UserProfile.tsx

@@ -159,6 +159,19 @@ const UserProfile: React.FC = () => {
   return (
     <div className="user-profile-page">
       <div className="user-profile-main">
+        {canEdit && (
+          <Tooltip
+            placement="bottom"
+            source={<InfoIcon className="icon user-tooltip-icon" />}
+            className="user-profile-tooltip"
+          >
+            <div>
+              Edit your profile so others can get to know you. <br /> <br />
+              Students: your profile is visible to mentors and coordinators. <br />
+              Mentors: your profile is publicly viewable.
+            </div>
+          </Tooltip>
+        )}
         {viewing ? (
           <>
             <div className="user-profile-viewing-header">
@@ -257,7 +270,11 @@ const UserProfile: React.FC = () => {
                 <label htmlFor="preferredName" className="form-label">
                   Preferred&nbsp;Name
                 </label>
-                <Tooltip placement="top" source={<InfoIcon className="icon" />} className="user-profile-tooltip">
+                <Tooltip
+                  placement="top"
+                  source={<InfoIcon className="icon user-tooltip-icon" />}
+                  className="user-profile-preferred-name-tooltip"
+                >
                   <div>
                     A blank name field will default to
                     <br />

csm_web/frontend/src/css/profile.scss

@@ -7,6 +7,7 @@
 }
 
 .user-profile-main {
+  position: relative;
   display: flex;
   flex-direction: column;
   gap: 0.5rem;
@@ -84,6 +85,27 @@
   width: 100%;
 }
 
+.user-profile-tooltip {
+  position: absolute;
+  top: 1rem;
+  right: 1rem;
+
+  display: inline-flex; // shrink to icon size
+  align-items: center;
+  justify-content: center;
+  width: auto;
+  height: auto;
+
+  .icon {
+    width: 1.25rem; // or whatever size you like
+    height: 1.25rem;
+  }
+}
+
+.user-tooltip-icon {
+  color: $csm-neutral;
+}
+
 .user-profile-input {
   display: flex;
   flex-direction: row;
@@ -154,7 +176,7 @@
   align-items: center;
 }
 
-.user-profile-tooltip {
+.user-profile-preferred-name-tooltip {
   flex: 0;
 }
 

csm_web/scheduler/views/user.py

@@ -128,6 +128,7 @@ def user_editable(request_user, target_user):
         coordinator_courses = Coordinator.objects.filter(user=request_user).values_list(
             "course", flat=True
         )
+        print(coordinator_courses)
         if Student.objects.filter(
             user=target_user, course__in=coordinator_courses
         ).exists():
@@ -150,35 +151,38 @@ def has_permission(request_user, target_user):
 
     # If the request_user can edit the target_user's profile, return True
     # This includes superusers, if the request_user is the target_user, or
-    # if the request_user is a coordinator or a course the target_user is in
+    # if the request_user is a coordinator of a course the target_user is in
     if user_editable(request_user, target_user):
         return True
 
     # If the target user is a mentor, return True
     if Mentor.objects.filter(user=target_user).exists():
         return True
 
+    ### For future use for students to contact other students in their section
     # If requestor is a student, get all the sections they are in
     # If the target user is a student in any of those sections, return True
-    if Student.objects.filter(user=request_user).exists():
-        if Student.objects.filter(user=target_user).exists():
-            request_user_sections = Student.objects.filter(
-                user=request_user
-            ).values_list("section", flat=True)
-            target_user_sections = Student.objects.filter(user=target_user).values_list(
-                "section", flat=True
-            )
-            if set(request_user_sections) & set(target_user_sections):
-                return True
-
-    # If requestor is a mentor, get all the courses they mentor
-    # If the target user is a student or mentor in any of those courses, return True
+    # if Student.objects.filter(user=request_user).exists():
+    #     if Student.objects.filter(user=target_user).exists():
+    #         request_user_sections = Student.objects.filter(
+    #             user=request_user
+    #         ).values_list("section", flat=True)
+    #         target_user_sections = Student.objects.filter(user=target_user).values_list(
+    #             "section", flat=True
+    #         )
+    #         if set(request_user_sections) & set(target_user_sections):
+    #             return True
+
+    # If requestor is a mentor, get all the sections they mentor
+    # If the target user is a student in any of those sections, return True
     if Mentor.objects.filter(user=request_user).exists():
-        mentor_courses = Mentor.objects.filter(user=request_user).values_list(
-            "course", flat=True
+        mentor_sections = Mentor.objects.filter(user=request_user).values_list(
+            "section", flat=True
         )
 
-        if Student.objects.filter(user=target_user, course__in=mentor_courses).exists():
+        if Student.objects.filter(
+            user=target_user, section__in=mentor_sections
+        ).exists():
             return True
 
     return False