CourseExperimental: сохранять выбранные файлы при навигации между заданиями (#574)

* wip

* wip

* wip

Author: DedSec256

hwproj.front/src/components/Files/FilePreview.tsx

@@ -126,7 +126,7 @@ const FilePreview: React.FC<FilePreviewProps> = (props) => {
                     color="text.secondary"
                     sx={{fontSize: hasRemoveButton ? '0.7rem' : '0.65rem'}}
                 >
-                    {getFileSize(props.fileInfo.sizeInBytes)}
+                    {getFileSize(props.fileInfo.size)}
                 </Typography>
             </Box>
 

hwproj.front/src/components/Files/FilesUploader.tsx

@@ -8,6 +8,7 @@ import {Alert, Button, Grid} from "@mui/material";
 import FilesPreviewList from "./FilesPreviewList";
 
 interface IFilesUploaderProps {
+    homeworkId: number;
     initialFilesInfo?: IFileInfo[];
     onChange: (selectedFiles: IFileInfo[]) => void;
     isLoading?: boolean;
@@ -69,8 +70,10 @@ const FilesUploader: React.FC<IFilesUploaderProps> = (props) => {
             newFilesInfo.push({
                 name: file.name,
                 type: file.type,
-                sizeInBytes: file.size,
-                file: file
+                size: file.size,
+                file: file,
+                homeworkId: props.homeworkId,
+                key: "local" //TODO
             })
         }
         setSelectedFilesInfo(previouslySelected => {

hwproj.front/src/components/Files/IFileInfo.ts

@@ -2,6 +2,8 @@ export interface IFileInfo {
     file?: File;
     type?: string;
     name: string;
-    sizeInBytes: number;
+    // В байтах
+    size: number;
+    homeworkId: number;
     key?: string;
 }

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

@@ -179,7 +179,7 @@ const AddHomework: React.FC<IAddHomeworkProps> = (props) => {
                                 .filter(fileInfo => fileInfo.file != undefined)
                                 .map(fileInfo => fileInfo.file!))
                         }}
-                    />
+                        homeworkId={props.id}/>
                     <PublicationAndDeadlineDates
                         hasDeadline={false}
                         isDeadlineStrict={false}

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

@@ -110,7 +110,7 @@ const CourseHomeworkEditor: FC<{
     const [title, setTitle] = useState<string>(homework.title!)
     const [tags, setTags] = useState<string[]>(homework.tags!)
     const [description, setDescription] = useState<string>(homework.description!)
-    const [filesControlState, setFilesControlState] = useState<IEditFilesState>({
+    const [filesState, setFilesState] = useState<IEditFilesState>({
         initialFilesInfo: filesInfo,
         selectedFilesInfo: filesInfo,
         isLoadingInfo: false
@@ -168,8 +168,8 @@ const CourseHomeworkEditor: FC<{
             isModified: true,
         }
 
-        props.onUpdate({fileInfos: [], homework: update})
-    }, [title, description, tags, metadata, hasErrors])
+        props.onUpdate({fileInfos: filesState.selectedFilesInfo, homework: update})
+    }, [title, description, tags, metadata, hasErrors, filesState.selectedFilesInfo])
 
     useEffect(() => {
         setHasErrors(!title || metadata.hasErrors)
@@ -228,18 +228,18 @@ const CourseHomeworkEditor: FC<{
         const updatedHomeworkId = updatedHomework.value!.id!
 
         // Если какие-то файлы из ранее добавленных больше не выбраны, удаляем их из хранилища
-        const deleteOperations = filesControlState.initialFilesInfo
+        const deleteOperations = filesState.initialFilesInfo
             .filter(initialFile =>
                 initialFile.key &&
-                !filesControlState.selectedFilesInfo.some(s => s.key === initialFile.key)
+                !filesState.selectedFilesInfo.some(s => s.key === initialFile.key)
             )
             .map(initialFile => UpdateFilesUtils.deleteFileWithErrorsHadling(courseId, initialFile));
 
         // Если какие-то файлы из выбранных сейчас не были добавлены раньше, загружаем их в хранилище
-        const uploadOperations = filesControlState.selectedFilesInfo
+        const uploadOperations = filesState.selectedFilesInfo
             .filter(selectedFile =>
                 selectedFile.file &&
-                !filesControlState.initialFilesInfo.some(i => i.key === selectedFile.key)
+                !filesState.initialFilesInfo.some(i => i.key === selectedFile.key)
             )
             .map(selectedFile => UpdateFilesUtils.uploadFileWithErrorsHadling(
                 selectedFile.file!,
@@ -253,12 +253,12 @@ const CourseHomeworkEditor: FC<{
         if (deleteOperations.length === 0 && uploadOperations.length === 0) {
             if (isNewHomework) props.onUpdate({
                 homework: update,
-                fileInfos: filesControlState.selectedFilesInfo,
+                fileInfos: [],
                 isDeleted: true
             }) // remove fake homework
             props.onUpdate({
                 homework: updatedHomework.value!,
-                fileInfos: filesControlState.selectedFilesInfo,
+                fileInfos: filesState.selectedFilesInfo,
                 isSaved: true
             })
         } else {
@@ -280,7 +280,7 @@ const CourseHomeworkEditor: FC<{
                 }) // remove fake homework
                 props.onUpdate({
                     homework: updatedHomework.value!,
-                    fileInfos: filesControlState.selectedFilesInfo,
+                    fileInfos: filesState.selectedFilesInfo,
                     isSaved: true
                 })
             }
@@ -335,15 +335,15 @@ const CourseHomeworkEditor: FC<{
                 <Grid item xs={12} style={{marginBottom: "15px"}}>
                     <Grid container direction="column">
                         <FilesUploader
-                            initialFilesInfo={filesControlState.selectedFilesInfo}
-                            isLoading={filesControlState.isLoadingInfo}
+                            initialFilesInfo={filesState.selectedFilesInfo}
+                            isLoading={filesState.isLoadingInfo}
                             onChange={(filesInfo) => {
-                                setFilesControlState((prevState) => ({
+                                setFilesState((prevState) => ({
                                     ...prevState,
                                     selectedFilesInfo: filesInfo
-                                }))
+                                }));
                             }}
-                        />
+                            homeworkId={homeworkId}/>
                         <PublicationAndDeadlineDates
                             hasDeadline={metadata.hasDeadline}
                             isDeadlineStrict={metadata.isDeadlineStrict}

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

@@ -282,9 +282,9 @@ const EditHomework: FC = () => {
                                         setFilesControlState((prevState) => ({
                                             ...prevState,
                                             selectedFilesInfo: filesInfo
-                                        }))
+                                        }));
                                     }}
-                                />
+                                    homeworkId={+homeworkId!}/>
                                 <PublicationAndDeadlineDates
                                     hasDeadline={editHomework.hasDeadline}
                                     isDeadlineStrict={editHomework.isDeadlineStrict}

hwproj.front/src/components/Utils/FileInfoConverter.ts

@@ -1,5 +1,5 @@
 import {IFileInfo} from "components/Files/IFileInfo";
-import {FileInfoDTO} from "../../api"
+import {FileInfoDTO} from "@/api"
 
 export default class FileInfoConverter {
     public static fromFileInfoDTO(fileInfoDto: FileInfoDTO): IFileInfo {
@@ -11,9 +11,11 @@ export default class FileInfoConverter {
         }
 
         return {
+            ...fileInfoDto,
             name: fileInfoDto.name,
-            sizeInBytes: fileInfoDto.size,
-            key: fileInfoDto.key
+            size: fileInfoDto.size,
+            key: fileInfoDto.key,
+            homeworkId: fileInfoDto.homeworkId,
         };
     }