From fbd3cadee23cbfd2d01361790bbfd0187eb36ffa Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 4 Feb 2025 12:12:33 +0530 Subject: [PATCH] revert: error/webhook logs on every document (#31096) We serve millions of requests for reading a document, it doesn't make sense to check error and webhooks on all of them. Not all documents even have this configured. If you need it, add it using "connections dashboard" or some custom code. --- frappe/desk/form/load.py | 16 ---------- .../js/frappe/form/sidebar/form_sidebar.js | 32 ------------------- .../frappe/form/templates/form_sidebar.html | 2 -- 3 files changed, 50 deletions(-) diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index 11878ae6ad..6cee02e8e8 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -129,8 +129,6 @@ def get_docinfo(doc=None, doctype=None, name=None): "is_document_followed": is_document_followed(doc.doctype, doc.name, frappe.session.user), "tags": get_tags(doc.doctype, doc.name), "document_email": get_document_email(doc.doctype, doc.name), - "error_log_exists": get_error_log_exists(doc), - "webhook_request_log_log_exists": get_webhook_request_log_exists(doc), } ) @@ -204,20 +202,6 @@ def get_versions(doc: "Document") -> list[dict]: ) -def get_error_log_exists(doc: "Document") -> bool: - if has_permission("Error Log", print_logs=False): - return frappe.db.exists("Error Log", {"reference_doctype": doc.doctype, "reference_name": doc.name}) - return False - - -def get_webhook_request_log_exists(doc: "Document") -> bool: - if has_permission("Webhook Request Log", print_logs=False): - return frappe.db.exists( - "Webhook Request Log", {"reference_doctype": doc.doctype, "reference_document": doc.name} - ) - return False - - @frappe.whitelist() def get_communications(doctype, name, start=0, limit=20): from frappe.utils import cint diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index a92c24f52c..0193b659a2 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -35,8 +35,6 @@ frappe.ui.form.Sidebar = class { this.setup_keyboard_shortcuts(); this.show_auto_repeat_status(); - this.show_error_log_status(); - this.show_webhook_request_log_status(); frappe.ui.form.setup_user_image_event(this.frm); this.refresh(); @@ -158,36 +156,6 @@ frappe.ui.form.Sidebar = class { } } - show_error_log_status() { - const docinfo = this.frm.get_docinfo(); - if (docinfo.error_log_exists) { - let el = this.sidebar.find(".error-log-status"); - el.closest(".sidebar-section").removeClass("hidden"); - el.show(); - el.on("click", () => { - frappe.set_route("List", "Error Log", { - reference_doctype: this.frm.doc.doctype, - reference_name: this.frm.doc.name, - }); - }); - } - } - - show_webhook_request_log_status() { - const docinfo = this.frm.get_docinfo(); - if (docinfo.webhook_request_log_exists) { - let el = this.sidebar.find(".webhook-request-log-status"); - el.closest(".sidebar-section").removeClass("hidden"); - el.show(); - el.on("click", () => { - frappe.set_route("List", "Webhook Request Log", { - reference_doctype: this.frm.doc.doctype, - reference_document: this.frm.doc.name, - }); - }); - } - } - make_tags() { if (this.frm.meta.issingle) { this.sidebar.find(".form-tags").toggle(false); diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 7d9553ca53..e60362b1df 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -136,8 +136,6 @@