From 839eee7bd53626b549ca1717c13fc502829a332b Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 16 Apr 2022 08:04:07 +0530 Subject: [PATCH 01/33] fix: current job was not shown in workers view because of `if` conditions that should only be checked when view is Jobs --- .../page/background_jobs/background_jobs.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/frappe/core/page/background_jobs/background_jobs.py b/frappe/core/page/background_jobs/background_jobs.py index d3f5e3d32f..09213d64c3 100644 --- a/frappe/core/page/background_jobs/background_jobs.py +++ b/frappe/core/page/background_jobs/background_jobs.py @@ -22,11 +22,7 @@ JOB_COLORS = {"queued": "orange", "failed": "red", "started": "blue", "finished" def get_info(view=None, queue_timeout=None, job_status=None) -> List[Dict]: jobs = [] - def add_job(job: "Job", name: str) -> None: - if job_status != "all" and job.get_status() != job_status: - return - if queue_timeout != "all" and not name.endswith(f":{queue_timeout}"): - return + def add_job(job: "Job", queue: str) -> None: if job.kwargs.get("site") == frappe.local.site: job_info = { @@ -34,7 +30,7 @@ def get_info(view=None, queue_timeout=None, job_status=None) -> List[Dict]: or job.kwargs.get("kwargs", {}).get("job_type") or str(job.kwargs.get("job_name")), "status": job.get_status(), - "queue": name, + "queue": queue, "creation": convert_utc_to_user_timezone(job.created_at), "color": JOB_COLORS[job.get_status()], } @@ -48,14 +44,21 @@ def get_info(view=None, queue_timeout=None, job_status=None) -> List[Dict]: queues = get_queues() for queue in queues: for job in queue.jobs: + if job_status != "all" and job.get_status() != job_status: + return + if queue_timeout != "all" and not queue.name.endswith(f":{queue_timeout}"): + return add_job(job, queue.name) elif view == "Workers": workers = get_workers() for worker in workers: current_job = worker.get_current_job() - if current_job and current_job.kwargs.get("site") == frappe.local.site: - add_job(current_job, job.origin) + if current_job: + if hasattr(current_job, "kwargs") and current_job.kwargs.get("site") == frappe.local.site: + add_job(current_job, current_job.origin) + else: + jobs.append({"queue": worker.name, "job_name": "busy", "status": "", "creation": ""}) else: jobs.append({"queue": worker.name, "job_name": "idle", "status": "", "creation": ""}) From bafb1faa4891c9be76c3d12aa4f13cbe48ab4b88 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 18 Apr 2022 10:51:41 +0530 Subject: [PATCH 02/33] chore: Add semantic releases --- .github/workflows/release.yml | 25 +++++++++++++++++++++++++ .releaserc | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 .github/workflows/release.yml create mode 100644 .releaserc diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..d7cf89f017 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,25 @@ +name: Generate Semantic Release +on: + push: + branches: + - version-13 +jobs: + release: + name: Release + runs-on: ubuntu-18.04 + steps: + - name: Checkout Entire Repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Setup Node.js v14 + uses: actions/setup-node@v2 + with: + node-version: 14 + - name: Setup dependencies + run: | + npm install @semantic-release/git @semantic-release/exec --no-save + - name: Create Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: npx semantic-release \ No newline at end of file diff --git a/.releaserc b/.releaserc new file mode 100644 index 0000000000..9b18977478 --- /dev/null +++ b/.releaserc @@ -0,0 +1,25 @@ +{ + "branches": ["version-13"], + "plugins": [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + [ + "@semantic-release/exec", { + "prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" frappe/__init__.py' + } + ], + [ + "@semantic-release/git", { + "assets": ["frappe/__init__.py"], + "message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}" + } + ], + [ + "@semantic-release/github", { + "assets": [ + {"path": "dist/*"}, + ] + } + ] + ] +} \ No newline at end of file From 6c7d867dbd4e8dc83f46a958fccc166e5850c681 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 18 Apr 2022 13:10:59 +0530 Subject: [PATCH 03/33] chore: block major releases --- .releaserc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 9b18977478..2b3f4975db 100644 --- a/.releaserc +++ b/.releaserc @@ -1,7 +1,12 @@ { "branches": ["version-13"], "plugins": [ - "@semantic-release/commit-analyzer", + "@semantic-release/commit-analyzer", { + "preset": "angular", + "releaseRules": [ + {"breaking": true, "release": false} + ] + }, "@semantic-release/release-notes-generator", [ "@semantic-release/exec", { From 17aeec04c85168e84d94dc8205134a959f74cedd Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 18 Apr 2022 16:45:39 +0530 Subject: [PATCH 04/33] chore: do not publish any assets --- .releaserc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.releaserc b/.releaserc index 2b3f4975db..530a6c0767 100644 --- a/.releaserc +++ b/.releaserc @@ -19,12 +19,6 @@ "message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}" } ], - [ - "@semantic-release/github", { - "assets": [ - {"path": "dist/*"}, - ] - } - ] + "@semantic-release/github" ] } \ No newline at end of file From bf21d2fe2a3dee9ec68556a05ff795c2ea5c1779 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 18 Apr 2022 16:46:14 +0530 Subject: [PATCH 05/33] chore: use ubuntu latest --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7cf89f017..52fc595c96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: jobs: release: name: Release - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Checkout Entire Repository uses: actions/checkout@v2 From 57a55e4225821c6b9034b8633fe86eac624c002b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Apr 2022 15:19:25 +0530 Subject: [PATCH 06/33] feat(minor): Add document reference to Error Log and doc.log_error --- frappe/__init__.py | 29 ++- .../doctype/auto_repeat/auto_repeat.py | 2 +- .../doctype/communication/communication.py | 3 +- frappe/core/doctype/communication/email.py | 2 +- .../core/doctype/data_import/data_import.py | 2 +- frappe/core/doctype/error_log/error_log.json | 203 ++++++------------ frappe/core/doctype/file/file.py | 4 +- .../prepared_report/prepared_report.py | 2 +- frappe/core/doctype/user/user.py | 2 +- frappe/desk/desktop.py | 8 +- .../notification_log/notification_log.py | 2 +- .../system_console/system_console.json | 8 + frappe/desk/query_report.py | 2 +- .../auto_email_report/auto_email_report.py | 3 +- .../doctype/email_account/email_account.py | 9 +- .../email/doctype/email_queue/email_queue.py | 15 +- frappe/email/doctype/newsletter/newsletter.py | 10 +- .../doctype/notification/notification.py | 8 +- frappe/email/queue.py | 2 +- frappe/email/receive.py | 4 +- .../doctype/event_consumer/event_consumer.py | 2 +- frappe/model/document.py | 8 + frappe/model/workflow.py | 5 +- .../energy_point_rule/energy_point_rule.py | 4 + frappe/utils/print_format.py | 6 +- .../doctype/web_form/templates/web_form.html | 2 + 26 files changed, 152 insertions(+), 195 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 10c8afbf23..07a580944f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -2068,26 +2068,33 @@ def logger( ) -def log_error(message=None, title=_("Error")): - """Log error to Error Log""" +def log_error(title=None, message=None, reference_doctype=None, reference_name=None): + '''Log error to Error Log''' - # AI ALERT: + # Parameter ALERT: # the title and message may be swapped # the better API for this is log_error(title, message), and used in many cases this way # this hack tries to be smart about whats a title (single line ;-)) and fixes it if message: - if "\n" in title: - error, title = title, message + if '\n' in title: # traceback sent as title + traceback, title = title, message else: - error = message - else: - error = get_traceback() + traceback = message - return get_doc(dict(doctype="Error Log", error=as_unicode(error), method=title)).insert( - ignore_permissions=True - ) + if not traceback: + traceback = get_traceback() + if not title: + title = 'Error' + + return get_doc(dict( + doctype='Error Log', + error=as_unicode(traceback), + method=title, + reference_doctype=reference_doctype, + reference_name=reference_name + )).insert(ignore_permissions=True) def get_desk_link(doctype, name): html = ( diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index 5ff9e9f3ab..4b2f83f4b6 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -189,7 +189,7 @@ class AutoRepeat(Document): if self.notify_by_email and self.recipients: self.send_notification(new_doc) except Exception: - error_log = frappe.log_error(frappe.get_traceback(), _("Auto Repeat Document Creation Failure")) + error_log = self.log_error('Auto repeat failed') self.disable_auto_repeat() diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index 409c4c0956..eeddb7c7a1 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -450,8 +450,7 @@ def get_contacts(email_strings: List[str], auto_create_contact=False) -> List[st contact.insert(ignore_permissions=True) contact_name = contact.name except Exception: - traceback = frappe.get_traceback() - frappe.log_error(traceback) + contact.log_error('Unable to add contact') if contact_name: contacts.append(contact_name) diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index 5737572194..d47b15d360 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -248,7 +248,7 @@ def mark_email_as_seen(name: str = None): frappe.db.commit() # nosemgrep: this will be called in a GET request except Exception: - frappe.log_error(frappe.get_traceback()) + frappe.log_error('Unable to mark as seen', None, 'Communication', name) finally: frappe.response.update( diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py index 295f7e79ba..3693ea53a4 100644 --- a/frappe/core/doctype/data_import/data_import.py +++ b/frappe/core/doctype/data_import/data_import.py @@ -113,7 +113,7 @@ def start_import(data_import): except Exception: frappe.db.rollback() data_import.db_set("status", "Error") - frappe.log_error(title=data_import.name) + data_import.log_error('Data import failed') finally: frappe.flags.in_import = False diff --git a/frappe/core/doctype/error_log/error_log.json b/frappe/core/doctype/error_log/error_log.json index 35ca3ceeef..e643bbb090 100644 --- a/frappe/core/doctype/error_log/error_log.json +++ b/frappe/core/doctype/error_log/error_log.json @@ -1,148 +1,75 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "", - "beta": 0, - "creation": "2013-01-16 13:09:40", - "custom": 0, - "description": "Log of Scheduler Errors", - "docstatus": 0, - "doctype": "DocType", - "document_type": "System", - "editable_grid": 0, - "engine": "MyISAM", + "actions": [], + "creation": "2013-01-16 13:09:40", + "doctype": "DocType", + "document_type": "System", + "engine": "MyISAM", + "field_order": [ + "seen", + "method", + "error", + "reference_doctype", + "reference_name" + ], "fields": [ { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "seen", - "fieldtype": "Check", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Seen", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "default": "0", + "fieldname": "seen", + "fieldtype": "Check", + "hidden": 1, + "label": "Seen" + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "method", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Title", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "method", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title", + "read_only": 1 + }, { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "error", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Error", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldname": "error", + "fieldtype": "Code", + "label": "Error", + "read_only": 1 + }, + { + "fieldname": "reference_doctype", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Reference DocType", + "options": "DocType", + "search_index": 1 + }, + { + "fieldname": "reference_name", + "fieldtype": "Data", + "label": "Reference Name" } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "fa fa-warning-sign", - "idx": 1, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2021-10-25 12:21:44.292471", - "modified_by": "Administrator", - "module": "Core", - "name": "Error Log", - "owner": "Administrator", + ], + "icon": "fa fa-warning-sign", + "idx": 1, + "links": [], + "modified": "2022-04-18 14:51:30.604304", + "modified_by": "Administrator", + "module": "Core", + "name": "Error Log", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, "write": 1 } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_order": "ASC", - "track_seen": 0 -} + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "ASC", + "states": [] +} \ No newline at end of file diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index d8b45cf043..3547a03832 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -1043,7 +1043,7 @@ def attach_files_to_document(doc, event): ): return - frappe.get_doc( + file_doc = frappe.get_doc( doctype="File", file_url=value, attached_to_name=doc.name, @@ -1052,4 +1052,4 @@ def attach_files_to_document(doc, event): folder="Home/Attachments", ).insert() except Exception: - frappe.log_error(title=_("Error Attaching File")) + file_doc.log_error("Error Attaching File") diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index c3122fe52f..dbdba19fbe 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -47,7 +47,7 @@ def run_background(prepared_report): instance.save(ignore_permissions=True) except Exception: - frappe.log_error(frappe.get_traceback()) + report.log_error('Prepared report failed') instance = frappe.get_doc("Prepared Report", prepared_report) instance.status = "Error" instance.error_message = frappe.get_traceback() diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index c90cbf1fce..ec7374d72a 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -265,7 +265,7 @@ class User(Document): except frappe.OutgoingEmailError: # email server not set, don't send email - frappe.log_error(frappe.get_traceback()) + self.log_error('Unable to send new password notification') @Document.hook def validate_reset_password(self): diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 385151f754..ae34cf3df2 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -338,7 +338,7 @@ def get_desktop_page(page): "onboardings": workspace.onboardings, } except DoesNotExistError: - frappe.log_error(frappe.get_traceback()) + frappe.log_error('Workspace Missing') return {} @@ -469,10 +469,8 @@ def save_new_widget(doc, page, blocks, new_widgets): page: {0} config: {1} exception: {2} - """.format( - page, json_config, e - ) - frappe.log_error(log, _("Could not save customization")) + """.format(page, json_config, e) + doc.log_error("Could not save customization", log) return False return True diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index 1a466ea78b..011f3e22ff 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -20,7 +20,7 @@ class NotificationLog(Document): try: send_notification_email(self) except frappe.OutgoingEmailError: - frappe.log_error(message=frappe.get_traceback(), title=_("Failed to send notification email")) + self.log_error(_("Failed to send notification email")) def get_permission_query_conditions(for_user): diff --git a/frappe/desk/doctype/system_console/system_console.json b/frappe/desk/doctype/system_console/system_console.json index c92b2005ed..bbb815e30e 100644 --- a/frappe/desk/doctype/system_console/system_console.json +++ b/frappe/desk/doctype/system_console/system_console.json @@ -1,7 +1,11 @@ { "actions": [ { +<<<<<<< HEAD "action": "app/console-log", +======= + "action": "/app/console-log", +>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) "action_type": "Route", "label": "Logs" }, @@ -86,7 +90,11 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], +<<<<<<< HEAD "modified": "2022-04-09 16:35:32.345542", +======= + "modified": "2022-04-15 14:15:58.398590", +>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) "modified_by": "Administrator", "module": "Desk", "name": "System Console", diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 7de8ccabbf..d1f63a6199 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -314,7 +314,7 @@ def get_prepared_report_result(report, filters, dn="", user=None): latest_report_data = {"columns": columns, "result": data} except Exception: - frappe.log_error(frappe.get_traceback()) + doc.log_error(frappe.get_traceback()) frappe.delete_doc("Prepared Report", doc.name) frappe.db.commit() doc = None diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index f4fdcf4275..108cc46792 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -255,8 +255,7 @@ def send_daily(): try: auto_email_report.send() except Exception as e: - frappe.log_error(e, _("Failed to send {0} Auto Email Report").format(auto_email_report.name)) - + auto_email_report.log_error('Failed to send {0} Auto Email Report'.format(auto_email_report.name)) def send_monthly(): """Check reports to be sent monthly""" diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index e60be0d965..65586de31d 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -473,7 +473,7 @@ class EmailAccount(Document): frappe.db.rollback() except Exception: frappe.db.rollback() - frappe.log_error(title="EmailAccount.receive") + self.log_error(title="EmailAccount.receive") if self.use_imap: self.handle_bad_emails(mail.uid, mail.raw_message, frappe.get_traceback()) exceptions.append(frappe.get_traceback()) @@ -521,7 +521,7 @@ class EmailAccount(Document): # close connection to mailserver email_server.logout() except Exception: - frappe.log_error(title=_("Error while connecting to email account {0}").format(self.name)) + self.log_error(title=_("Error while connecting to email account {0}").format(self.name)) return [] return mails @@ -667,7 +667,7 @@ class EmailAccount(Document): try: email_server = self.get_incoming_server(in_receive=True) except Exception: - frappe.log_error(title=_("Error while connecting to email account {0}").format(self.name)) + self.log_error(title=_("Error while connecting to email account {0}").format(self.name)) if not email_server: return @@ -679,8 +679,7 @@ class EmailAccount(Document): message = safe_encode(message) email_server.imap.append("Sent", "\\Seen", imaplib.Time2Internaldate(time.time()), message) except Exception: - frappe.log_error(title="EmailAccount.append_email_to_sent_folder") - + self.log_error(title="EmailAccount.append_email_to_sent_folder") @frappe.whitelist() def get_append_to( diff --git a/frappe/email/doctype/email_queue/email_queue.py b/frappe/email/doctype/email_queue/email_queue.py index 38577eeb97..b3e52ef1e2 100644 --- a/frappe/email/doctype/email_queue/email_queue.py +++ b/frappe/email/doctype/email_queue/email_queue.py @@ -198,10 +198,7 @@ class SendMailContext: traceback_string = "".join(traceback.format_tb(exc_tb)) traceback_string += f"\n Queue Name: {self.queue_doc.name}" - if self.is_background_task: - frappe.log_error(title="frappe.email.queue.flush", message=traceback_string) - else: - frappe.log_error(message=traceback_string) + self.queue_doc.log_error('Email sending failed', traceback_string) @property def smtp_session(self): @@ -625,12 +622,10 @@ class QueueBuilder: mail_to_string = cstr(mail.as_string()) except frappe.InvalidEmailAddressError: # bad Email Address - don't add to queue - frappe.log_error( - "Invalid Email ID Sender: {0}, Recipients: {1}, \nTraceback: {2} ".format( - self.sender, ", ".join(self.final_recipients()), traceback.format_exc() - ), - "Email Not Sent", - ) + self.log_error( + title = 'Invalid email address', + message = 'Invalid email address Sender: {0}, Recipients: {1}, \nTraceback: {2} ' + .format(self.sender, ', '.join(self.final_recipients()), traceback.format_exc())) return d = { diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 45a4539866..e3726ed5a6 100644 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -329,19 +329,25 @@ def send_scheduled_email(): pluck="name", ) - for newsletter in scheduled_newsletter: + for newsletter_name in scheduled_newsletter: try: - frappe.get_doc("Newsletter", newsletter).queue_all() + newsletter = frappe.get_doc("Newsletter", newsletter_name) + newsletter.queue_all() except Exception: frappe.db.rollback() # wasn't able to send emails :( +<<<<<<< HEAD frappe.db.set_value("Newsletter", newsletter, "email_sent", 0) message = ( f"Newsletter {newsletter} failed to send" "\n\n" f"Traceback: {frappe.get_traceback()}" ) frappe.log_error(title="Send Newsletter", message=message) +======= + frappe.db.set_value("Newsletter", newsletter_name, "email_sent", 0) + newsletter.log_error('Failed to send newsletter') +>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) if not frappe.flags.in_test: frappe.db.commit() diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index 5c27eb95eb..e868c0ceb6 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -141,7 +141,7 @@ def get_context(context): self.create_system_notification(doc, context) except: - frappe.log_error(title="Failed to send notification", message=frappe.get_traceback()) + self.log_error('Failed to send Notification') if self.set_property_after_alert: allow_update = True @@ -168,7 +168,7 @@ def get_context(context): doc.save(ignore_permissions=True) doc.flags.in_notification_update = False except Exception: - frappe.log_error(title="Document update failed", message=frappe.get_traceback()) + self.log_error('Document update failed') def create_system_notification(self, doc, context): subject = self.subject @@ -432,8 +432,8 @@ def evaluate_alert(doc, alert, event): if event == "Value Change" and not doc.is_new(): if not frappe.db.has_column(doc.doctype, alert.value_changed): - alert.db_set("enabled", 0) - frappe.log_error("Notification {0} has been disabled due to missing field".format(alert.name)) + alert.db_set('enabled', 0) + alert.log_error('Notification {0} has been disabled due to missing field'.format(alert.name)) return doc_before_save = doc.get_doc_before_save() diff --git a/frappe/email/queue.py b/frappe/email/queue.py index b0a3b0583b..ac873182a7 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -170,7 +170,7 @@ def flush(from_test=False): is_background_task = not from_test func(email_queue_name=row.name, is_background_task=is_background_task) except Exception: - frappe.log_error() + frappe.get_doc('Email Queue', row.name).log_error() def get_queue(): diff --git a/frappe/email/receive.py b/frappe/email/receive.py index 4a6db65a84..80c413faa1 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -123,7 +123,7 @@ class EmailServer: except _socket.error: # log performs rollback and logs error in Error Log - frappe.log_error("receive.connect_pop") + self.log_error("POP: Unable to connect") # Invalid mail server -- due to refusing connection frappe.msgprint(_("Invalid Mail Server. Please rectify and try again.")) @@ -306,7 +306,7 @@ class EmailServer: else: # log performs rollback and logs error in Error Log - frappe.log_error("receive.get_messages", self.make_error_msg(msg_num, incoming_mail)) + self.log_error("Unable to fetch email", self.make_error_msg(msg_num, incoming_mail)) self.errors = True frappe.db.rollback() diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index 287a1fca03..dd3d2ec74c 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -213,5 +213,5 @@ def has_consumer_access(consumer, update_log): else: return frappe.safe_eval(condition, frappe._dict(doc=doc)) except Exception as e: - frappe.log_error(title="has_consumer_access error", message=e) + consumer.log_error('has_consumer_access error') return False diff --git a/frappe/model/document.py b/frappe/model/document.py index 58c406607d..a7b59ae749 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1362,6 +1362,14 @@ class Document(BaseDocument): ).insert(ignore_permissions=True) frappe.local.flags.commit = True + def log_error(self, title=None, message=None): + '''Helper function to create an Error Log''' + return frappe.log_error( + message = message, + title = title, + reference_doctype = self.doctype, + reference_name = self.name) + def get_signature(self): """Returns signature (hash) for private URL.""" return hashlib.sha224(get_datetime_str(self.creation).encode()).hexdigest() diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py index 0edffaf2fb..092ad4f764 100644 --- a/frappe/model/workflow.py +++ b/frappe/model/workflow.py @@ -254,8 +254,9 @@ def bulk_workflow_approval(docnames, doctype, action): frappe.db.rollback() frappe.log_error( - frappe.get_traceback(), - "Workflow {0} threw an error for {1} {2}".format(action, doctype, docname), + title = "Workflow {0} threw an error for {1} {2}".format(action, doctype, docname), + reference_doctype = 'Workflow', + reference_name = action ) finally: if not message_dict: diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py index a36581ec4c..3767a9564e 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py @@ -57,7 +57,11 @@ class EnergyPointRule(Document): self.apply_only_once, ) except Exception as e: +<<<<<<< HEAD frappe.log_error(frappe.get_traceback(), "apply_energy_point") +======= + self.log_error('Energy points failed') +>>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) def rule_condition_satisfied(self, doc): if self.for_doc_event == "New": diff --git a/frappe/utils/print_format.py b/frappe/utils/print_format.py index 35842217d1..2488fae0c9 100644 --- a/frappe/utils/print_format.py +++ b/frappe/utils/print_format.py @@ -92,7 +92,11 @@ def download_multi_pdf(doctype, name, format=None, no_letterhead=False, options= pdf_options=options, ) except Exception: - frappe.log_error("Permission Error on doc {} of doctype {}".format(doc_name, doctype_name)) + frappe.log_error( + title = 'Error in Multi PDF download', + message = "Permission Error on doc {} of doctype {}".format(doc_name, doctype_name), + reference_doctype = doctype_name, + reference_name = doc_name) frappe.local.response.filename = "{}.pdf".format(name) frappe.local.response.filecontent = read_multi_pdf(output) diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index 2a02aa5f2b..6e0374abdb 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -70,6 +70,8 @@ data-web-form="{{ name }}" data-web-form-doctype="{{ doc_type }}" data-login-req
{% include 'templates/includes/comments/comments.html' %}
+{%- else -%} +
{%- endif %} {# comments #} {% endblock page_content %} From d55986d56dbd78497dd42c48e3e02dedb0be16e5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Apr 2022 15:47:05 +0530 Subject: [PATCH 07/33] fix(conflicts): fix conflicts' --- frappe/desk/doctype/system_console/system_console.json | 10 +--------- frappe/desk/query_report.py | 2 +- frappe/email/doctype/newsletter/newsletter.py | 10 +--------- .../doctype/energy_point_rule/energy_point_rule.py | 6 +----- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/frappe/desk/doctype/system_console/system_console.json b/frappe/desk/doctype/system_console/system_console.json index bbb815e30e..a851831909 100644 --- a/frappe/desk/doctype/system_console/system_console.json +++ b/frappe/desk/doctype/system_console/system_console.json @@ -1,11 +1,7 @@ { "actions": [ { -<<<<<<< HEAD - "action": "app/console-log", -======= "action": "/app/console-log", ->>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) "action_type": "Route", "label": "Logs" }, @@ -90,11 +86,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2022-04-09 16:35:32.345542", -======= "modified": "2022-04-15 14:15:58.398590", ->>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) "modified_by": "Administrator", "module": "Desk", "name": "System Console", @@ -114,4 +106,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index d1f63a6199..894e82d117 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -314,7 +314,7 @@ def get_prepared_report_result(report, filters, dn="", user=None): latest_report_data = {"columns": columns, "result": data} except Exception: - doc.log_error(frappe.get_traceback()) + doc.log_error("Prepared report failed") frappe.delete_doc("Prepared Report", doc.name) frappe.db.commit() doc = None diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index e3726ed5a6..6aa881ed5c 100644 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -338,16 +338,8 @@ def send_scheduled_email(): frappe.db.rollback() # wasn't able to send emails :( -<<<<<<< HEAD - frappe.db.set_value("Newsletter", newsletter, "email_sent", 0) - message = ( - f"Newsletter {newsletter} failed to send" "\n\n" f"Traceback: {frappe.get_traceback()}" - ) - frappe.log_error(title="Send Newsletter", message=message) -======= frappe.db.set_value("Newsletter", newsletter_name, "email_sent", 0) - newsletter.log_error('Failed to send newsletter') ->>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) + newsletter.log_error("Failed to send newsletter") if not frappe.flags.in_test: frappe.db.commit() diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py index 3767a9564e..9d393dde48 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py @@ -57,11 +57,7 @@ class EnergyPointRule(Document): self.apply_only_once, ) except Exception as e: -<<<<<<< HEAD - frappe.log_error(frappe.get_traceback(), "apply_energy_point") -======= - self.log_error('Energy points failed') ->>>>>>> 6d82805831 (feat(minor): Add document reference to Error Log and doc.log_error) + self.log_error("Energy points failed") def rule_condition_satisfied(self, doc): if self.for_doc_event == "New": From fca6c3d305fc64458c070eedf1ea49e44dc50e96 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Apr 2022 15:59:38 +0530 Subject: [PATCH 08/33] fix(minor): circular imports? --- frappe/cache_manager.py | 1 - frappe/model/naming.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index b15f8f2234..01ccc03753 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -5,7 +5,6 @@ import json import frappe from frappe.desk.notifications import clear_notifications, delete_notification_count_for -from frappe.model.document import Document common_default_keys = ["__default", "__global"] diff --git a/frappe/model/naming.py b/frappe/model/naming.py index 9d1079d995..aa502f5a4c 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Optional, Union import frappe from frappe import _ -from frappe.database.sequence import get_next_val, set_next_val from frappe.model import log_types from frappe.query_builder import DocType from frappe.utils import cint, cstr, now_datetime @@ -36,6 +35,8 @@ def set_new_name(doc): doc.name = None if is_autoincremented(doc.doctype, meta): + from frappe.database.sequence import get_next_val + doc.name = get_next_val(doc.doctype) return @@ -322,11 +323,14 @@ def get_default_naming_series(doctype): def validate_name(doctype: str, name: Union[int, str], case: Optional[str] = None): + if not name: frappe.throw(_("No Name Specified for {0}").format(doctype)) if isinstance(name, int): if is_autoincremented(doctype): + from frappe.database.sequence import set_next_val + # this will set the sequence val to be the provided name and set it to be used # so that the sequence will start from the next val of the setted val(name) set_next_val(doctype, name, is_val_used=True) From 6e6fe9521e403aadb73df5e0b20eb683b3f30617 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Apr 2022 16:14:24 +0530 Subject: [PATCH 09/33] fix(linting): no single quotes :'| --- frappe/__init__.py | 23 +++++++++++-------- .../doctype/auto_repeat/auto_repeat.py | 2 +- .../doctype/communication/communication.py | 2 +- frappe/core/doctype/communication/email.py | 2 +- .../core/doctype/data_import/data_import.py | 2 +- .../prepared_report/prepared_report.py | 2 +- frappe/core/doctype/user/user.py | 2 +- frappe/desk/desktop.py | 6 +++-- .../auto_email_report/auto_email_report.py | 5 +++- .../email/doctype/email_queue/email_queue.py | 10 ++++---- .../doctype/notification/notification.py | 8 +++---- .../doctype/event_consumer/event_consumer.py | 2 +- frappe/model/document.py | 8 +++---- frappe/model/workflow.py | 6 ++--- frappe/utils/print_format.py | 9 ++++---- 15 files changed, 49 insertions(+), 40 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 07a580944f..dcc401c036 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -2069,7 +2069,7 @@ def logger( def log_error(title=None, message=None, reference_doctype=None, reference_name=None): - '''Log error to Error Log''' + """Log error to Error Log""" # Parameter ALERT: # the title and message may be swapped @@ -2077,7 +2077,7 @@ def log_error(title=None, message=None, reference_doctype=None, reference_name=N # this hack tries to be smart about whats a title (single line ;-)) and fixes it if message: - if '\n' in title: # traceback sent as title + if "\n" in title: # traceback sent as title traceback, title = title, message else: traceback = message @@ -2086,15 +2086,18 @@ def log_error(title=None, message=None, reference_doctype=None, reference_name=N traceback = get_traceback() if not title: - title = 'Error' + title = "Error" + + return get_doc( + dict( + doctype="Error Log", + error=as_unicode(traceback), + method=title, + reference_doctype=reference_doctype, + reference_name=reference_name, + ) + ).insert(ignore_permissions=True) - return get_doc(dict( - doctype='Error Log', - error=as_unicode(traceback), - method=title, - reference_doctype=reference_doctype, - reference_name=reference_name - )).insert(ignore_permissions=True) def get_desk_link(doctype, name): html = ( diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index 4b2f83f4b6..d3399f7726 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -189,7 +189,7 @@ class AutoRepeat(Document): if self.notify_by_email and self.recipients: self.send_notification(new_doc) except Exception: - error_log = self.log_error('Auto repeat failed') + error_log = self.log_error("Auto repeat failed") self.disable_auto_repeat() diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py index eeddb7c7a1..f0e80c2207 100644 --- a/frappe/core/doctype/communication/communication.py +++ b/frappe/core/doctype/communication/communication.py @@ -450,7 +450,7 @@ def get_contacts(email_strings: List[str], auto_create_contact=False) -> List[st contact.insert(ignore_permissions=True) contact_name = contact.name except Exception: - contact.log_error('Unable to add contact') + contact.log_error("Unable to add contact") if contact_name: contacts.append(contact_name) diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index d47b15d360..464bc35a1c 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -248,7 +248,7 @@ def mark_email_as_seen(name: str = None): frappe.db.commit() # nosemgrep: this will be called in a GET request except Exception: - frappe.log_error('Unable to mark as seen', None, 'Communication', name) + frappe.log_error("Unable to mark as seen", None, "Communication", name) finally: frappe.response.update( diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py index 3693ea53a4..06282e5831 100644 --- a/frappe/core/doctype/data_import/data_import.py +++ b/frappe/core/doctype/data_import/data_import.py @@ -113,7 +113,7 @@ def start_import(data_import): except Exception: frappe.db.rollback() data_import.db_set("status", "Error") - data_import.log_error('Data import failed') + data_import.log_error("Data import failed") finally: frappe.flags.in_import = False diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index dbdba19fbe..e35ec43565 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -47,7 +47,7 @@ def run_background(prepared_report): instance.save(ignore_permissions=True) except Exception: - report.log_error('Prepared report failed') + report.log_error("Prepared report failed") instance = frappe.get_doc("Prepared Report", prepared_report) instance.status = "Error" instance.error_message = frappe.get_traceback() diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index ec7374d72a..e81f5ecd99 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -265,7 +265,7 @@ class User(Document): except frappe.OutgoingEmailError: # email server not set, don't send email - self.log_error('Unable to send new password notification') + self.log_error("Unable to send new password notification") @Document.hook def validate_reset_password(self): diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index ae34cf3df2..4c82fe8c73 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -338,7 +338,7 @@ def get_desktop_page(page): "onboardings": workspace.onboardings, } except DoesNotExistError: - frappe.log_error('Workspace Missing') + frappe.log_error("Workspace Missing") return {} @@ -469,7 +469,9 @@ def save_new_widget(doc, page, blocks, new_widgets): page: {0} config: {1} exception: {2} - """.format(page, json_config, e) + """.format( + page, json_config, e + ) doc.log_error("Could not save customization", log) return False diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 108cc46792..7a9af6149a 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -255,7 +255,10 @@ def send_daily(): try: auto_email_report.send() except Exception as e: - auto_email_report.log_error('Failed to send {0} Auto Email Report'.format(auto_email_report.name)) + auto_email_report.log_error( + "Failed to send {0} Auto Email Report".format(auto_email_report.name) + ) + def send_monthly(): """Check reports to be sent monthly""" diff --git a/frappe/email/doctype/email_queue/email_queue.py b/frappe/email/doctype/email_queue/email_queue.py index b3e52ef1e2..61d730829b 100644 --- a/frappe/email/doctype/email_queue/email_queue.py +++ b/frappe/email/doctype/email_queue/email_queue.py @@ -198,7 +198,7 @@ class SendMailContext: traceback_string = "".join(traceback.format_tb(exc_tb)) traceback_string += f"\n Queue Name: {self.queue_doc.name}" - self.queue_doc.log_error('Email sending failed', traceback_string) + self.queue_doc.log_error("Email sending failed", traceback_string) @property def smtp_session(self): @@ -623,9 +623,11 @@ class QueueBuilder: except frappe.InvalidEmailAddressError: # bad Email Address - don't add to queue self.log_error( - title = 'Invalid email address', - message = 'Invalid email address Sender: {0}, Recipients: {1}, \nTraceback: {2} ' - .format(self.sender, ', '.join(self.final_recipients()), traceback.format_exc())) + title="Invalid email address", + message="Invalid email address Sender: {0}, Recipients: {1}, \nTraceback: {2} ".format( + self.sender, ", ".join(self.final_recipients()), traceback.format_exc() + ), + ) return d = { diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index e868c0ceb6..5543ae6b5d 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -141,7 +141,7 @@ def get_context(context): self.create_system_notification(doc, context) except: - self.log_error('Failed to send Notification') + self.log_error("Failed to send Notification") if self.set_property_after_alert: allow_update = True @@ -168,7 +168,7 @@ def get_context(context): doc.save(ignore_permissions=True) doc.flags.in_notification_update = False except Exception: - self.log_error('Document update failed') + self.log_error("Document update failed") def create_system_notification(self, doc, context): subject = self.subject @@ -432,8 +432,8 @@ def evaluate_alert(doc, alert, event): if event == "Value Change" and not doc.is_new(): if not frappe.db.has_column(doc.doctype, alert.value_changed): - alert.db_set('enabled', 0) - alert.log_error('Notification {0} has been disabled due to missing field'.format(alert.name)) + alert.db_set("enabled", 0) + alert.log_error("Notification {0} has been disabled due to missing field".format(alert.name)) return doc_before_save = doc.get_doc_before_save() diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index dd3d2ec74c..bcd3d3be39 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -213,5 +213,5 @@ def has_consumer_access(consumer, update_log): else: return frappe.safe_eval(condition, frappe._dict(doc=doc)) except Exception as e: - consumer.log_error('has_consumer_access error') + consumer.log_error("has_consumer_access error") return False diff --git a/frappe/model/document.py b/frappe/model/document.py index a7b59ae749..67e1de0932 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1363,12 +1363,10 @@ class Document(BaseDocument): frappe.local.flags.commit = True def log_error(self, title=None, message=None): - '''Helper function to create an Error Log''' + """Helper function to create an Error Log""" return frappe.log_error( - message = message, - title = title, - reference_doctype = self.doctype, - reference_name = self.name) + message=message, title=title, reference_doctype=self.doctype, reference_name=self.name + ) def get_signature(self): """Returns signature (hash) for private URL.""" diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py index 092ad4f764..96fd710d91 100644 --- a/frappe/model/workflow.py +++ b/frappe/model/workflow.py @@ -254,9 +254,9 @@ def bulk_workflow_approval(docnames, doctype, action): frappe.db.rollback() frappe.log_error( - title = "Workflow {0} threw an error for {1} {2}".format(action, doctype, docname), - reference_doctype = 'Workflow', - reference_name = action + title="Workflow {0} threw an error for {1} {2}".format(action, doctype, docname), + reference_doctype="Workflow", + reference_name=action, ) finally: if not message_dict: diff --git a/frappe/utils/print_format.py b/frappe/utils/print_format.py index 2488fae0c9..87fb646f47 100644 --- a/frappe/utils/print_format.py +++ b/frappe/utils/print_format.py @@ -93,10 +93,11 @@ def download_multi_pdf(doctype, name, format=None, no_letterhead=False, options= ) except Exception: frappe.log_error( - title = 'Error in Multi PDF download', - message = "Permission Error on doc {} of doctype {}".format(doc_name, doctype_name), - reference_doctype = doctype_name, - reference_name = doc_name) + title="Error in Multi PDF download", + message="Permission Error on doc {} of doctype {}".format(doc_name, doctype_name), + reference_doctype=doctype_name, + reference_name=doc_name, + ) frappe.local.response.filename = "{}.pdf".format(name) frappe.local.response.filecontent = read_multi_pdf(output) From d9fbee3b9c77587960fcce2b1f7817ff2267c465 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Apr 2022 16:19:46 +0530 Subject: [PATCH 10/33] fix(minor): frappe.log_error --- frappe/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/__init__.py b/frappe/__init__.py index dcc401c036..e3a3769480 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -2076,6 +2076,7 @@ def log_error(title=None, message=None, reference_doctype=None, reference_name=N # the better API for this is log_error(title, message), and used in many cases this way # this hack tries to be smart about whats a title (single line ;-)) and fixes it + traceback = None if message: if "\n" in title: # traceback sent as title traceback, title = title, message From 626ef14e1ef03d2f02e17a83c4c04bb1ad1da927 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Apr 2022 16:23:11 +0530 Subject: [PATCH 11/33] fix(linting): fix quotes --- frappe/email/doctype/email_account/email_account.py | 5 +++-- frappe/email/queue.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 65586de31d..73ab13b851 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -667,7 +667,7 @@ class EmailAccount(Document): try: email_server = self.get_incoming_server(in_receive=True) except Exception: - self.log_error(title=_("Error while connecting to email account {0}").format(self.name)) + self.log_error("Email Connection Error") if not email_server: return @@ -679,7 +679,8 @@ class EmailAccount(Document): message = safe_encode(message) email_server.imap.append("Sent", "\\Seen", imaplib.Time2Internaldate(time.time()), message) except Exception: - self.log_error(title="EmailAccount.append_email_to_sent_folder") + self.log_error("Unable to add to Sent folder") + @frappe.whitelist() def get_append_to( diff --git a/frappe/email/queue.py b/frappe/email/queue.py index ac873182a7..b92dea3e65 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -170,7 +170,7 @@ def flush(from_test=False): is_background_task = not from_test func(email_queue_name=row.name, is_background_task=is_background_task) except Exception: - frappe.get_doc('Email Queue', row.name).log_error() + frappe.get_doc("Email Queue", row.name).log_error() def get_queue(): From 930ae45fb8669aae8c2f9fb2bd89e08f4fb170c0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Apr 2022 17:27:33 +0530 Subject: [PATCH 12/33] fix(test): add a test for Error Log --- frappe/core/doctype/error_log/error_log.json | 5 +++-- frappe/core/doctype/error_log/test_error_log.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/error_log/error_log.json b/frappe/core/doctype/error_log/error_log.json index e643bbb090..b2ab516bba 100644 --- a/frappe/core/doctype/error_log/error_log.json +++ b/frappe/core/doctype/error_log/error_log.json @@ -50,7 +50,7 @@ "icon": "fa fa-warning-sign", "idx": 1, "links": [], - "modified": "2022-04-18 14:51:30.604304", + "modified": "2022-04-18 17:25:47.406873", "modified_by": "Administrator", "module": "Core", "name": "Error Log", @@ -71,5 +71,6 @@ "quick_entry": 1, "sort_field": "modified", "sort_order": "ASC", - "states": [] + "states": [], + "title_field": "method" } \ No newline at end of file diff --git a/frappe/core/doctype/error_log/test_error_log.py b/frappe/core/doctype/error_log/test_error_log.py index e20ac92650..a8511b238e 100644 --- a/frappe/core/doctype/error_log/test_error_log.py +++ b/frappe/core/doctype/error_log/test_error_log.py @@ -9,4 +9,8 @@ import frappe class TestErrorLog(unittest.TestCase): - pass + def test_error_log(self): + """let's do an error log on error log?""" + doc = frappe.new_doc("Error Log") + error = doc.log_error("This is an error") + self.assertEqual(error.doctype, "Error Log") From de8f066dce7878bcff56b3aa7bde8b4aaea34189 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 18 Apr 2022 17:31:36 +0530 Subject: [PATCH 13/33] fix: Set dependant property of grid fields while rendering (#16548) --- frappe/public/js/frappe/form/grid_row.js | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index c12ac23319..4bba8ae7ad 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -595,6 +595,8 @@ export default class GridRow { // to get update df for the row let df = this.docfields.find(field => field.fieldname === col[0].fieldname); + this.set_dependant_property(df); + let colsize = col[1]; let txt = this.doc ? frappe.format(this.doc[df.fieldname], df, null, this.doc) : @@ -633,6 +635,56 @@ export default class GridRow { } } + set_dependant_property(df) { + if (!df.reqd && df.mandatory_depends_on && + this.evaluate_depends_on_value(df.mandatory_depends_on)) { + df.reqd = 1; + } + + if (!df.read_only && df.read_only_depends_on && + this.evaluate_depends_on_value(df.read_only_depends_on)) { + df.read_only = 1; + } + } + + evaluate_depends_on_value(expression) { + let out = null; + let doc = this.doc; + + if (!doc) return; + + let parent = this.frm ? this.frm.doc : this.doc || null; + + if (typeof (expression) === 'boolean') { + out = expression; + + } else if (typeof (expression) === 'function') { + out = expression(doc); + + } else if (expression.substr(0, 5)=='eval:') { + try { + out = frappe.utils.eval(expression.substr(5), { doc, parent }); + if (parent && parent.istable && expression.includes('is_submittable')) { + out = true; + } + } catch (e) { + frappe.throw(__('Invalid "depends_on" expression')); + } + + } else if (expression.substr(0, 3)=='fn:' && this.frm) { + out = this.frm.script_manager.trigger(expression.substr(3), this.doctype, this.docname); + } else { + var value = doc[expression]; + if ($.isArray(value)) { + out = !!value.length; + } else { + out = !!value; + } + } + + return out; + } + show_search_row() { // show or remove search columns based on grid rows this.show_search = this.frm && this.frm.doc && From 95a13853c7407c48afc6150033e9e0b977602b8e Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 18 Apr 2022 17:34:44 +0530 Subject: [PATCH 14/33] ci(Mergify): configuration update (#16655) Signed-off-by: Ankush Menat [skip ci] --- .mergify.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 838ce75835..7f4c084e30 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -53,3 +53,43 @@ pull_request_rules: {{ title }} (#{{ number }}) {{ body }} + + - name: backport to develop + conditions: + - label="backport develop" + actions: + backport: + branches: + - develop + assignees: + - "{{ author }}" + + - name: backport to version-13-hotfix + conditions: + - label="backport version-13-hotfix" + actions: + backport: + branches: + - version-13-hotfix + assignees: + - "{{ author }}" + + - name: backport to version-13-pre-release + conditions: + - label="backport version-13-pre-release" + actions: + backport: + branches: + - version-13-pre-release + assignees: + - "{{ author }}" + + - name: backport to version-12-hotfix + conditions: + - label="backport version-12-hotfix" + actions: + backport: + branches: + - version-12-hotfix + assignees: + - "{{ author }}" \ No newline at end of file From 7b19c91c373c3820f7a3c029b1df25ca42b0a913 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 18 Apr 2022 19:44:01 +0530 Subject: [PATCH 15/33] fix: kanban board without title field (#16659) --- frappe/public/js/frappe/list/base_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index d5ee82acce..f64ae39d1b 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -124,7 +124,7 @@ frappe.views.BaseList = class BaseList { // df is passed const df = fieldname; fieldname = df.fieldname; - doctype = df.parent; + doctype = df.parent || doctype; } if (!this.fields) this.fields = []; From afebaa0a23ef066a83339fe4527929c3d1225a3e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 14 Apr 2022 13:43:43 +0530 Subject: [PATCH 16/33] test: less flaky date control test --- cypress/integration/control_date.js | 58 +++++++++++++++++------------ cypress/support/commands.js | 14 +++++++ 2 files changed, 49 insertions(+), 23 deletions(-) diff --git a/cypress/integration/control_date.js b/cypress/integration/control_date.js index 35c585306c..5093c675cf 100644 --- a/cypress/integration/control_date.js +++ b/cypress/integration/control_date.js @@ -1,23 +1,27 @@ context('Date Control', () => { before(() => { cy.login(); - cy.visit('/app/doctype'); - return cy.window().its('frappe').then(frappe => { - return frappe.xcall('frappe.tests.ui_test_helpers.create_doctype', { - name: 'Test Date Control', - fields: [ - { - "label": "Date", - "fieldname": "date", - "fieldtype": "Date", - "in_list_view": 1 - }, - ] - }); - }); + cy.visit('/app'); }); + + function get_dialog(date_field_options) { + return cy.dialog({ + title: 'Date', + fields: [{ + "label": "Date", + "fieldname": "date", + "fieldtype": "Date", + "in_list_view": 1, + ...date_field_options + }] + }); + } + it('Selecting a date from the datepicker', () => { - cy.new_form('Test Date Control'); + cy.clear_dialogs(); + cy.clear_datepickers(); + + get_dialog().as('dialog'); cy.get_field('date', 'Date').click(); cy.get('.datepicker--nav-title').click(); cy.get('.datepicker--nav-title').click({force: true}); @@ -28,12 +32,16 @@ context('Date Control', () => { cy.get('.datepicker--months > .datepicker--cells > .datepicker--cell[data-month=0]').click(); cy.get('.datepicker--days > .datepicker--cells > .datepicker--cell[data-date=15]').click(); - //Verifying if the selected date is displayed in the date field - cy.get_field('date', 'Date').should('have.value', '01-15-2020'); + // Verify if the selected date is set the date field + cy.window().its('cur_dialog.fields_dict.date.value').should('be.equal', '2020-01-15'); }); it('Checking next and previous button', () => { - cy.get_field('date', 'Date').click(); + cy.clear_dialogs(); + cy.clear_datepickers(); + + get_dialog({ default: '2020-01-15' }).as('dialog'); + cy.get_field('date', 'Date').click(); //Clicking on the next button in the datepicker cy.get('.datepicker--nav-action[data-action=next]').click(); @@ -42,7 +50,7 @@ context('Date Control', () => { cy.get('.datepicker--cell[data-date=15]').click({force: true}); //Verifying if the selected date has been displayed in the date field - cy.get_field('date', 'Date').should('have.value', '02-15-2020'); + cy.window().its('cur_dialog.fields_dict.date.value').should('be.equal', '2020-02-15'); cy.wait(500); cy.get_field('date', 'Date').click(); @@ -53,19 +61,23 @@ context('Date Control', () => { cy.get('.datepicker--cell[data-date=15]').click({force: true}); //Verifying if the selected date has been displayed in the date field - cy.get_field('date', 'Date').should('have.value', '01-15-2020'); + cy.window().its('cur_dialog.fields_dict.date.value').should('be.equal', '2020-01-15'); }); it('Clicking on "Today" button gives todays date', () => { - cy.get_field('date', 'Date').click(); + cy.clear_dialogs(); + cy.clear_datepickers(); + + get_dialog({ default: '2020-01-15' }).as('dialog'); + cy.get_field('date', 'Date').click(); //Clicking on "Today" button cy.get('.datepicker--button').click(); //Picking up the todays date - const todays_date = Cypress.moment().format('MM-DD-YYYY'); + const todays_date = new Date().toJSON().split('T')[0]; //Verifying if clicking on "Today" button matches today's date - cy.get_field('date', 'Date').should('have.value', todays_date); + cy.window().its('cur_dialog.fields_dict.date.value').should('be.equal', todays_date); }); }); \ No newline at end of file diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 4847dbcf12..14ab063b59 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -258,6 +258,20 @@ Cypress.Commands.add('hide_dialog', () => { cy.get('.modal:visible').should('not.exist'); }); +Cypress.Commands.add('clear_dialogs', () => { + cy.window().then((win) => { + win.$('.modal, .modal-backdrop').remove(); + }); + cy.get('.modal').should('not.exist'); +}) + +Cypress.Commands.add('clear_datepickers', () => { + cy.window().then((win) => { + win.$('.datepicker').remove(); + }); + cy.get('.datepicker').should('not.exist'); +}) + Cypress.Commands.add('insert_doc', (doctype, args, ignore_duplicate) => { return cy .window() From 9482ac43993d11d12bd1205f88041ef3b59508be Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 14 Apr 2022 13:49:39 +0530 Subject: [PATCH 17/33] style: semicolons --- cypress/support/commands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 14ab063b59..ec24212f01 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -263,14 +263,14 @@ Cypress.Commands.add('clear_dialogs', () => { win.$('.modal, .modal-backdrop').remove(); }); cy.get('.modal').should('not.exist'); -}) +}); Cypress.Commands.add('clear_datepickers', () => { cy.window().then((win) => { win.$('.datepicker').remove(); }); cy.get('.datepicker').should('not.exist'); -}) +}); Cypress.Commands.add('insert_doc', (doctype, args, ignore_duplicate) => { return cy From bb58ee5ee62f2cc8a29969bd60e395d9e9932aa3 Mon Sep 17 00:00:00 2001 From: phot0n Date: Wed, 13 Apr 2022 22:56:20 +0530 Subject: [PATCH 18/33] feat(minor): add ignore_xss_filter to customize form field --- frappe/custom/doctype/customize_form/customize_form.py | 1 + .../customize_form_field/customize_form_field.json | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index b4ccb21167..12ef945288 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -596,6 +596,7 @@ docfield_properties = { "in_preview": "Check", "bold": "Check", "no_copy": "Check", + "ignore_xss_filter": "Check", "hidden": "Check", "collapsible": "Check", "collapsible_depends_on": "Data", diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index cc446e321e..b991726123 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -21,6 +21,7 @@ "in_global_search", "in_preview", "bold", + "ignore_xss_filter", "no_copy", "allow_in_quick_entry", "translatable", @@ -453,13 +454,19 @@ "hidden": 1, "label": "Is System Generated", "read_only": 1 + }, + { + "default": "0", + "fieldname": "ignore_xss_filter", + "fieldtype": "Check", + "label": "Ignore XSS Filter" } ], "idx": 1, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2022-03-31 12:05:11.799654", + "modified": "2022-04-13 22:31:14.162661", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form Field", From 1aa267a51906040911ca14beae54d7a2b13bdd9a Mon Sep 17 00:00:00 2001 From: phot0n Date: Tue, 19 Apr 2022 12:41:33 +0530 Subject: [PATCH 19/33] chore: move the field to permission section * chore: fix type in description of ignore_xss_filter in docfield doctype --- frappe/core/doctype/docfield/docfield.json | 4 ++-- .../doctype/customize_form_field/customize_form_field.json | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index 9e9aaf489b..5c7d06c93a 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -347,7 +347,7 @@ }, { "default": "0", - "description": "Don't HTML Encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field", + "description": "Don't encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field", "fieldname": "ignore_xss_filter", "fieldtype": "Check", "label": "Ignore XSS Filter" @@ -547,7 +547,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2022-03-02 17:07:32.117897", + "modified": "2022-04-19 12:27:28.641580", "modified_by": "Administrator", "module": "Core", "name": "DocField", diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index b991726123..a7a8eff950 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -21,7 +21,6 @@ "in_global_search", "in_preview", "bold", - "ignore_xss_filter", "no_copy", "allow_in_quick_entry", "translatable", @@ -47,6 +46,7 @@ "report_hide", "remember_last_selected_value", "hide_border", + "ignore_xss_filter", "property_depends_on_section", "mandatory_depends_on", "column_break_33", @@ -457,6 +457,7 @@ }, { "default": "0", + "description": "Don't encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field", "fieldname": "ignore_xss_filter", "fieldtype": "Check", "label": "Ignore XSS Filter" From 317ff3b9e23ecc27626a8a4ab3b2ce307daf7636 Mon Sep 17 00:00:00 2001 From: phot0n Date: Tue, 19 Apr 2022 13:39:51 +0530 Subject: [PATCH 20/33] chore: remove tag link patch --- frappe/patches.txt | 1 - frappe/patches/v12_0/copy_to_parent_for_tags.py | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 frappe/patches/v12_0/copy_to_parent_for_tags.py diff --git a/frappe/patches.txt b/frappe/patches.txt index bc2bc22637..845ccee09a 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -106,7 +106,6 @@ frappe.patches.v12_0.set_default_incoming_email_port frappe.patches.v12_0.update_global_search frappe.patches.v12_0.setup_tags frappe.patches.v12_0.update_auto_repeat_status_and_not_submittable -frappe.patches.v12_0.copy_to_parent_for_tags frappe.patches.v12_0.create_notification_settings_for_user frappe.patches.v11_0.make_all_prepared_report_attachments_private #2019-11-26 frappe.patches.v12_0.setup_email_linking diff --git a/frappe/patches/v12_0/copy_to_parent_for_tags.py b/frappe/patches/v12_0/copy_to_parent_for_tags.py deleted file mode 100644 index ae3702a0d5..0000000000 --- a/frappe/patches/v12_0/copy_to_parent_for_tags.py +++ /dev/null @@ -1,7 +0,0 @@ -import frappe - - -def execute(): - - frappe.db.sql("UPDATE `tabTag Link` SET parenttype=document_type") - frappe.db.sql("UPDATE `tabTag Link` SET parent=document_name") From ef6bb79f65e0a1867926ef769ad8de16455adf2d Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Tue, 19 Apr 2022 15:51:03 +0530 Subject: [PATCH 21/33] test: Typing on focused input issue (#16669) --- cypress/integration/control_barcode.js | 2 ++ cypress/integration/kanban.js | 1 + 2 files changed, 3 insertions(+) diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js index 03ab61fac4..85a3182397 100644 --- a/cypress/integration/control_barcode.js +++ b/cypress/integration/control_barcode.js @@ -20,6 +20,7 @@ context('Control Barcode', () => { it('should generate barcode on setting a value', () => { get_dialog_with_barcode().as('dialog'); + cy.focused().blur(); cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox') .type('123456789') .blur(); @@ -36,6 +37,7 @@ context('Control Barcode', () => { it('should reset when input is cleared', () => { get_dialog_with_barcode().as('dialog'); + cy.focused().blur(); cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox') .type('123456789') .blur(); diff --git a/cypress/integration/kanban.js b/cypress/integration/kanban.js index bb9aaf3d8c..c7f3f08336 100644 --- a/cypress/integration/kanban.js +++ b/cypress/integration/kanban.js @@ -10,6 +10,7 @@ context('Kanban Board', () => { cy.get('.page-actions .custom-btn-group button').click(); cy.get('.page-actions .custom-btn-group ul.dropdown-menu li').contains('Kanban').click(); + cy.focused().blur(); cy.fill_field('board_name', 'ToDo Kanban', 'Data'); cy.fill_field('field_name', 'Status', 'Select'); cy.click_modal_primary_button('Save'); From d1978d8e62e01e23aba3aec8eb21bd0b130399d2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 19 Apr 2022 16:49:08 +0530 Subject: [PATCH 22/33] fix: check dates in frappe realm new Date in Cypress context and new Date in frappe context differs sometimes in CI --- cypress/integration/control_date.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cypress/integration/control_date.js b/cypress/integration/control_date.js index 5093c675cf..6d9f0b9bcc 100644 --- a/cypress/integration/control_date.js +++ b/cypress/integration/control_date.js @@ -68,16 +68,15 @@ context('Date Control', () => { cy.clear_dialogs(); cy.clear_datepickers(); - get_dialog({ default: '2020-01-15' }).as('dialog'); + get_dialog().as('dialog'); cy.get_field('date', 'Date').click(); //Clicking on "Today" button cy.get('.datepicker--button').click(); - //Picking up the todays date - const todays_date = new Date().toJSON().split('T')[0]; - //Verifying if clicking on "Today" button matches today's date - cy.window().its('cur_dialog.fields_dict.date.value').should('be.equal', todays_date); + cy.window().then(win => { + expect(win.cur_dialog.fields_dict.date.value).to.be.equal(win.frappe.datetime.get_today()); + }); }); }); \ No newline at end of file From fc4e2780bd1e82f22d91920d50abbd7f11b8b379 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 19 Apr 2022 16:49:34 +0530 Subject: [PATCH 23/33] chore: pretty logging for dialog command --- cypress/support/commands.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index ec24212f01..026c622e78 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -241,8 +241,20 @@ Cypress.Commands.add('clear_cache', () => { }); Cypress.Commands.add('dialog', opts => { - return cy.window().then(win => { - var d = new win.frappe.ui.Dialog(opts); + return cy.window({ log: false }).its('frappe', { log: false }).then(frappe => { + Cypress.log({ + name: "dialog", + displayName: "dialog", + message: 'frappe.ui.Dialog', + consoleProps: () => { + return { + options: opts, + dialog: d + } + } + }); + + var d = new frappe.ui.Dialog(opts); d.show(); return d; }); From b59619f764a09110e8a8a07dff5d4bc6352a4746 Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Tue, 19 Apr 2022 17:29:09 +0530 Subject: [PATCH 24/33] chore: Update creds to allow updates on protected branch (#16672) --- .github/workflows/release.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52fc595c96..a6c1243f64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,6 +12,7 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + persist-credentials: false - name: Setup Node.js v14 uses: actions/setup-node@v2 with: @@ -22,4 +23,10 @@ jobs: - name: Create Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.RELEASE_TOKEN }} + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + GIT_AUTHOR_NAME: "Frappe PR Bot" + GIT_AUTHOR_EMAIL: "developers@frappe.io" + GIT_COMMITTER_NAME: "Frappe PR Bot" + GIT_COMMITTER_EMAIL: "developers@frappe.io" run: npx semantic-release \ No newline at end of file From aef0c0f66e4b1997ef946998e6822de7a8ee58cf Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 19 Apr 2022 19:21:25 +0530 Subject: [PATCH 25/33] fix: Handle unable to read commit errors --- frappe/commands/utils.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index bb1a8bc2d2..499dd61421 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -1024,6 +1024,7 @@ def set_config(context, key, value, global_=False, parse=False, as_dict=False): def get_version(output): """Show the versions of all the installed apps.""" from git import Repo + from git.exc import InvalidGitRepositoryError from frappe.utils.change_log import get_app_branch from frappe.utils.commands import render_table @@ -1034,12 +1035,16 @@ def get_version(output): for app in sorted(frappe.get_all_apps()): module = frappe.get_module(app) app_hooks = frappe.get_module(app + ".hooks") - repo = Repo(frappe.get_app_path(app, "..")) app_info = frappe._dict() + + try: + app_info.commit = Repo(frappe.get_app_path(app, "..")).head.object.hexsha[:7] + except InvalidGitRepositoryError: + app_info.commit = "" + app_info.app = app app_info.branch = get_app_branch(app) - app_info.commit = repo.head.object.hexsha[:7] app_info.version = getattr(app_hooks, f"{app_info.branch}_version", None) or module.__version__ data.append(app_info) From 8b010e1732b1095e9208d36a5c2dcab16855e7e6 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Tue, 19 Apr 2022 20:17:22 +0530 Subject: [PATCH 26/33] refactor: make `frappe.db.bulk_insert` work as expected (#16527) ## Issue `frappe.db.bulk_insert` is not working as expected: - It will not insert any row if there are less than 3 values - It will not add 1st row at all. e.g if I'm adding 5 values, it will only add 4. - It will add values one by one after 2 values, instead it should have inserted items (in db) in chunk of 10000 (as per the code written before). ## Changes Made - Solved above issues - use better way to chunk list - Added Postgres support for bulk_insert API And now `bulk_insert` will only do **1 db call for each 10000** values. Note: For testing purpose I made `Test Bulk Insert` doctype and keep chunk size of 100. ## Before ![image](https://user-images.githubusercontent.com/43115036/161979365-c1100745-7602-47d2-a9b8-62d797d2039f.png) ## After ![image](https://user-images.githubusercontent.com/43115036/161978344-3c17d56b-2195-40f4-b00c-e9478d4083f1.png) nodocs --- frappe/database/database.py | 29 +++++++++++++---------------- frappe/tests/test_db.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 424bcbbc63..411888df34 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -1228,7 +1228,7 @@ class Database(object): frappe.flags.touched_tables = set() frappe.flags.touched_tables.update(tables) - def bulk_insert(self, doctype, fields, values, ignore_duplicates=False): + def bulk_insert(self, doctype, fields, values, ignore_duplicates=False, *, chunk_size=10_000): """ Insert multiple records at a time @@ -1236,22 +1236,19 @@ class Database(object): :param fields: list of fields :params values: list of list of values """ - insert_list = [] - fields = ", ".join("`" + field + "`" for field in fields) - for idx, value in enumerate(values): - insert_list.append(tuple(value)) - if idx and (idx % 10000 == 0 or idx < len(values) - 1): - self.sql( - """INSERT {ignore_duplicates} INTO `tab{doctype}` ({fields}) VALUES {values}""".format( - ignore_duplicates="IGNORE" if ignore_duplicates else "", - doctype=doctype, - fields=fields, - values=", ".join(["%s"] * len(insert_list)), - ), - tuple(insert_list), - ) - insert_list = [] + table = frappe.qb.DocType(doctype) + for start_index in range(0, len(values), chunk_size): + query = frappe.qb.into(table) + if ignore_duplicates: + # Pypika does not have same api for ignoring duplicates + if frappe.conf.db_type == "mariadb": + query = query.ignore() + elif frappe.conf.db_type == "postgres": + query = query.on_conflict().do_nothing() + + values_to_insert = values[start_index : start_index + chunk_size] + query.columns(fields).insert(*values_to_insert).run() def enqueue_jobs_after_commit(): diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py index f722ad1d65..5b469cd5db 100644 --- a/frappe/tests/test_db.py +++ b/frappe/tests/test_db.py @@ -4,6 +4,7 @@ import datetime import inspect import unittest +from math import ceil from random import choice from unittest.mock import patch @@ -445,6 +446,33 @@ class TestDB(unittest.TestCase): self.assertEqual(frappe.db.exists(dt, [["name", "=", dn]]), dn) + def test_bulk_insert(self): + current_count = frappe.db.count("ToDo") + test_body = f"test_bulk_insert - {random_string(10)}" + chunk_size = 10 + + for number_of_values in (1, 2, 5, 27): + current_transaction_writes = frappe.db.transaction_writes + + frappe.db.bulk_insert( + "ToDo", + ["name", "description"], + [[f"ToDo Test Bulk Insert {i}", test_body] for i in range(number_of_values)], + ignore_duplicates=True, + chunk_size=chunk_size, + ) + + # check that all records were inserted + self.assertEqual(number_of_values, frappe.db.count("ToDo") - current_count) + + # check if inserts were done in chunks + expected_number_of_writes = ceil(number_of_values / chunk_size) + self.assertEqual( + expected_number_of_writes, frappe.db.transaction_writes - current_transaction_writes + ) + + frappe.db.delete("ToDo", {"description": test_body}) + @run_only_if(db_type_is.MARIADB) class TestDDLCommandsMaria(unittest.TestCase): From 91e0cac029ad3a969ed04dd0d61b699ba84d69a8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 20 Apr 2022 11:25:38 +0530 Subject: [PATCH 27/33] fix: Check for required services running after frappe init Each site on a single app server can run on separate DBMS' on separate servers. This site specific config resides in each site's site_config.json file. Thereby, we need to load site's config before checking for service's availability. --- frappe/migrate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/migrate.py b/frappe/migrate.py index bb83fa5b6d..1c249dfdb1 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -159,13 +159,13 @@ class SiteMigration: """Run Migrate operation on site specified. This method initializes and destroys connections to the site database. """ - if not self.required_services_running(): - raise SystemExit(1) - if site: frappe.init(site=site) frappe.connect() + if not self.required_services_running(): + raise SystemExit(1) + self.setUp() try: self.pre_schema_updates() From 11360c5fd810c83bd61731e8f430d84ec95dfdcf Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Wed, 20 Apr 2022 13:02:42 +0530 Subject: [PATCH 28/33] fix: Check mandatory_depends_on also while checking mandatory on save (#16515) --- frappe/public/js/frappe/form/save.js | 39 +++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index 90516b7c0a..f1cb42250a 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -130,7 +130,8 @@ frappe.ui.form.save = function (frm, action, callback, btn) { folded = frm.layout.folded; } - if (df.reqd && !frappe.model.has_value(doc.doctype, doc.name, df.fieldname)) { + if (is_docfield_mandatory(doc, df) && + !frappe.model.has_value(doc.doctype, doc.name, df.fieldname)) { has_errors = true; error_fields[error_fields.length] = __(df.label); // scroll to field @@ -173,6 +174,42 @@ frappe.ui.form.save = function (frm, action, callback, btn) { return !has_errors; }; + let is_docfield_mandatory = function(doc, df) { + if (df.reqd) return true; + if (!df.mandatory_depends_on || !doc) return; + + let out = null; + let expression = df.mandatory_depends_on; + let parent = frappe.get_meta(df.parent); + + if (typeof (expression) === 'boolean') { + out = expression; + + } else if (typeof (expression) === 'function') { + out = expression(doc); + + } else if (expression.substr(0, 5) == 'eval:') { + try { + out = frappe.utils.eval(expression.substr(5), { doc, parent }); + if (parent && parent.istable && expression.includes('is_submittable')) { + out = true; + } + } catch (e) { + frappe.throw(__('Invalid "mandatory_depends_on" expression')); + } + + } else { + var value = doc[expression]; + if ($.isArray(value)) { + out = !!value.length; + } else { + out = !!value; + } + } + + return out; + }; + const scroll_to = (fieldname) => { frm.scroll_to_field(fieldname); frm.scroll_set = true; From dcee40046a0dc65a78b05f54173eb2bb4f014890 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 20 Apr 2022 15:16:04 +0530 Subject: [PATCH 29/33] perf!: simpler frappe.get_system_setting (#16685) Not sure why this needs to be "cached" in locals again when db object already caches it in value_cache. --- frappe/__init__.py | 5 +---- frappe/core/doctype/system_settings/system_settings.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 10c8afbf23..cbf62a8d7d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -217,7 +217,6 @@ def init(site, sites_path=None, new_site=False): local.module_app = None local.app_modules = None - local.system_settings = _dict() local.user = None local.user_perms = None @@ -2139,9 +2138,7 @@ def safe_eval(code, eval_globals=None, eval_locals=None): def get_system_settings(key): - if key not in local.system_settings: - local.system_settings.update({key: db.get_single_value("System Settings", key)}) - return local.system_settings.get(key) + return db.get_single_value("System Settings", key, cache=True) def get_active_domains(): diff --git a/frappe/core/doctype/system_settings/system_settings.py b/frappe/core/doctype/system_settings/system_settings.py index 3d01015087..e4d36b7fc7 100644 --- a/frappe/core/doctype/system_settings/system_settings.py +++ b/frappe/core/doctype/system_settings/system_settings.py @@ -53,7 +53,6 @@ class SystemSettings(Document): frappe.cache().delete_value("system_settings") frappe.cache().delete_value("time_zone") - frappe.local.system_settings = {} if frappe.flags.update_last_reset_password_date: update_last_reset_password_date() From 248c3555e3537c874b448e7c62b2af7a5a6bc751 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 20 Apr 2022 15:16:44 +0530 Subject: [PATCH 30/33] fix(minor): add error_log for failed webhooks and web pages --- frappe/integrations/doctype/webhook/webhook.py | 2 +- frappe/public/scss/website/my_account.scss | 1 + frappe/website/serve.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 04a1c6c21e..3f1b60d903 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -105,7 +105,7 @@ def enqueue_webhook(doc, webhook): if i != 2: continue else: - raise e + webhook.log_error("Webhook failed") def log_request(url, headers, data, res): diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss index 58075580a2..82c4164a31 100644 --- a/frappe/public/scss/website/my_account.scss +++ b/frappe/public/scss/website/my_account.scss @@ -30,6 +30,7 @@ .my-account-container { max-width: 800px; margin: auto; + margin-bottom: 4rem; } .account-info { diff --git a/frappe/website/serve.py b/frappe/website/serve.py index b30f3f1047..2c33b5df51 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -20,6 +20,7 @@ def get_response(path=None, http_status_code=200): except frappe.PermissionError as e: response = NotPermittedPage(endpoint, http_status_code, exception=e).render() except Exception as e: + frappe.log_error(f"{path} failed") response = ErrorPage(exception=e).render() return response From 296a6bd02f203d68b212991deec3702384943af2 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 20 Apr 2022 15:37:54 +0530 Subject: [PATCH 31/33] test: show locals on test failure (#16687) - Show locals always in CI - Show locals locally when running in verbose mode --- frappe/parallel_test_runner.py | 1 + frappe/test_runner.py | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/frappe/parallel_test_runner.py b/frappe/parallel_test_runner.py index f5367e9dc6..65c8eb470b 100644 --- a/frappe/parallel_test_runner.py +++ b/frappe/parallel_test_runner.py @@ -117,6 +117,7 @@ class ParallelTestRunner: class ParallelTestResult(unittest.TextTestResult): def startTest(self, test): + self.tb_locals = True self._started_at = time.time() super(unittest.TextTestResult, self).startTest(test) test_class = unittest.util.strclass(test.__class__) diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 5fa9f60197..509be36f86 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -15,6 +15,7 @@ import frappe import frappe.utils.scheduler from frappe.model.naming import revert_series_if_last from frappe.modules import get_module_name, load_doctype_module +from frappe.utils import cint unittest_runner = unittest.TextTestRunner SLOW_TEST_THRESHOLD = 2 @@ -177,10 +178,13 @@ def run_all_tests( _add_test(app, path, filename, verbose, test_suite, ui_tests) if junit_xml_output: - runner = unittest_runner(verbosity=1 + (verbose and 1 or 0), failfast=failfast) + runner = unittest_runner(verbosity=1 + cint(verbose), failfast=failfast) else: runner = unittest_runner( - resultclass=TimeLoggingTestResult, verbosity=1 + (verbose and 1 or 0), failfast=failfast + resultclass=TimeLoggingTestResult, + verbosity=1 + cint(verbose), + failfast=failfast, + tb_locals=verbose, ) if profile: @@ -279,10 +283,13 @@ def _run_unittest( test_suite.addTest(module_test_cases) if junit_xml_output: - runner = unittest_runner(verbosity=1 + (verbose and 1 or 0), failfast=failfast) + runner = unittest_runner(verbosity=1 + cint(verbose), failfast=failfast) else: runner = unittest_runner( - resultclass=TimeLoggingTestResult, verbosity=1 + (verbose and 1 or 0), failfast=failfast + resultclass=TimeLoggingTestResult, + verbosity=1 + cint(verbose), + failfast=failfast, + tb_locals=verbose, ) if profile: From 35c606707ec115b76f4ecfe602aff65dfd33164a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 20 Apr 2022 16:43:19 +0530 Subject: [PATCH 32/33] fix(bulk_insert): Cast values as list before subscripting --- frappe/database/database.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 411888df34..d4677a1295 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -1236,8 +1236,9 @@ class Database(object): :param fields: list of fields :params values: list of list of values """ - + values = list(values) table = frappe.qb.DocType(doctype) + for start_index in range(0, len(values), chunk_size): query = frappe.qb.into(table) if ignore_duplicates: From 56bb11dc17ed16de577263908e51ea6d076ea44f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 21 Apr 2022 08:49:48 +0530 Subject: [PATCH 33/33] fix: Do not change direction of text if already in RTL mode --- frappe/public/scss/common/quill.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/public/scss/common/quill.scss b/frappe/public/scss/common/quill.scss index 3d5ce61c15..9aab2e9fcd 100644 --- a/frappe/public/scss/common/quill.scss +++ b/frappe/public/scss/common/quill.scss @@ -7,6 +7,7 @@ font-family: inherit; } +/*rtl:begin:ignore*/ .ql-editor { font-family: var(--font-stack); color: var(--text-color); @@ -22,7 +23,15 @@ a[href] { text-decoration: underline; } + .ql-direction-rtl { + direction: rtl; + + .table { + direction: ltr; + } + } } +/*rtl:end:ignore*/ + .ql-toolbar.ql-snow { border-top-left-radius: var(--border-radius); @@ -70,6 +79,7 @@ min-height: 0; max-height: none; overflow: hidden; + resize: none; } }