fix: set proper active course having alias in url (#2600)

rolling-scopes · Feb 20, 2025 · b3cb96e · b3cb96e
1 parent dda094c
commit b3cb96e
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/client/src/modules/Course/contexts/ActiveCourseContext.tsx b/client/src/modules/Course/contexts/ActiveCourseContext.tsx
@@ -32,21 +32,23 @@ export const ActiveCourseProvider = ({ children }: Props) => {
   const alias = router.query.course;
   const [storageCourseId] = useLocalStorage('activeCourseId');
   const [activeCourse, setActiveCourse] = useState<ProfileCourseDto>();
+  const [loading, setLoading] = useState(true);
 
-  const { error, loading } = useAsync(async () => {
-    if (!coursesCache) {
-      coursesCache = await new UserService().getCourses();
-    }
-
-    const course =
-      coursesCache.find(course => course.alias === alias) ??
-      coursesCache.find(course => course.id === storageCourseId) ??
-      coursesCache[0];
+  const { error } = useAsync(async () => {
+    if (router.isReady) {
+      if (!coursesCache) {
+        coursesCache = await new UserService().getCourses();
+      }
 
-    setActiveCourse(course);
+      const course =
+        coursesCache.find(course => course.alias === alias) ??
+        coursesCache.find(course => course.id === storageCourseId) ??
+        coursesCache[0];
 
-    return course;
-  }, []);
+      setCourse(course);
+      setLoading(false);
+    }
+  }, [router.isReady]);
 
   const setCourse = (course: ProfileCourseDto) => {
     setActiveCourse(course);