[Class statistics] Fix page crash when opening courses tab before dat…

…a has finished loading
UniversityOfHelsinkiCS · Feb 21, 2025 · 44a7f8b · 44a7f8b
1 parent a632f37
commit 44a7f8b
Showing 1 changed file with 26 additions and 20 deletions.
diff --git a/services/frontend/src/components/PopulationStudents/StudentTable/CoursesTab/index.jsx b/services/frontend/src/components/PopulationStudents/StudentTable/CoursesTab/index.jsx
@@ -6,35 +6,41 @@ import { useGetStudyGuidanceGroupPopulationCoursesQuery } from '@/redux/studyGui
 import { CoursesTable } from './CoursesTable'
 
 export const CoursesTabContainer = ({ curriculum, includeSubstitutions, students, studyGuidanceGroup, variant }) => {
-  const { data: studyGuidanceGroupPopulationsCourses, isLoading: coursesAreLoading } =
-    useGetStudyGuidanceGroupPopulationCoursesQuery({
-      studentnumberlist: students.map(student => student.studentNumber).sort(),
-      year: studyGuidanceGroup?.tags?.year,
-    })
+  const { data: studyGuidanceGroupPopulationsCourses, isLoading } = useGetStudyGuidanceGroupPopulationCoursesQuery({
+    studentnumberlist: students.map(student => student.studentNumber).sort(),
+    year: studyGuidanceGroup?.tags?.year,
+  })
 
-  const { data: populationCourses, pending } = useSelector(state => state?.populationSelectedStudentCourses)
+  const { data: populationCourses } = useSelector(state => state?.populationSelectedStudentCourses)
+
+  const studyGuidanceGroupLoading = isLoading || !curriculum || !students
+  const loading = !curriculum || !students || !populationCourses
 
   if (variant === 'studyGuidanceGroupPopulation') {
     return (
-      <Tab.Pane loading={coursesAreLoading || !curriculum}>
-        <CoursesTable
-          curriculum={curriculum}
-          includeSubstitutions={includeSubstitutions}
-          populationCourses={studyGuidanceGroupPopulationsCourses}
-          students={students}
-        />
+      <Tab.Pane loading={studyGuidanceGroupLoading}>
+        {!studyGuidanceGroupLoading && (
+          <CoursesTable
+            curriculum={curriculum}
+            includeSubstitutions={includeSubstitutions}
+            populationCourses={studyGuidanceGroupPopulationsCourses}
+            students={students}
+          />
+        )}
       </Tab.Pane>
     )
   }
 
   return (
-    <Tab.Pane loading={pending || !curriculum}>
-      <CoursesTable
-        curriculum={curriculum}
-        includeSubstitutions={includeSubstitutions}
-        populationCourses={populationCourses}
-        students={students}
-      />
+    <Tab.Pane loading={loading}>
+      {!loading && (
+        <CoursesTable
+          curriculum={curriculum}
+          includeSubstitutions={includeSubstitutions}
+          populationCourses={populationCourses}
+          students={students}
+        />
+      )}
     </Tab.Pane>
   )
 }