From 037ff4c2a18b209d35ff9d7023d4a7573e17d7a5 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 29 Jun 2022 10:54:19 -0700
Subject: [PATCH] Resolve email rendering issue with JSR Update.
---
.../email-documents/email-documents.component.jsx | 6 ------
client/src/utils/RenderTemplate.js | 9 ++++-----
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/client/src/components/email-documents/email-documents.component.jsx b/client/src/components/email-documents/email-documents.component.jsx
index 7b3f393ae..7607e23e4 100644
--- a/client/src/components/email-documents/email-documents.component.jsx
+++ b/client/src/components/email-documents/email-documents.component.jsx
@@ -38,12 +38,6 @@ export function EmailDocumentsComponent({
nextFetchPolicy: "network-only",
});
- console.log(
- selectedMedia &&
- selectedMedia
- .filter((s) => s.isSelected)
- .reduce((acc, val) => (acc = acc + val.size), 0)
- );
return (
{loading && }
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index c6d4a0ea9..acdfe1bf2 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -111,15 +111,16 @@ export default async function RenderTemplate(
};
const pdfRender = await jsreport.render(pdfRequest);
- pdf = pdfRender.toDataURI();
+ pdf = await pdfRender.toDataURI();
}
+ const html = await render.toString();
return new Promise((resolve, reject) => {
resolve({
pdf,
filename:
Templates[templateObject.name] &&
Templates[templateObject.name].title,
- html: render.toString(),
+ html,
});
});
}
@@ -255,9 +256,7 @@ export async function RenderTemplates(
if (!renderAsHtml) {
render.download("Speed Print");
} else {
- return new Promise((resolve, reject) => {
- resolve(render.toString());
- });
+ return render.toString();
}
} catch (error) {
notification["error"]({ message: JSON.stringify(error) });