fix: cleanup guard clause, add file icon

Author: barredterra

pdf_on_submit/public/js/pdf_button_utils.js

@@ -27,65 +27,68 @@ pdf_on_submit.build_pdf_url = function (frm, { print_format, letter_head }) {
 	return frappe.urllib.get_full_url("/api/method/frappe.utils.print_format.download_pdf?" + params);
 };
 
-pdf_on_submit.add_pdf_button = async function (frm) {
-	if (frm.is_new()) return;
+pdf_on_submit.add_pdf_button = function (frm) {
+	if (frm.is_new() || !frm.has_perm("print")) {
+		return;
+	}
 
-	frm.remove_custom_button(__("PDF"));
-
-	if (!frm.has_perm("print")) return;
-
-	frm.add_custom_button(__("PDF"), async () => {
-		// Open the popup synchronously while still in the user-gesture context,
-		// before any await, to avoid browser popup blockers.
-		const popup = window.open("", "_blank");
-		if (!popup) {
-			frappe.msgprint({
-				title: __("Popup Blocked"),
-				indicator: "orange",
-				message: __("Please allow popups for this site and try again."),
-			});
-			return;
-		}
-		try {
-			const matches = await frappe.xcall("pdf_on_submit.utils.get_print_details", {
-				doctype: frm.doc.doctype,
-				docname: frm.doc.name,
-			});
-
-			if (!matches || !matches.length) {
-				popup.close();
+	frm.page.add_button(
+		__("PDF"),
+		async () => {
+			// Open the popup synchronously while still in the user-gesture context,
+			// before any await, to avoid browser popup blockers.
+			const popup = window.open("", "_blank");
+			if (!popup) {
+				frappe.msgprint({
+					title: __("Popup Blocked"),
+					indicator: "orange",
+					message: __("Please allow popups for this site and try again."),
+				});
 				return;
 			}
+			try {
+				const matches = await frappe.xcall("pdf_on_submit.utils.get_print_details", {
+					doctype: frm.doc.doctype,
+					docname: frm.doc.name,
+				});
+
+				if (!matches || !matches.length) {
+					popup.close();
+					return;
+				}
 
-			const [first, ...rest] = matches;
-			popup.location.href = pdf_on_submit.build_pdf_url(frm, first);
+				const [first, ...rest] = matches;
+				popup.location.href = pdf_on_submit.build_pdf_url(frm, first);
 
-			if (rest.length) {
-				const items = rest
-					.map((m) => {
-						const label = m.letter_head
-							? `${frappe.utils.escape_html(m.print_format)} – ${frappe.utils.escape_html(m.letter_head)}`
-							: frappe.utils.escape_html(m.print_format);
-						const href = frappe.utils.escape_html(pdf_on_submit.build_pdf_url(frm, m));
-						return `<li><a href="${href}" target="_blank" rel="noopener">${label}</a></li>`;
-					})
-					.join("");
+				if (rest.length) {
+					const items = rest
+						.map((m) => {
+							const label = m.letter_head
+								? `${frappe.utils.escape_html(m.print_format)} – ${frappe.utils.escape_html(m.letter_head)}`
+								: frappe.utils.escape_html(m.print_format);
+							const href = frappe.utils.escape_html(pdf_on_submit.build_pdf_url(frm, m));
+							return `<li><a href="${href}" target="_blank" rel="noopener">${label}</a></li>`;
+						})
+						.join("");
+					frappe.msgprint({
+						title: __("Additional print formats"),
+						indicator: "blue",
+						message:
+							__("More formats are configured for this document. Click to open:") + `<ul>${items}</ul>`,
+					});
+				}
+			} catch (error) {
+				popup.close();
+				console.error("PDF generation failed:", error);
 				frappe.msgprint({
-					title: __("Additional print formats"),
-					indicator: "blue",
-					message: __("More formats are configured for this document. Click to open:") + `<ul>${items}</ul>`,
+					title: __("Error"),
+					indicator: "red",
+					message: __("Failed to generate PDF. {0}", [
+						error.message || __("Please check your permissions and try again."),
+					]),
 				});
 			}
-		} catch (error) {
-			popup.close();
-			console.error("PDF generation failed:", error);
-			frappe.msgprint({
-				title: __("Error"),
-				indicator: "red",
-				message: __("Failed to generate PDF. {0}", [
-					error.message || __("Please check your permissions and try again."),
-				]),
-			});
-		}
-	});
+		},
+		{ icon: "small-file" }
+	);
 };