From b9cebc5588ab70ee77248dab94775970f12dc5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <joel.sikstrom.5676@student.uu.se>
Date: Mon, 16 Oct 2023 15:53:57 +0200
Subject: [PATCH] Renamed ClaimedBy to UserProfile and added it to student
 profiles.

---
 src/components/claimedBy/index.ts                   |  2 --
 .../demonstrateTable/DemonstrateTableStudent.tsx    |  4 ++--
 .../demonstrateTable/DemonstrateTableTeacher.tsx    | 13 ++++++++-----
 src/components/help/helpTable/HelpTableStudent.tsx  |  4 ++--
 src/components/help/helpTable/HelpTableTeacher.tsx  | 13 ++++++++-----
 .../ClaimedBy.tsx => userProfile/UserProfile.tsx}   | 12 ++++++------
 src/components/userProfile/index.ts                 |  2 ++
 7 files changed, 28 insertions(+), 22 deletions(-)
 delete mode 100644 src/components/claimedBy/index.ts
 rename src/components/{claimedBy/ClaimedBy.tsx => userProfile/UserProfile.tsx} (68%)
 create mode 100644 src/components/userProfile/index.ts

diff --git a/src/components/claimedBy/index.ts b/src/components/claimedBy/index.ts
deleted file mode 100644
index 02dd01b..0000000
--- a/src/components/claimedBy/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import ClaimedBy from "./ClaimedBy";
-export default ClaimedBy;
\ No newline at end of file
diff --git a/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableStudent.tsx b/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableStudent.tsx
index 5fbac2c..dec0ac7 100644
--- a/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableStudent.tsx
+++ b/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableStudent.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { Skeleton6row3column } from "../../../constantTemplates/SkeletonTable";
 import { AchievementsResponse } from "../../../models/AchievementsResponse";
 import { User } from "../../../models/User";
-import ClaimedBy from "../../claimedBy";
+import UserProfile from "../../userProfile";
 import GenericTable from "../../genericTable/GenericTable";
 import PassedTime from "../../passedTime";
 import { withUser } from "../../userContext";
@@ -75,7 +75,7 @@ function DemonstrateTableStudent(props: DemonstrateTableProps & EContextValue) {
               <PassedTime date={row.time} />
             </TableCell>
             <TableCell align="left">
-              {row.examiner ? <ClaimedBy examiner={row.examiner} /> : <p></p>}
+              {row.examiner ? <UserProfile user={row.examiner} /> : <p></p>}
             </TableCell>
           </TableRow>
         );
diff --git a/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableTeacher.tsx b/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableTeacher.tsx
index 9bb415c..e5576a9 100644
--- a/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableTeacher.tsx
+++ b/src/components/demonstrateGoal/demonstrateTable/DemonstrateTableTeacher.tsx
@@ -16,7 +16,7 @@ import { DemonstrateRequest } from "../../../models/DemonstrateRequest";
 import { User } from "../../../models/User";
 import axios from "../../../utils/axios";
 import AchievementHoverLabel from "../../achievementHoverLabel";
-import ClaimedBy from "../../claimedBy";
+import UserProfile from "../../userProfile";
 import GenericTable from "../../genericTable";
 import GradeStudent, { SelectedDemonstration } from "../../gradeStudent/GradeStudent";
 import PassedTime from "../../passedTime";
@@ -141,16 +141,19 @@ function DemonstrateTableTeacher(props: DemonstrateTableProps & EContextValue) {
         return (
           <TableRow key={row.id} style={highlight}>
             <TableCell align="left" className={classes.cell}>
-              {row.submitters
-                .map((user) => user.firstName + " " + user.lastName)
-                .join(", ")}
+              {row.submitters.map((submitter, index) => (
+                <span key={index} style={{ display: "inline-block", marginRight: "5px" }}>
+                  <UserProfile user={submitter} />
+                  {index !== row.submitters.length - 1 && ", "}
+                </span>
+              ))}
             </TableCell>
             <TableCell align="left" className={classes.timeCell}>
               <PassedTime date={row.time} />
             </TableCell>
             <TableCell className={classes.optionalColumn} align="left">
               {row.examiner ? (
-                <ClaimedBy examiner={row.examiner} />
+                <UserProfile user={row.examiner} />
               ) : (
                   <p></p>
                 )}
diff --git a/src/components/help/helpTable/HelpTableStudent.tsx b/src/components/help/helpTable/HelpTableStudent.tsx
index 295c191..761a789 100644
--- a/src/components/help/helpTable/HelpTableStudent.tsx
+++ b/src/components/help/helpTable/HelpTableStudent.tsx
@@ -4,7 +4,7 @@ import TableRow from "@material-ui/core/TableRow";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Skeleton6row3column } from "../../../constantTemplates/SkeletonTable";
-import ClaimedBy from "../../claimedBy";
+import UserProfile from "../../userProfile";
 import GenericTable from "../../genericTable";
 import { withUser } from "../../userContext";
 import { EContextValue } from "../../userContext/UserContext";
@@ -63,7 +63,7 @@ function HelpTableStudent(props: HelpTableProps & EContextValue) {
             <PassedTime date={row.requestTime}/>
             </TableCell>
             <TableCell align="left">
-              {row.helper ? <ClaimedBy examiner={row.helper} /> : <p></p>}
+              {row.helper ? <UserProfile user={row.helper} /> : <p></p>}
             </TableCell>
           </TableRow>
         );
diff --git a/src/components/help/helpTable/HelpTableTeacher.tsx b/src/components/help/helpTable/HelpTableTeacher.tsx
index 42717b6..1f07638 100644
--- a/src/components/help/helpTable/HelpTableTeacher.tsx
+++ b/src/components/help/helpTable/HelpTableTeacher.tsx
@@ -14,7 +14,7 @@ import { Skeleton6row7column } from "../../../constantTemplates/SkeletonTable";
 import { HelpRequest } from "../../../models/HelpRequest";
 import axios from "../../../utils/axios";
 import LinkifyText from "../../../utils/linkify";
-import ClaimedBy from "../../claimedBy";
+import UserProfile from "../../userProfile";
 import GenericTable from "../../genericTable";
 import PassedTime from "../../passedTime";
 import { SafeButton } from "../../safeButton/SafeButton";
@@ -120,9 +120,12 @@ function HelpTableTeacher(props: HelpTableProps & EContextValue) {
         return (
           <TableRow key={row.id} style={highlight}>
             <TableCell align="left" className={classes.cell}>
-              {row.submitters
-                .map((user) => user.firstName + " " + user.lastName)
-                .join(", ")}
+              {row.submitters.map((submitter, index) => (
+                <span key={index} style={{ display: "inline-block", marginRight: "5px" }}>
+                  <UserProfile user={submitter} />
+                  {index !== row.submitters.length - 1 && ", "}
+                </span>
+              ))}
             </TableCell>
             <TableCell align="left" className={classes.cell}>
               <LinkifyText>{row.message}</LinkifyText>
@@ -133,7 +136,7 @@ function HelpTableTeacher(props: HelpTableProps & EContextValue) {
             <TableCell className={classes.optionalColumn} align="left">
 
               {row.helper ? (
-                <ClaimedBy examiner={row.helper} />
+                <UserProfile user={row.helper} />
               ) : (
                   <p></p>
                 )}
diff --git a/src/components/claimedBy/ClaimedBy.tsx b/src/components/userProfile/UserProfile.tsx
similarity index 68%
rename from src/components/claimedBy/ClaimedBy.tsx
rename to src/components/userProfile/UserProfile.tsx
index 7511380..b7dca1c 100644
--- a/src/components/claimedBy/ClaimedBy.tsx
+++ b/src/components/userProfile/UserProfile.tsx
@@ -5,27 +5,27 @@ import { fullName } from "../../utils/fullName";
 import ProfilePicture from "../profilePicture";
 
 interface Props {
-  examiner: User;
+  user: User;
 }
-const ClaimedBy = (props: Props) => {
+const UserProfile = (props: Props) => {
   return (
     <>
       <Tooltip
         title={
-          props.examiner.needsProfilePic ? (
+          props.user.needsProfilePic ? (
             ""
           ) : (
               <div style={{ margin: "10px", textAlign: "center" }}>
-                <ProfilePicture customUser={props.examiner} disableInitials />
+                <ProfilePicture customUser={props.user} disableInitials />
               </div>
             )
         }
       >
         <span style={{ display: "inline-block" }}>
-          {fullName(props.examiner)}
+          {fullName(props.user)}
         </span>
       </Tooltip>
     </>
   );
 };
-export default ClaimedBy;
+export default UserProfile;
diff --git a/src/components/userProfile/index.ts b/src/components/userProfile/index.ts
new file mode 100644
index 0000000..dec9c05
--- /dev/null
+++ b/src/components/userProfile/index.ts
@@ -0,0 +1,2 @@
+import UserProfile from "./UserProfile";
+export default UserProfile;
\ No newline at end of file