fix: add new group and homework to mentor filter after creation

Author: semrosin

hwproj.front/src/components/Common/GroupSelector.tsx

@@ -20,10 +20,10 @@ interface GroupSelectorProps {
     courseStudents: AccountDataDto[],
     groups: GroupViewModel[],
     onGroupIdChange: (groupId?: number) => void,
-    onGroupsUpdate: () => void,
+    onGroupsUpdate: () => Promise<void>,
     selectedGroupId?: number,
     choiceDisabled?: boolean,
-    onCreateNewGroup?: () => void,
+    onCreateNewGroup?: (group: GroupViewModel) => Promise<void>,
 }
 
 const GroupSelector: FC<GroupSelectorProps> = (props) => {
@@ -80,14 +80,19 @@ const GroupSelector: FC<GroupSelectorProps> = (props) => {
                         groupMates: formState.memberIds.map(studentId => ({studentId})),
                     }
                 );
-                props.onGroupsUpdate();
+                await props.onGroupsUpdate();
             } else {
                 const groupId = await ApiSingleton.courseGroupsApi.courseGroupsCreateCourseGroup(props.courseId, {
                     name: formState.name.trim(),
                     groupMatesIds: formState.memberIds,
                     courseId: props.courseId,
                 });
-                props.onGroupsUpdate();
+                await props.onCreateNewGroup?.({
+                    id: groupId,
+                    name: formState.name.trim(),
+                    studentsIds: formState.memberIds,
+                });
+                await props.onGroupsUpdate();
                 props.onGroupIdChange(groupId);
             }
         } catch (error) {

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

@@ -93,8 +93,10 @@ const Course: React.FC = () => {
         groups
     } = courseState
 
-    const loadGroups = async () => {
-        const groups = await ApiSingleton.courseGroupsApi.courseGroupsGetAllCourseGroups(course.id!)
+    const loadGroups = async (targetCourseId: number = course.id!) => {
+        if (!targetCourseId) return;
+
+        const groups = await ApiSingleton.courseGroupsApi.courseGroupsGetAllCourseGroups(targetCourseId)
         setCourseState(prevState => ({
             ...prevState,
             groups: groups
@@ -153,15 +155,15 @@ const Course: React.FC = () => {
             courseHomeworks: course.homeworks!,
             createHomework: false,
             mentors: course.mentors!,
-            groups: course.groups || [],
             acceptedStudents: course.acceptedStudents!,
             newStudents: course.newStudents!,
         }))
     }
 
     useEffect(() => {
         setCurrentState()
-    }, [])
+        loadGroups(+courseId!)
+    }, [courseId])
 
     useEffect(() => {
         ApiSingleton.statisticsApi.statisticsGetCourseStatistics(+courseId!)

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

@@ -61,7 +61,7 @@ interface ICourseExperimentalProps {
                         previouslyExistingFilesCount: number,
                         waitingNewFilesCount: number,
                         deletingFilesIds: number[]) => void;
-    onGroupsUpdate: () => void;
+    onGroupsUpdate: () => Promise<void>;
     groups: GroupViewModel[];
 }
 
@@ -428,6 +428,7 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                     getAllHomeworks={() => homeworks}
                     homeworkAndFilesInfo={{homework, filesInfo}}
                     isMentor={isMentor}
+                    userId={props.userId}
                     initialEditMode={initialEditMode || homeworkEditMode}
                     onMount={onSelectedItemMount}
                     onAddTask={addNewTask}

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

@@ -7,6 +7,7 @@ import ApiSingleton from "../../api/ApiSingleton";
 import ErrorsHandler from "../Utils/ErrorsHandler";
 import {DotLottieReact} from '@lottiefiles/dotlottie-react';
 import Button from "@material-ui/core/Button";
+import {getSelectedCourseView} from "./MentorWorkspaceUtils";
 
 interface ICourseFilterProps {
     courseId: number;
@@ -63,35 +64,11 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                 const mentorWorkspace =
                     await ApiSingleton.coursesApi.coursesGetMentorWorkspace(props.courseId, props.mentorId);
 
-                props.onSelectedStudentsChange(mentorWorkspace.students ?? [])
-                props.onSelectedHomeworksChange(mentorWorkspace.homeworks ?? [])
-                props.onSelectedGroupsChange(mentorWorkspace.groups ?? [])
-
-                const initSelectedGroupsView = (mentorWorkspace.groups?.length === course.groups?.length ?
-                    [] : (mentorWorkspace.groups ?? []))
-                    .filter(g => g.name?.trim());
-                const selectedGroupsStudents = initSelectedGroupsView.flatMap(g =>g.studentsIds ?? []);
-
-                const selectedStudentWithoutGroups = mentorWorkspace.students?.filter(st => !selectedGroupsStudents.includes(st.userId!));
-                // Для корректного отображения "Все" при инцициализации (получении данных с бэкенда)
-                const allCourseStudentsCount = (course.acceptedStudents?.length ?? 0) + (course.newStudents?.length ?? 0);
-                const initSelectedStudentsView = selectedStudentWithoutGroups?.length === allCourseStudentsCount ?
-                    [] : selectedStudentWithoutGroups ?? [];
-
-                const courseHomeworks = initSelectedGroupsView.length > 0
-                    ? course.homeworks?.filter(h => !h.groupId || initSelectedGroupsView?.some(g => g.id === h.groupId))
-                    : course.homeworks;
-                const initSelectedHomeworksView = mentorWorkspace.homeworks?.length === courseHomeworks?.length ?
-                    [] : mentorWorkspace.homeworks ?? [];
+                const selectedCourseView = getSelectedCourseView(course, mentorWorkspace);
 
                 setState(prevState => ({
                     ...prevState,
-                    courseHomeworks: course.homeworks ?? [],
-                    courseStudents: course.acceptedStudents ?? [],
-                    courseGroups: course.groups?.filter(g => g.name?.trim()) ?? [],
-                    selectedStudents: initSelectedStudentsView.filter(s => !initSelectedGroupsView.some(g => g.studentsIds?.includes(s.userId!))),
-                    selectedHomeworks: initSelectedHomeworksView,
-                    selectedGroups: initSelectedGroupsView,
+                    ...selectedCourseView,
                     mentors: course.mentors!,
                     assignedStudents: assignedStudents.filter(x => x.mentorId !== props.mentorId)
                 }))
@@ -158,9 +135,9 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                                 fullWidth
                                 options={state.courseHomeworks.filter(h =>
                                     !h.groupId
-                                    || !state.selectedGroups
-                                    || state.selectedGroups.some(g => g.id === h.groupId))
-                                }
+                                    || state.selectedGroups.length === 0
+                                    || state.selectedGroups.some(g => g.id === h.groupId)
+                                )}
                                 getOptionLabel={(option: HomeworkViewModel) => option.title ?? "Без названия"}
                                 getOptionKey={(option: HomeworkViewModel) => option.id ?? 0}
                                 filterSelectedOptions
@@ -319,4 +296,4 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
     )
 }
 
-export default CourseFilter;
+export default CourseFilter;

hwproj.front/src/components/Courses/MentorWorkspaceUtils.ts

@@ -0,0 +1,47 @@
+import {AccountDataDto, CourseViewModel, GroupViewModel, HomeworkViewModel, WorkspaceViewModel} from "@/api";
+
+export interface SelectedCourseView {
+    courseHomeworks: HomeworkViewModel[];
+    courseStudents: AccountDataDto[];
+    courseGroups: GroupViewModel[];
+    selectedHomeworks: HomeworkViewModel[];
+    selectedStudents: AccountDataDto[];
+    selectedGroups: GroupViewModel[];
+}
+
+export const getSelectedCourseView = (
+    course: CourseViewModel,
+    mentorWorkspace: WorkspaceViewModel
+): SelectedCourseView => {
+    const courseGroups = course.groups?.filter(g => g.name?.trim()) ?? [];
+
+    const selectedGroups = (mentorWorkspace.groups?.length === courseGroups.length
+            ? []
+            : mentorWorkspace.groups ?? []
+        )
+        .filter(g => g.name?.trim());
+
+    const selectedGroupsStudents = selectedGroups.flatMap(g => g.studentsIds ?? []);
+    const selectedStudentWithoutGroups = mentorWorkspace.students
+        ?.filter(st => !selectedGroupsStudents.includes(st.userId!)) ?? [];
+    const allCourseStudentsCount = (course.acceptedStudents?.length ?? 0) + (course.newStudents?.length ?? 0);
+    const selectedStudents = selectedStudentWithoutGroups.length === allCourseStudentsCount
+        ? []
+        : selectedStudentWithoutGroups;
+
+    const availableHomeworks = selectedGroups.length > 0
+        ? course.homeworks?.filter(h => !h.groupId || selectedGroups.some(g => g.id === h.groupId))
+        : course.homeworks;
+    const selectedHomeworks = mentorWorkspace.homeworks?.length === availableHomeworks?.length
+        ? []
+        : mentorWorkspace.homeworks ?? [];
+
+    return {
+        courseHomeworks: course.homeworks ?? [],
+        courseStudents: course.acceptedStudents ?? [],
+        courseGroups,
+        selectedHomeworks,
+        selectedStudents: selectedStudents.filter(s => !selectedGroups.some(g => g.studentsIds?.includes(s.userId!))),
+        selectedGroups,
+    };
+}

hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx

@@ -21,7 +21,8 @@ import {IFileInfo} from "components/Files/IFileInfo";
 import {FC, useEffect, useState} from "react"
 import Utils from "services/Utils";
 import {
-    HomeworkViewModel, ActionOptions, HomeworkTaskViewModel, PostTaskViewModel, AccountDataDto, GroupViewModel
+    HomeworkViewModel, ActionOptions, HomeworkTaskViewModel, PostTaskViewModel, AccountDataDto, GroupViewModel,
+    WorkspaceViewModel, CourseViewModel
 } from "@/api";
 import ApiSingleton from "../../api/ApiSingleton";
 import Tags from "../Common/Tags";
@@ -43,6 +44,7 @@ import {FilesHandler} from "@/components/Files/FilesHandler";
 import GroupSelector from "../Common/GroupSelector";
 import GroupIcon from '@mui/icons-material/Group';
 import AssignmentIcon from '@mui/icons-material/Assignment';
+import {getSelectedCourseView} from "../Courses/MentorWorkspaceUtils";
 
 export interface HomeworkAndFilesInfo {
     homework: HomeworkViewModel & { isModified?: boolean },
@@ -59,6 +61,7 @@ interface IEditHomeworkState {
 
 const CourseHomeworkEditor: FC<{
     homeworkAndFilesInfo: HomeworkAndFilesInfo,
+    mentorId: string,
     getAllHomeworks: () => HomeworkViewModel[],
     onUpdate: (update: { homework: HomeworkViewModel } & {
         isDeleted?: boolean,
@@ -69,7 +72,7 @@ const CourseHomeworkEditor: FC<{
                         previouslyExistingFilesCount: number,
                         waitingNewFilesCount: number,
                         deletingFilesIds: number[]) => void;
-    onGroupsUpdate: () => void;
+    onGroupsUpdate: () => Promise<void>;
     groups: GroupViewModel[];
 }> = (props) => {
     const homework = props.homeworkAndFilesInfo.homework
@@ -124,19 +127,29 @@ const CourseHomeworkEditor: FC<{
     const [description, setDescription] = useState<string>(loadedHomework.description!)
     const [selectedGroupId, setSelectedGroupId] = useState(loadedHomework.groupId)
     const [courseStudents, setCourseStudents] = useState<AccountDataDto[]>([])
+    const [course, setCourse] = useState<CourseViewModel | undefined>(undefined)
+    const [mentorWorkspace, setMentorWorkspace] = useState<WorkspaceViewModel | undefined>(undefined)
     const [page, setPage] = useState<"homework" | "group">("homework")
 
     useEffect(() => {
-        const loadCourseStudents = async () => {
+        const loadMentorWorkspace = async () => {
             try {
-                const courseData = await ApiSingleton.coursesApi.coursesGetAllCourseData(courseId)
+                const [courseData, mentorWorkspace] = await Promise.all([
+                    ApiSingleton.coursesApi.coursesGetAllCourseData(courseId),
+                    isNewHomework
+                        ? ApiSingleton.coursesApi.coursesGetMentorWorkspace(courseId, props.mentorId)
+                            .catch(() => undefined)
+                        : Promise.resolve(undefined)
+                ]);
                 setCourseStudents(courseData.course?.acceptedStudents || [])
+                setCourse(courseData.course)
+                setMentorWorkspace(mentorWorkspace)
             } catch (error) {
-                console.error('Failed to load course students:', error)
+                console.error('Failed to load course data:', error)
             }
         }
-        loadCourseStudents()
-    }, [courseId])
+        loadMentorWorkspace()
+    }, [courseId, props.mentorId, isNewHomework])
 
     const [hasErrors, setHasErrors] = useState<boolean>(false)
 
@@ -227,6 +240,62 @@ const CourseHomeworkEditor: FC<{
         props.onUpdate({homework: loadedHomework, isDeleted: true})
     }
 
+    const updateMentorFilter = async (update: {
+        newGroup?: GroupViewModel,
+        newHomework?: HomeworkViewModel
+    }) => {
+        if (!course || !mentorWorkspace) return;
+
+        const {newGroup, newHomework} = update;
+        const selectedCourseView = getSelectedCourseView(course, mentorWorkspace);
+        let updatedGroups = selectedCourseView.selectedGroups;
+        let updatedHomeworks = selectedCourseView.selectedHomeworks;
+        let hasChanges = false;
+
+        if (newGroup?.id !== undefined &&
+            selectedCourseView.selectedGroups.length > 0 &&
+            !selectedCourseView.selectedGroups.some(g => g.id === newGroup.id)) {
+            updatedGroups = [...selectedCourseView.selectedGroups, newGroup];
+            hasChanges = true;
+        }
+
+        if (newHomework?.id !== undefined &&
+            selectedCourseView.selectedHomeworks.length > 0 &&
+            !selectedCourseView.selectedHomeworks.some(h => h.id === newHomework.id)) {
+            updatedHomeworks = [...selectedCourseView.selectedHomeworks, newHomework];
+            hasChanges = true;
+        }
+
+        setCourse(prev => prev ? ({
+            ...prev,
+            groups: newGroup?.id !== undefined && !prev.groups?.some(g => g.id === newGroup.id)
+                ? [...(prev.groups ?? []), newGroup]
+                : prev.groups,
+            homeworks: newHomework?.id !== undefined && !prev.homeworks?.some(h => h.id === newHomework.id)
+                ? [...(prev.homeworks ?? []), newHomework]
+                : prev.homeworks,
+        }) : prev);
+
+        if (!hasChanges) return;
+
+        await ApiSingleton.coursesApi.coursesEditMentorWorkspace(
+            courseId,
+            props.mentorId,
+            {
+                homeworkIds: updatedHomeworks.map(h => h.id).filter((id): id is number => id !== undefined),
+                studentIds: selectedCourseView.selectedStudents.map(s => s.userId).filter((id): id is string => id !== undefined),
+                groupIds: updatedGroups.map(g => g.id).filter((id): id is number => id !== undefined),
+            }
+        );
+
+        setMentorWorkspace(prev => prev ? ({
+            ...prev,
+            homeworks: updatedHomeworks,
+            students: selectedCourseView.selectedStudents,
+            groups: updatedGroups
+        }) : prev);
+    }
+
     const getDeleteMessage = (homeworkName: string, filesInfo: IFileInfo[]) => {
         let message = `Вы точно хотите удалить задание "${homeworkName}"?`;
         if (filesInfo.length > 0) {
@@ -268,6 +337,10 @@ const CourseHomeworkEditor: FC<{
             ? await ApiSingleton.homeworksApi.homeworksAddHomework(courseId!, update)
             : await ApiSingleton.homeworksApi.homeworksUpdateHomework(+homeworkId!, update)
 
+        if (isNewHomework && updatedHomework.value) {
+            await updateMentorFilter({newHomework: updatedHomework.value});
+        }
+
         const updatedHomeworkId = updatedHomework.value!.id!
         await handleFilesChange(
             courseId, CourseUnitType.Homework, updatedHomeworkId,
@@ -430,7 +503,8 @@ const CourseHomeworkEditor: FC<{
                     selectedGroupId={selectedGroupId}
                     choiceDisabled={!isNewHomework}
                     onGroupsUpdate={props.onGroupsUpdate}
-                    groups={props.groups}
+                    onCreateNewGroup={(newGroup: GroupViewModel) => updateMentorFilter({newGroup})}
+                    groups={mentorWorkspace?.groups ?? props.groups}
                 />
             </CardContent>
             {!isNewHomework && !isPublished &&
@@ -458,6 +532,7 @@ const CourseHomeworkExperimental: FC<{
     homeworkAndFilesInfo: HomeworkAndFilesInfo,
     getAllHomeworks: () => HomeworkViewModel[],
     isMentor: boolean,
+    userId: string,
     initialEditMode: boolean,
     onMount: () => void,
     onUpdate: (x: { homework: HomeworkViewModel } & {
@@ -470,7 +545,7 @@ const CourseHomeworkExperimental: FC<{
                         previouslyExistingFilesCount: number,
                         waitingNewFilesCount: number,
                         deletingFilesIds: number[]) => void;
-    onGroupsUpdate: () => void;
+    onGroupsUpdate: () => Promise<void>;
     groups: GroupViewModel[];
 }> = (props) => {
     const {homework, filesInfo} = props.homeworkAndFilesInfo
@@ -488,6 +563,7 @@ const CourseHomeworkExperimental: FC<{
     if (editMode) return <CourseHomeworkEditor
         getAllHomeworks={props.getAllHomeworks}
         homeworkAndFilesInfo={{homework, filesInfo}}
+        mentorId={props.userId}
         onUpdate={update => {
             if (update.isSaved) setEditMode(false)
             props.onUpdate(update)
@@ -569,4 +645,4 @@ const CourseHomeworkExperimental: FC<{
         }
     </CardContent>
 }
-export default CourseHomeworkExperimental;
+export default CourseHomeworkExperimental;