tsv2-library 1.0.61-alpha.61 → 1.0.61-alpha.63

package/dist/src/utils/getImageURL.util.d.ts

@@ -1,5 +1,4 @@
 export declare const buildFileURL: (name?: string, width?: number, height?: number) => string;
-export declare const fetchBlobFile: (url: string, token: string) => Promise<Blob>;
 /**
  *
  * @param fileUrl The full URL
@@ -7,5 +6,5 @@ export declare const fetchBlobFile: (url: string, token: string) => Promise<Blob
  * @param immediateRevoke Immediately revoke the object URL after download - default to true
  * @returns
  */
-export declare const downloadFile: (fileUrl: string, fileName: string, immediateRevoke?: boolean) => Promise<string>;
+export declare const downloadFile: (fileUrl: string, customFileName?: string, immediateRevoke?: boolean) => Promise<string>;
 export declare const getImageURL: (name?: string | null, width?: number, height?: number, returnURLOnly?: boolean) => Promise<string | undefined>;

package/dist/tsv2-library.es.js

@@ -19186,11 +19186,11 @@ function generateXlsxFile(data30, _ref2) {
 }
 const prepareRows = (headers, data30) => {
   const rows3 = [];
+  if (headers) {
+    rows3.push(headers.map((h2) => ({ value: h2 })));
+  }
   const isObjectArray = Array.isArray(data30) && data30.length > 0 && !Array.isArray(data30[0]);
   if (isObjectArray) {
-    if (headers) {
-      rows3.push(headers.map((h2) => ({ value: h2 })));
-    }
     if (data30.length > 0) {
       const keys2 = Object.keys(data30[0]);
       data30.forEach((row2) => {
@@ -19204,9 +19204,6 @@ const prepareRows = (headers, data30) => {
     }
   } else if (Array.isArray(data30) && Array.isArray(data30[0])) {
     const arrayData = data30;
-    if (headers) {
-      rows3.push(headers.map((h2) => ({ value: h2 })));
-    }
     arrayData.forEach((row2) => {
       if (row2.length === 0) {
         rows3.push([{ value: "" }]);
@@ -19605,43 +19602,54 @@ const buildFileURL = (name, width2, height) => {
   }
   return url;
 };
+const getFilenameFromResponse = (response) => {
+  const contentDisposition = response.headers["Content-Disposition"];
+  if (!contentDisposition)
+    return null;
+  const quotedFilenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
+  const quotedMatch = contentDisposition.match(quotedFilenameRegex);
+  return (quotedMatch == null ? void 0 : quotedMatch[1]) ?? null;
+};
 const getAuthToken = () => {
   const user = JSON.parse(localStorage.getItem("user") ?? "{}");
   return user.jwt ?? user.token ?? "";
 };
-const fetchBlobFile = async (url, token) => {
-  const res = await fetch(url, {
+const fetchFile = async (url, token) => {
+  const res = await axios.get(url, {
+    responseType: "blob",
     headers: {
       Authorization: `Bearer ${token}`
     }
   });
-  if (!res.ok) {
-    throw new Error(`Image fetch failed: ${res.status} ${res.statusText}`);
-  }
-  const arrayBuffer = await res.arrayBuffer();
-  return new Blob([arrayBuffer], {
-    type: res.headers.get("Content-Type") || "image/webp"
-  });
+  return {
+    blob: new Blob([res.data], {
+      type: res.headers["Content-Type"] || "image/webp"
+    }),
+    fileName: getFilenameFromResponse(res)
+  };
 };
-const downloadFile = async (fileUrl, fileName, immediateRevoke = true) => {
+const downloadFile = async (fileUrl, customFileName, immediateRevoke = true) => {
   const token = getAuthToken();
-  const blob2 = await fetchBlobFile(fileUrl, token);
+  const { blob: blob2, fileName: fetchFileName } = await fetchFile(fileUrl, token);
   let objectUrl = "";
   const isViewable = /^(image|application\/pdf)/i.test(blob2.type);
-  if (isViewable) {
-    const file = new File([blob2], fileName, {
-      type: blob2.type
-    });
-    objectUrl = URL.createObjectURL(file);
-    window.open(objectUrl, "_blank");
-  } else {
-    objectUrl = URL.createObjectURL(blob2);
-    const a = document.createElement("a");
-    a.href = objectUrl;
-    a.download = fileName;
-    document.body.appendChild(a);
-    a.click();
-    a.remove();
+  const fileName = customFileName ?? fetchFileName;
+  if (fileName) {
+    if (isViewable) {
+      const file = new File([blob2], fileName, {
+        type: blob2.type
+      });
+      objectUrl = URL.createObjectURL(file);
+      window.open(objectUrl, "_blank");
+    } else {
+      objectUrl = URL.createObjectURL(blob2);
+      const a = document.createElement("a");
+      a.href = objectUrl;
+      a.download = fileName;
+      document.body.appendChild(a);
+      a.click();
+      a.remove();
+    }
   }
   if (immediateRevoke) {
     URL.revokeObjectURL(objectUrl);
@@ -19651,7 +19659,7 @@ const downloadFile = async (fileUrl, fileName, immediateRevoke = true) => {
 const createBlobURL = async (rawFileUrl) => {
   try {
     const token = getAuthToken();
-    const blob2 = await fetchBlobFile(rawFileUrl, token);
+    const { blob: blob2 } = await fetchFile(rawFileUrl, token);
     return URL.createObjectURL(blob2);
   } catch (err) {
     return void 0;