fix: save PDF in the same folder as HTML

NodeSecure · Jul 20, 2024 · f8bbda9 · f8bbda9
1 parent 5d74a18
commit f8bbda9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/api/report.js b/src/api/report.js
@@ -36,10 +36,15 @@ export async function report(
       finalReportLocation
     );
 
-    return await PDF(reportHTMLPath, {
-      title: reportConfig.title,
-      saveOnDisk: savePDFOnDisk
-    });
+    if (reportConfig.reporters.includes("pdf")) {
+      return await PDF(reportHTMLPath, {
+        title: reportConfig.title,
+        saveOnDisk: savePDFOnDisk,
+        reportOutputLocation: finalReportLocation
+      });
+    }
+
+    return reportHTMLPath;
   }
   finally {
     if (reportOutputLocation === null) {

diff --git a/src/reporting/pdf.js b/src/reporting/pdf.js
@@ -13,7 +13,11 @@ export async function PDF(
   reportHTMLPath,
   options
 ) {
-  const { title, saveOnDisk = true } = options;
+  const {
+    title,
+    saveOnDisk = true,
+    reportOutputLocation = CONSTANTS.DIRS.REPORTS
+  } = options;
 
   const browser = await puppeteer.launch({
     args: ["--no-sandbox", "--disable-setuid-sandbox"]
@@ -27,16 +31,17 @@ export async function PDF(
       timeout: 20_000
     });
 
+    const reportPath = saveOnDisk ? path.join(
+      reportOutputLocation,
+      utils.cleanReportName(title, ".pdf")
+    ) : undefined;
     const pdfBuffer = await page.pdf({
-      path: saveOnDisk ? path.join(
-        CONSTANTS.DIRS.REPORTS,
-        utils.cleanReportName(title, ".pdf")
-      ) : undefined,
+      path: reportPath,
       format: "A4",
       printBackground: true
     });
 
-    return saveOnDisk ? path : pdfBuffer;
+    return saveOnDisk ? reportPath : pdfBuffer;
   }
   finally {
     await page.close();