add longer timeout on directory, add toast for zipping folders

Lodestone-Team · Jun 26, 2023 · 9071734 · 9071734
1 parent 67b77f2
commit 9071734
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/components/FileViewer/FileViewer.tsx b/src/components/FileViewer/FileViewer.tsx
@@ -208,7 +208,12 @@ export default function FileViewer() {
     if (!tickedFiles) return;
 
     for (const file of tickedFiles) {
-      downloadInstanceFile(instance.uuid, file);
+      const timeout = file?.file_type == 'Directory' ? 60000 : 5000;
+      if (file.file_type === 'Directory') {
+        toast.info('Zipping directory for download...');
+      }
+
+      downloadInstanceFile(instance.uuid, file, timeout);
       tickFile(file, false);
     }
   };

diff --git a/src/utils/apis.ts b/src/utils/apis.ts
@@ -120,19 +120,21 @@ export const deleteInstanceDirectory = async (
 
 export const requestInstanceFileUrl = async (
   uuid: string,
-  file: ClientFile
+  file: ClientFile,
+  timeout = 5000,
 ): Promise<string> => {
   const tokenResponse = await axiosWrapper<string>({
     method: 'get',
     url: `/instance/${uuid}/fs/${Base64.encode(file.path, true)}/url`,
+    timeout: timeout,
   });
   return axios.defaults.baseURL + `/file/${tokenResponse}`;
 };
 
-export const downloadInstanceFile = async (uuid: string, file: ClientFile) => {
+export const downloadInstanceFile = async (uuid: string, file: ClientFile, timeout = 5000) => {
   // TODO handle errors
 
-  window.open(await requestInstanceFileUrl(uuid, file), '_blank');
+  window.open(await requestInstanceFileUrl(uuid, file, timeout), '_blank');
 };
 
 export const uploadInstanceFiles = async (