working

3 files changed, 9 insertions, 5 deletions

diff --git a/frontend-components/plotly/src/utils/utils.ts b/frontend-components/plotly/src/utils/utils.ts
index 6cf205ee778..8e26317005a 100644
--- a/frontend-components/plotly/src/utils/utils.ts
+++ b/frontend-components/plotly/src/utils/utils.ts
@@ -185,6 +185,7 @@ export async function downloadData(columns: any, data: any) {
       ext = fileHandle.name.split(".").pop();
     }
     await loadingOverlay(`Saving ${ext.toUpperCase()}`);
+    await new Promise((resolve) => setTimeout(resolve, 1500));
     non_blocking(async function () {
       // @ts-ignore
       saveToFile(blob, filename, fileHandle).then(async function () {
diff --git a/frontend-components/tables/src/components/Table/index.tsx b/frontend-components/tables/src/components/Table/index.tsx
index f8a6c73640d..f6887be035a 100644
--- a/frontend-components/tables/src/components/Table/index.tsx
+++ b/frontend-components/tables/src/components/Table/index.tsx
@@ -336,6 +336,10 @@ export default function Table({
         open={open}
         setOpen={setOpen}
       />
+      <div id="loading" className="saving">
+                <div id="loading_text" className="loading_text"></div>
+                <div id="loader" className="loader"></div>
+              </div>
       <div
         ref={tableContainerRef}
         className={clsx("overflow-x-hidden h-screen")}
@@ -483,10 +487,6 @@ export default function Table({
         <div className="smh:hidden flex max-h-[68px] overflow-x-auto bg-white/70 dark:bg-grey-900/70 backdrop-filter backdrop-blur z-20 bottom-0 left-0 w-full gap-10 justify-between py-4 px-4 text-sm">
           <div className="flex items-center gap-10">
             <DialogPrimitive.Root>
-              <div id="loading" className="saving">
-                <div id="loading_text" className="loading_text"></div>
-                <div id="loader" className="loader"></div>
-              </div>
               <DialogPrimitive.Trigger className="_btn">
                 Settings
               </DialogPrimitive.Trigger>
diff --git a/frontend-components/tables/src/utils/utils.ts b/frontend-components/tables/src/utils/utils.ts
index f905ff9cbcb..f0039a4b41f 100644
--- a/frontend-components/tables/src/utils/utils.ts
+++ b/frontend-components/tables/src/utils/utils.ts
@@ -161,7 +161,6 @@ export const saveToFile = (
     }
     exportNativeFileSystem({ fileHandle, blob });
   } catch (error) {
-    console.error("oops, something went wrong!", error);
     const url = URL.createObjectURL(blob);
     const link = document.createElement("a");
     link.setAttribute("href", url);
@@ -188,6 +187,8 @@ export async function downloadData(
   );
   const csvData = [headers, ...rows];
 
+  await loadingOverlay(`Saving ${"CSV".toUpperCase()}`);
+
   if (type === "csv") {
     const csvContent = csvData.map((e) => e.join(",")).join("\n");
     const blob = new Blob([csvContent], { type: "text/csv;charset=utf-8;" });
@@ -199,6 +200,7 @@ export async function downloadData(
         filename: filename,
       });
       let ext: string = "csv";
+      
       if (fileHandle !== null) {
         // @ts-ignore
         ext = fileHandle.name.split(".").pop();
@@ -214,6 +216,7 @@ export async function downloadData(
         // @ts-ignore
         saveToFile(blob, filename, fileHandle).then(async function () {
           await new Promise((resolve) => setTimeout(resolve, 1500));
+          await loadingOverlay("",true);
         });
       }, 2)();
     } catch (error) {