Skip to content

Commit 886161d

Browse files
refactor code
1 parent d5d646e commit 886161d

File tree

2 files changed

+18
-29
lines changed

2 files changed

+18
-29
lines changed

apps/OpenSign/src/constant/Utils.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,6 +1979,20 @@ export const handleSendOTP = async (email) => {
19791979
alert(error.message);
19801980
}
19811981
};
1982+
export const fetchUrl = async (url, pdfName) => {
1983+
try {
1984+
const response = await fetch(url);
1985+
if (!response.ok) {
1986+
alert("something went wrong, please try again later.");
1987+
throw new Error("Network response was not ok");
1988+
}
1989+
const blob = await response.blob();
1990+
saveAs(blob, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
1991+
} catch (error) {
1992+
alert("something went wrong, please try again later.");
1993+
console.error("Error downloading the file:", error);
1994+
}
1995+
};
19821996
//handle download signed pdf
19831997
export const handleDownloadPdf = async (
19841998
pdfDetails,
@@ -2001,18 +2015,7 @@ export const handleDownloadPdf = async (
20012015
}
20022016
);
20032017
const url = axiosRes.data.result;
2004-
try {
2005-
const response = await fetch(url);
2006-
if (!response.ok) {
2007-
alert("something went wrong, please try again later.");
2008-
throw new Error("Network response was not ok");
2009-
}
2010-
const blob = await response.blob();
2011-
saveAs(blob, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
2012-
} catch (error) {
2013-
alert("something went wrong, please try again later.");
2014-
console.error("Error downloading the file:", error);
2015-
}
2018+
await fetchUrl(url, pdfName);
20162019
setIsDownloading("");
20172020
} catch (err) {
20182021
console.log("err in getsignedurl", err);

apps/OpenSign/src/primitives/GetReportDisplay.js

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import Tooltip from "./Tooltip";
1010
import { RWebShare } from "react-web-share";
1111
import Tour from "reactour";
1212
import Parse from "parse";
13-
import { saveAs } from "file-saver";
1413
import {
1514
checkIsSubscribedTeam,
1615
copytoData,
16+
fetchUrl,
1717
replaceMailVaribles
1818
} from "../constant/Utils";
1919
import Confetti from "react-confetti";
@@ -27,7 +27,6 @@ import BulkSendUi from "../components/BulkSendUi";
2727
import Loader from "./Loader";
2828
import Select from "react-select";
2929
import SubscribeCard from "./SubscribeCard";
30-
import sanitizeFileName from "./sanitizeFileName";
3130

3231
const ReportTable = (props) => {
3332
const navigate = useNavigate();
@@ -602,21 +601,8 @@ const ReportTable = (props) => {
602601
if (url) {
603602
try {
604603
const signedUrl = await Parse.Cloud.run("getsignedurl", { url: url });
605-
// saveAs(signedUrl);
606-
try {
607-
const response = await fetch(signedUrl);
608-
if (!response.ok) {
609-
alert("something went wrong, please try again later.");
610-
throw new Error("Network response was not ok");
611-
}
612-
const blob = await response.blob();
613-
saveAs(blob, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
614-
setActLoader({});
615-
} catch (error) {
616-
alert("something went wrong, please try again later.");
617-
console.error("Error downloading the file:", error);
618-
setActLoader({});
619-
}
604+
await fetchUrl(signedUrl, pdfName);
605+
setActLoader({});
620606
} catch (err) {
621607
console.log("err in getsignedurl", err);
622608
alert("something went wrong, please try again later.");

0 commit comments

Comments
 (0)