fix: groups update after creation

Author: semrosin

hwproj.front/src/components/Courses/Course.tsx

@@ -49,7 +49,6 @@ interface ICourseState {
     isFound: boolean;
     course: CourseViewModel;
     courseHomeworks: HomeworkViewModel[];
-    groups: GroupViewModel[];
     mentors: AccountDataDto[];
     acceptedStudents: AccountDataDto[];
     newStudents: AccountDataDto[];
@@ -71,7 +70,6 @@ const Course: React.FC = () => {
         course: {},
         courseHomeworks: [],
         mentors: [],
-        groups: [],
         acceptedStudents: [],
         newStudents: [],
         studentSolutions: [],
@@ -90,19 +88,8 @@ const Course: React.FC = () => {
         newStudents,
         acceptedStudents,
         courseHomeworks,
-        groups
     } = courseState
 
-    const loadGroups = async (targetCourseId: number = course.id!) => {
-        if (!targetCourseId) return;
-
-        const groups = await ApiSingleton.courseGroupsApi.courseGroupsGetAllCourseGroups(targetCourseId)
-        setCourseState(prevState => ({
-            ...prevState,
-            groups: groups
-        }))
-    };
-
     const userId = ApiSingleton.authService.getUserId()
 
     const isLecturer = ApiSingleton.authService.isLecturer()
@@ -160,9 +147,17 @@ const Course: React.FC = () => {
         }))
     }
 
+    const updateCourseGroups = async () => {
+        const course = await ApiSingleton.coursesApi.coursesGetCourseData(+courseId!)
+
+        setCourseState(prevState => ({
+            ...prevState,
+            course: course,
+        }))
+    }
+
     useEffect(() => {
         setCurrentState()
-        loadGroups(+courseId!)
     }, [courseId])
 
     useEffect(() => {
@@ -189,9 +184,9 @@ const Course: React.FC = () => {
     const [lecturerStatsState, setLecturerStatsState] = useState(false);
 
     const studentsWithoutGroup = useMemo(() => {
-        const inGroupIds = new Set(groups.flatMap(g => g.studentsIds));
+        const inGroupIds = new Set(course.groups?.flatMap(g => g.studentsIds) || []);
         return acceptedStudents.filter(s => !inGroupIds.has(s.userId!));
-    }, [groups, acceptedStudents]);
+    }, [course.groups, acceptedStudents]);
 
     const CourseMenu: FC = () => {
         const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
@@ -321,7 +316,7 @@ const Course: React.FC = () => {
                             }
                         </Grid>
                     </Grid>
-                    {isCourseMentor && groups.length > 0 && studentsWithoutGroup.length > 0 &&
+                    {isCourseMentor && course.groups?.length !== 0 && studentsWithoutGroup.length > 0 &&
                         <Grid item>
                             <Tooltip
                                 title={studentsWithoutGroup.length + " " + Utils.pluralizeHelper(["студент", "студента", "студентов"], studentsWithoutGroup.length) + " без группы"}
@@ -405,8 +400,8 @@ const Course: React.FC = () => {
                                 courseHomeworks: homeworks
                             }))
                         }}
-                        onGroupsUpdate={loadGroups}
-                        groups={groups}
+                        onGroupsUpdate={updateCourseGroups}
+                        groups={course.groups ?? []}
                     />
                     }
                     {tabValue === "stats" &&
@@ -418,7 +413,7 @@ const Course: React.FC = () => {
                                     isMentor={isCourseMentor}
                                     course={courseState.course}
                                     solutions={studentSolutions}
-                                    groups={groups}
+                                    groups={course.groups ?? []}
                                 />
                             </Grid>
                         </Grid>}

hwproj.front/src/components/Courses/CourseFilter.tsx

@@ -278,10 +278,16 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                                                 }
                                             }
 
+                                            const selectedGroups = [...newGroups];
                                             setState((prev) => ({
                                                 ...prev,
                                                 selectedStudents: newStudents,
-                                                selectedGroups: [...newGroups],
+                                                selectedGroups,
+                                                selectedHomeworks: prev.selectedHomeworks
+                                                    .filter(h =>
+                                                        !h.groupId
+                                                        || selectedGroups.length === 0
+                                                        || selectedGroups.some(g => g.id === h.groupId)),
                                             }))
                                         }}
                                     />