Merge pull request #300 from SELab-2/development

Development
SELab-2 · May 23, 2024 · 866eb46 · 866eb46
2 parents dffe45c + 8691428
commit 866eb46
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/backend/web-bff/App/util/handleMultipart.js b/backend/web-bff/App/util/handleMultipart.js
@@ -10,8 +10,14 @@ function handleMultipart(req, res, next) {
 
     bb.on('file', (name, file, info) => {
         const {filename, encoding, mimetype} = info;
+        const buffers = [];
         file.on('data', (data) => {
-            form.append(name, data, {filename, contentType: mimetype});
+            buffers.push(data);
+        });
+
+        file.on('end', () => {
+            const buffer = Buffer.concat(buffers);
+            form.append(name, buffer, { filename, contentType: mimetype });
         });
     });
 

diff --git a/frontend/src/pages/project/components/SubmissionsTable.tsx b/frontend/src/pages/project/components/SubmissionsTable.tsx
@@ -121,7 +121,7 @@ const SubmissionsTable: FC<{ submissions: ProjectSubmissionsType[] | null; onCha
 
   const downloadSubmission = async (submission: ProjectSubmissionsType) => {
     if (!submission.submission) return console.error("No submission found");
-    downloadFile(submission.submission.fileUrl, submission.group.name + ".zip");
+    downloadFile(submission.submission.fileUrl.replace("/api/", "/web/api/") as ApiRoutes.SUBMISSION_FILE, submission.group.name + ".zip");
     if (withArtifacts && submission.submission.artifactUrl) {
       downloadFile(submission.submission.artifactUrl, submission.group.name + "-artifacts.zip");
     }

diff --git a/frontend/src/pages/submission/components/SubmissionCard.tsx b/frontend/src/pages/submission/components/SubmissionCard.tsx
@@ -1,7 +1,6 @@
 import { Card, theme, Button, Space } from "antd"
 import { useTranslation } from "react-i18next"
-import { GET_Responses } from "../../../@types/requests"
-import { ApiRoutes } from "../../../@types/requests"
+import { GET_Responses,ApiRoutes } from "../../../@types/requests.d"
 import { ArrowLeftOutlined, DownloadOutlined } from "@ant-design/icons"
 import { useLocation, useNavigate } from "react-router-dom"
 import "@fontsource/jetbrains-mono"
@@ -18,16 +17,17 @@ const SubmissionCard: React.FC<{ submission: SubmissionType }> = ({ submission }
   const location = useLocation()
   const index = new URLSearchParams(location.search).get("index")
 
-
+  console.log(submission);
   const downloadFile = async (route: ApiRoutes.SUBMISSION_FILE | ApiRoutes.SUBMISSION_ARTIFACT, filename: string) => {
 
     const response = await API.GET(
-      route,
+      route.replace("/api/","/web/api/") as ApiRoutes.SUBMISSION_FILE,
       {
         config: {
           responseType: "blob",
           transformResponse: [(data) => data],
         },
+
       },
       "message"
     )