Merge pull request #364 from qa-guru/QAGDEV-681

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

Author: nik1999777

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

@@ -5,6 +5,8 @@ import {
   HOMEWORK_FILE_UPLOAD_URI,
 } from "config";
 
+import { createUrlWithParams } from "shared/utils";
+
 export interface HomeworkFileResponse {
   id: string;
   fileName: string;
@@ -21,11 +23,9 @@ export default class HomeworkFileService {
     const formData = new FormData();
     formData.append("file", file);
 
-    const uploadFileUrl = HOMEWORK_FILE_UPLOAD_URI.replace(
-      // eslint-disable-next-line sonarjs/no-duplicate-string
-      ":homeWorkId",
-      homeWorkId
-    );
+    const uploadFileUrl = createUrlWithParams(HOMEWORK_FILE_UPLOAD_URI, {
+      homeWorkId,
+    });
 
     return axios({
       method: "POST",
@@ -39,10 +39,10 @@ export default class HomeworkFileService {
     homeWorkId: string,
     fileId: string
   ): Promise<AxiosResponse<Blob>> {
-    const getFileUrl = HOMEWORK_FILE_GET_URI.replace(
-      ":homeWorkId",
-      homeWorkId
-    ).replace(":fileId", fileId);
+    const getFileUrl = createUrlWithParams(HOMEWORK_FILE_GET_URI, {
+      homeWorkId,
+      fileId,
+    });
 
     return axios({
       method: "GET",
@@ -52,10 +52,9 @@ export default class HomeworkFileService {
   }
 
   static deleteFile(homeWorkId: string): Promise<AxiosResponse<void>> {
-    const deleteUrl = HOMEWORK_FILE_DELETE_URI.replace(
-      ":homeWorkId",
-      homeWorkId
-    );
+    const deleteUrl = createUrlWithParams(HOMEWORK_FILE_DELETE_URI, {
+      homeWorkId,
+    });
 
     return axios({
       method: "DELETE",

src/api/rest/training-upload-service.ts

@@ -1,5 +1,7 @@
 import axios, { type AxiosResponse } from "axios";
 
+import { createUrlWithParams } from "shared/utils";
+
 import { TRAINING_DELETE_URI, TRAINING_UPLOAD_URI } from "../../config";
 
 export interface TrainingUploadResponse {
@@ -15,7 +17,9 @@ export default class TrainingUploadService {
 
     formData.append("file", file);
 
-    const uploadUrl = TRAINING_UPLOAD_URI.replace(":id", trainingId);
+    const uploadUrl = createUrlWithParams(TRAINING_UPLOAD_URI, {
+      id: trainingId,
+    });
 
     return axios({
       method: "POST",
@@ -26,7 +30,10 @@ export default class TrainingUploadService {
   }
 
   static delete(trainingId: string): Promise<AxiosResponse<void>> {
-    const deleteUrl = TRAINING_DELETE_URI.replace(":id", trainingId);
+    const deleteUrl = createUrlWithParams(TRAINING_DELETE_URI, {
+      id: trainingId,
+    });
+
     return axios({
       method: "DELETE",
       url: deleteUrl,

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

@@ -3,7 +3,9 @@ import { Box, Stack } from "@mui/material";
 import type { EditorOptions } from "@tiptap/core";
 import { FC, useCallback, useState } from "react";
 import { useSnackbar } from "notistack";
+import { HOMEWORK_FILE_GET_URI } from "config";
 
+import { createUrlWithParams } from "shared/utils";
 import { insertFiles, insertImages } from "shared/lib/mui-tiptap/utils";
 import { LinkBubbleMenu, RichTextEditor } from "shared/lib/mui-tiptap";
 import { TableBubbleMenu, MenuButton } from "shared/lib/mui-tiptap/controls";
@@ -36,7 +38,10 @@ const Editor: FC<ITextEditor> = ({ rteRef, content, homeWorkId }) => {
             const uploadedFile = await uploadHomeworkFile(file, homeWorkId);
 
             if (uploadedFile) {
-              const serverUrl = `/homework/${homeWorkId}/file/${uploadedFile.id}`;
+              const serverUrl = createUrlWithParams(HOMEWORK_FILE_GET_URI, {
+                homeWorkId,
+                fileId: uploadedFile.id,
+              });
 
               return {
                 src: serverUrl,
@@ -77,7 +82,10 @@ const Editor: FC<ITextEditor> = ({ rteRef, content, homeWorkId }) => {
             const uploadedFile = await uploadHomeworkFile(file, homeWorkId);
 
             if (uploadedFile) {
-              const serverUrl = `/homework/${homeWorkId}/file/${uploadedFile.id}`;
+              const serverUrl = createUrlWithParams(HOMEWORK_FILE_GET_URI, {
+                homeWorkId,
+                fileId: uploadedFile.id,
+              });
 
               return {
                 href: serverUrl,

src/shared/components/text-editor/hooks/use-extensions.ts

@@ -188,6 +188,20 @@ const CustomParagraph = Paragraph.extend({
   content: "inline*", // Поддержка всех inline-узлов, включая file
 });
 
+const CustomResizableImage = ResizableImage.extend({
+  addAttributes() {
+    return {
+      ...this.parent?.(),
+      width: {
+        default: "300px",
+      },
+      height: {
+        default: "auto",
+      },
+    };
+  },
+});
+
 export default function useExtensions({
   placeholder,
 }: UseExtensionsOptions = {}): EditorOptions["extensions"] {
@@ -238,7 +252,7 @@ export default function useExtensions({
       Highlight.configure({ multicolor: true }),
       HorizontalRule,
 
-      ResizableImage.configure({
+      CustomResizableImage.configure({
         allowBase64: true,
       }),
 

src/shared/utils/index.ts

@@ -0,0 +1 @@
+export { createUrlWithParams } from "./url-utils";

src/shared/utils/url-utils.ts

@@ -0,0 +1,10 @@
+export const createUrlWithParams = (
+  urlTemplate: string,
+  params: Record<string, string | number>
+): string => {
+  let url = urlTemplate;
+  for (const [key, value] of Object.entries(params)) {
+    url = url.replace(`:${key}`, encodeURIComponent(String(value)));
+  }
+  return url;
+};