Merge pull request #278 from SELab-2/group_performance

Group performance
SELab-2 · May 19, 2024 · 7578f13 · 7578f13
2 parents 98ab637 + 6d8a29b
commit 7578f13
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/frontend/frontend/src/components/CustomComponents.tsx b/frontend/frontend/src/components/CustomComponents.tsx
@@ -104,6 +104,7 @@ export const Divider = ({ children, ...props }: CustomCardProps) => {
     )
 }
 
+
 interface EvenlySpacedRowProps {
     items: ReactNode[]
 }

diff --git a/frontend/frontend/src/pages/groupsPage/GroupsPage.tsx b/frontend/frontend/src/pages/groupsPage/GroupsPage.tsx
@@ -395,7 +395,7 @@ export function GroupsPage() {
     const [filteredStudents, setFilteredStudents] = useState(availableStudents)
 
     // for filtering students
-    const handleAutocompleteChange = (_, value) => {
+    const handleAutocompleteChange = (_: unknown, value: number | null) => {
         if (value) {
             setFilteredStudents([value])
         }
@@ -405,12 +405,14 @@ export function GroupsPage() {
         setFilteredStudents(availableStudents)
     }
 
-    const filterOptions = (_, { inputValue }) => {
-        const filtered = availableStudents.filter((option) => {
+    const filterOptions = (
+        _: unknown,
+        { inputValue }: { inputValue: string }
+    ) => {
+        return availableStudents.filter((option) => {
             const label = studentNames.get(option)
             return label?.toLowerCase().startsWith(inputValue.toLowerCase())
         })
-        return filtered
     }
     return (
         <>
@@ -751,11 +753,16 @@ export function GroupsPage() {
                                                                 }
                                                                 getOptionLabel={(
                                                                     student
-                                                                ) =>
-                                                                    studentNames.get(
-                                                                        student
-                                                                    )
-                                                                }
+                                                                ) => {
+                                                                    const name =
+                                                                        studentNames.get(
+                                                                            student
+                                                                        )
+                                                                    return name !=
+                                                                        null
+                                                                        ? name
+                                                                        : '' // This checks for both null and undefined
+                                                                }}
                                                                 onChange={
                                                                     handleAutocompleteChange
                                                                 }