refactor(ui-raw): update getRawFile to return File instance instead…

… of custom RawFile type
AntaresSimulatorTeam · Dec 20, 2024 · 6c1713a · 6c1713a
1 parent 60cf750
commit 6c1713a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Json.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Json.tsx
@@ -42,8 +42,8 @@ function Json({ filePath, filename, studyId, canEdit }: DataCompProps) {
   ////////////////////////////////////////////////////////////////
 
   const handleDownload = async () => {
-    const { data, filename } = await getRawFile({ studyId, path: filePath });
-    downloadFile(data, filename);
+    const file = await getRawFile({ studyId, path: filePath });
+    return downloadFile(file, file.name);
   };
 
   const handleSave: JSONEditorProps["onSave"] = (json) => {

diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Text.tsx
@@ -92,8 +92,8 @@ function Text({
   ////////////////////////////////////////////////////////////////
 
   const handleDownload = async () => {
-    const { data, filename } = await getRawFile({ studyId, path: filePath });
-    downloadFile(data, filename);
+    const file = await getRawFile({ studyId, path: filePath });
+    return downloadFile(file, file.name);
   };
 
   const handleUploadSuccessful = () => {

diff --git a/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx b/webapp/src/components/App/Singlestudy/explore/Debug/Data/Unsupported.tsx
@@ -30,8 +30,8 @@ function Unsupported({ studyId, filePath, filename, canEdit }: DataCompProps) {
   ////////////////////////////////////////////////////////////////
 
   const handleDownload = async () => {
-    const { data, filename } = await getRawFile({ studyId, path: filePath });
-    downloadFile(data, filename);
+    const file = await getRawFile({ studyId, path: filePath });
+    return downloadFile(file, file.name);
   };
 
   ////////////////////////////////////////////////////////////////

diff --git a/webapp/src/components/common/buttons/DownloadMatrixButton.tsx b/webapp/src/components/common/buttons/DownloadMatrixButton.tsx
@@ -51,8 +51,8 @@ function DownloadMatrixButton(props: DownloadMatrixButtonProps) {
     }
 
     if (format === "raw") {
-      const { data, filename } = await getRawFile({ studyId, path });
-      return downloadFile(data, filename);
+      const file = await getRawFile({ studyId, path });
+      return downloadFile(file, file.name);
     }
 
     const isXlsx = format === "xlsx";

diff --git a/webapp/src/services/api/studies/raw/index.ts b/webapp/src/services/api/studies/raw/index.ts
@@ -94,7 +94,7 @@ export async function deleteFile(params: DeleteFileParams) {
  * @param params.path - Path to the file within the study
  * @returns Promise containing the file data and metadata
  */
-export async function getRawFile(params: GetRawFileParams): Promise<RawFile> {
+export async function getRawFile(params: GetRawFileParams) {
   const { studyId, path } = params;
 
   const { data, headers } = await client.get<RawFile["data"]>(
@@ -119,8 +119,8 @@ export async function getRawFile(params: GetRawFileParams): Promise<RawFile> {
     }
   }
 
-  return {
-    data,
-    filename,
-  };
+  return new File([data], filename, {
+    type: data.type, // Preserve the MIME type from the Blob
+    lastModified: new Date().getTime(),
+  });
 }
diff --git a/webapp/src/services/api/studies/raw/types.ts b/webapp/src/services/api/studies/raw/types.ts
@@ -46,7 +46,3 @@ export interface GetRawFileParams {
   studyId: string;
   path: string;
 }
-export interface RawFile {
-  data: Blob;
-  filename: string;
-}