QAGDEV-681 - Подключение проекта к S3

Author: nik1999777

.env.production

@@ -7,8 +7,8 @@ VITE_AVATAR_DELETE_URI=/api/upload/avatar
 VITE_TRAINING_UPLOAD_URI=/api/upload/training/:id
 VITE_TRAINING_DELETE_URI=/api/upload/training/:id
 VITE_HOMEWORK_FILE_UPLOAD_URI=/api/homework/student/homework/:homeWorkId/file
-VITE_HOMEWORK_FILE_GET_URI=/api/homework/student/:homeWorkId/file/:fileId
-VITE_HOMEWORK_FILE_DELETE_URI=/api/homework/student/:homeWorkId/file/:fileId
+VITE_HOMEWORK_FILE_GET_URI=/api/homework/student/homework/:homeWorkId/file/:fileId
+VITE_HOMEWORK_FILE_DELETE_URI=/api/homework/student/homework/:homeWorkId/file/:fileId
 VITE_LECTURE_FILE_UPLOAD_URI=/api/lecture/:lectureId/file
 VITE_LECTURE_FILE_GET_URI=/api/lecture/:lectureId/file/:fileId
 VITE_LECTURE_FILE_DELETE_URI=/api/lecture/:lectureId/file/:fileId

src/api/rest/homework-file-service.ts

@@ -51,9 +51,13 @@ export default class HomeworkFileService {
     });
   }
 
-  static deleteFile(homeWorkId: string): Promise<AxiosResponse<void>> {
+  static deleteFile(
+    homeWorkId: string,
+    fileId: string
+  ): Promise<AxiosResponse<void>> {
     const deleteUrl = createUrlWithParams(HOMEWORK_FILE_DELETE_URI, {
       homeWorkId,
+      fileId,
     });
 
     return axios({

src/shared/components/text-editor/editor/editor.tsx

@@ -17,6 +17,7 @@ const Editor: FC<ITextEditor> = ({
   content,
   setPendingFiles,
   source,
+  deleteHomeworkFile,
 }) => {
   const extensions = useExtensions({
     placeholder: "Введите текст...",
@@ -134,6 +135,16 @@ const Editor: FC<ITextEditor> = ({
       [handleNewImageFiles, handleNewFiles]
     );
 
+  const handleKeyDown = useCallback(
+    (view: any, event: { key: string }) => {
+      // console.log("keydown event", event.key);
+      // if (event.key === "Backspace" || event.key === "Delete") {
+      // }
+      return false;
+    },
+    [deleteHomeworkFile]
+  );
+
   return (
     <>
       <Box
@@ -153,6 +164,9 @@ const Editor: FC<ITextEditor> = ({
           editorProps={{
             handleDrop,
             handlePaste,
+            handleDOMEvents: {
+              keydown: handleKeyDown,
+            },
           }}
           renderControls={() => (
             <EditorMenuControls

src/shared/components/text-editor/types/index.ts

@@ -36,4 +36,8 @@ export interface ITextEditor {
   content?: Maybe<string>;
   setPendingFiles?: React.Dispatch<React.SetStateAction<PendingFile[]>>;
   source: FileSourceType;
+  deleteHomeworkFile?: (
+    homeWorkId: string,
+    fileId: string
+  ) => Promise<Maybe<void>>;
 }

src/shared/features/update-homework/view/update-homework.tsx

@@ -5,7 +5,7 @@ import { type RichTextEditorRef } from "shared/lib/mui-tiptap";
 import { Editor } from "shared/components/text-editor";
 import SendButtons from "shared/components/send-buttons";
 import { createUrlWithParams } from "shared/utils";
-import { useHomeworkFileUpload } from "shared/hooks";
+import { useHomeworkFileDelete, useHomeworkFileUpload } from "shared/hooks";
 import { PendingFile } from "shared/components/text-editor/types";
 
 import { IUpdateHomeWork } from "./update-homework.types";
@@ -23,6 +23,7 @@ const UpdateHomework: FC<IUpdateHomeWork> = (props) => {
   const [pendingFiles, setPendingFiles] = useState<PendingFile[]>([]);
   const [error, setError] = useState("");
   const { uploadHomeworkFile } = useHomeworkFileUpload();
+  const { deleteHomeworkFile } = useHomeworkFileDelete();
 
   const handleUpdateHomework = async () => {
     if (!rteRef.current?.editor || !homeWorkId) return;
@@ -74,6 +75,7 @@ const UpdateHomework: FC<IUpdateHomeWork> = (props) => {
             rteRef={rteRef}
             setPendingFiles={setPendingFiles}
             source="studentHomework"
+            deleteHomeworkFile={deleteHomeworkFile}
           />
           {error && <StyledFormHelperText>{error}</StyledFormHelperText>}
 

src/shared/hooks/use-homework-file-delete.ts

@@ -9,12 +9,12 @@ export const useHomeworkFileDelete = () => {
   const [deleting, setDeleting] = useState(false);
   const [error, setError] = useState<Maybe<Error>>(null);
 
-  const deleteHomeworkFile = async (homeWorkId: string) => {
+  const deleteHomeworkFile = async (homeWorkId: string, fileId: string) => {
     setDeleting(true);
     setError(null);
 
     try {
-      const response = await HomeworkFileService.deleteFile(homeWorkId);
+      const response = await HomeworkFileService.deleteFile(homeWorkId, fileId);
 
       if (response.status === RESPONSE_STATUS.SUCCESSFUL) {
         setDeleting(false);