From c2e44754d17b0056152b24fd09a67d3bb17a431e Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Thu, 1 Sep 2022 18:43:05 +0530 Subject: [PATCH 001/152] feat: allow syncing new fields in Doctype Layout --- .../doctype/custom_field/custom_field.py | 14 +++ .../doctype/doctype_layout/doctype_layout.js | 89 +++++++++++++++---- .../doctype_layout/doctype_layout.json | 9 +- .../doctype/doctype_layout/doctype_layout.py | 59 ++++++++++++ 4 files changed, 152 insertions(+), 19 deletions(-) diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py index f50ceb1992..7b55b4bc6b 100644 --- a/frappe/custom/doctype/custom_field/custom_field.py +++ b/frappe/custom/doctype/custom_field/custom_field.py @@ -102,6 +102,20 @@ class CustomField(Document): # delete property setter entries frappe.db.delete("Property Setter", {"doc_type": self.dt, "field_name": self.fieldname}) + + # update doctype layouts + doctype_layouts = frappe.get_all( + "DocType Layout", filters={"document_type": self.dt}, pluck="name" + ) + + for layout in doctype_layouts: + layout_doc = frappe.get_doc("DocType Layout", layout) + for field in layout_doc.fields: + if field.fieldname == self.fieldname: + layout_doc.remove(field) + layout_doc.save() + break + frappe.clear_cache(doctype=self.dt) def validate_insert_after(self, meta): diff --git a/frappe/custom/doctype/doctype_layout/doctype_layout.js b/frappe/custom/doctype/doctype_layout/doctype_layout.js index f91f04f762..45c2de8447 100644 --- a/frappe/custom/doctype/doctype_layout/doctype_layout.js +++ b/frappe/custom/doctype/doctype_layout/doctype_layout.js @@ -2,31 +2,88 @@ // For license information, please see license.txt frappe.ui.form.on("DocType Layout", { - refresh: function (frm) { - frm.trigger("document_type"); - frm.events.set_button(frm); + onload_post_render(frm) { + // disallow users from manually adding/deleting rows; this doctype should only + // be used for managing layout, and docfields and custom fields should be used + // to manage other field metadata (hidden, etc.) + frm.set_df_property("fields", "cannot_add_rows", true); + frm.set_df_property("fields", "cannot_delete_rows", true); + }, + + refresh(frm) { + frm.events.add_buttons(frm); }, document_type(frm) { - frm.set_fields_as_options("fields", frm.doc.document_type, null, [], "fieldname").then( - () => { - // child table empty? then show all fields as default - if (frm.doc.document_type) { - if (!(frm.doc.fields || []).length) { - for (let f of frappe.get_doc("DocType", frm.doc.document_type).fields) { - frm.add_child("fields", { fieldname: f.fieldname, label: f.label }); - } - } - } - } - ); + if (frm.doc.document_type) { + frm.set_value("fields", []); + frm.events.sync_fields(frm, false); + } }, - set_button(frm) { + add_buttons(frm) { if (!frm.is_new()) { frm.add_custom_button(__("Go to {0} List", [frm.doc.name]), () => { window.open(`/app/${frappe.router.slug(frm.doc.name)}`); }); + + frm.add_custom_button(__("Sync {0} Fields", [frm.doc.name]), async () => { + await frm.events.sync_fields(frm, true); + }); + } + }, + + async sync_fields(frm, notify) { + frappe.dom.freeze("Fetching fields..."); + const response = await frm.call({ doc: frm.doc, method: "sync_fields" }); + frm.refresh_field("fields"); + frappe.dom.unfreeze(); + + if (!response.message) { + frappe.msgprint(__("No changes to sync")); + return; + } + + frm.dirty(); + if (notify) { + const addedFields = response.message.added; + const removedFields = response.message.removed; + + const getChangedMessage = (fields) => { + let changes = ""; + for (const field of fields) { + if (field.label) { + changes += `
  • Row #${field.idx}: ${field.fieldname.bold()} (${ + field.label + })
    • `; + } else { + changes += `
  • Row #${field.idx}: ${field.fieldname.bold()}
    • `; + } + } + return changes; + }; + + let message = ""; + + if (addedFields.length) { + message += `The following fields have been added:

    `; + } + + if (removedFields.length) { + message += `The following fields have been removed:

    `; + } + + if (message) { + frappe.msgprint({ + message: __(message), + indicator: "green", + title: __("Synced Fields"), + }); + } } }, }); diff --git a/frappe/custom/doctype/doctype_layout/doctype_layout.json b/frappe/custom/doctype/doctype_layout/doctype_layout.json index e47c9e03e0..0b627f78ce 100644 --- a/frappe/custom/doctype/doctype_layout/doctype_layout.json +++ b/frappe/custom/doctype/doctype_layout/doctype_layout.json @@ -1,7 +1,7 @@ { "actions": [], "allow_rename": 1, - "autoname": "Prompt", + "autoname": "prompt", "creation": "2020-11-16 17:05:35.306846", "doctype": "DocType", "editable_grid": 1, @@ -19,7 +19,8 @@ "in_list_view": 1, "label": "Document Type", "options": "DocType", - "reqd": 1 + "reqd": 1, + "set_only_once": 1 }, { "fieldname": "fields", @@ -42,10 +43,11 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2020-12-10 15:01:04.352184", + "modified": "2022-09-01 03:22:33.973058", "modified_by": "Administrator", "module": "Custom", "name": "DocType Layout", + "naming_rule": "Set by user", "owner": "Administrator", "permissions": [ { @@ -68,5 +70,6 @@ "route": "doctype-layout", "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/frappe/custom/doctype/doctype_layout/doctype_layout.py b/frappe/custom/doctype/doctype_layout/doctype_layout.py index ea8e9acc99..778f2aa024 100644 --- a/frappe/custom/doctype/doctype_layout/doctype_layout.py +++ b/frappe/custom/doctype/doctype_layout/doctype_layout.py @@ -1,11 +1,70 @@ # Copyright (c) 2020, Frappe Technologies and contributors # License: MIT. See LICENSE +from typing import TYPE_CHECKING + +import frappe from frappe.desk.utils import slug from frappe.model.document import Document +if TYPE_CHECKING: + from frappe.core.doctype.docfield.docfield import DocField + class DocTypeLayout(Document): def validate(self): if not self.route: self.route = slug(self.name) + + @frappe.whitelist() + def sync_fields(self): + layout_fieldnames = {field.fieldname for field in self.fields} + doctype_fields = frappe.get_meta(self.document_type).fields + doctype_fieldnames = {field.fieldname for field in doctype_fields} + + added_fields = list(doctype_fieldnames - layout_fieldnames) + removed_fields = list(layout_fieldnames - doctype_fieldnames) + + if not (added_fields or removed_fields): + return + + added = self.add_fields(added_fields, doctype_fields) + removed = self.remove_fields(removed_fields) + + for index, field in enumerate(self.fields): + field.idx = index + 1 + + return {"added": added, "removed": removed} + + def add_fields(self, added_fields: list[str], doctype_fields: list["DocField"]) -> list[dict]: + added = [] + for field in added_fields: + field_details = next((f for f in doctype_fields if f.fieldname == field), None) + if not field_details: + continue + + # remove 'doctype' data from the DocField to allow adding it to the layout + row = self.append("fields", field_details.as_dict(no_default_fields=True)) + if field_details.insert_after: + insert_after = next( + (f for f in self.fields if f.fieldname == field_details.insert_after), + None, + ) + + # initialize new row to just after the insert_after field + self.fields.insert(insert_after.idx, row) + self.fields.pop() + + added.append({"idx": insert_after.idx + 1, "fieldname": row.fieldname, "label": row.label}) + else: + added.append(row.as_dict()) + return added + + def remove_fields(self, removed_fields: list[str]) -> list[dict]: + removed = [] + for field in removed_fields: + field_details = next((f for f in self.fields if f.fieldname == field), None) + if field_details: + self.remove(field_details) + removed.append(field_details.as_dict()) + return removed From 3203dc8c1fa051e80f0f46fab7cf4a7045a0abce Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 21 Sep 2022 12:15:03 +0530 Subject: [PATCH 002/152] fix: filter out inactive workers (#18200) [skip ci] --- frappe/core/doctype/rq_worker/rq_worker.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/rq_worker/rq_worker.py b/frappe/core/doctype/rq_worker/rq_worker.py index bc1326f522..b2d1f1209d 100644 --- a/frappe/core/doctype/rq_worker/rq_worker.py +++ b/frappe/core/doctype/rq_worker/rq_worker.py @@ -23,8 +23,10 @@ class RQWorker(Document): start = cint(args.get("start")) or 0 page_length = cint(args.get("page_length")) or 20 - workers = get_workers()[start : start + page_length] - return [serialize_worker(worker) for worker in workers] + workers = get_workers() + + valid_workers = [w for w in workers if w.pid][start : start + page_length] + return [serialize_worker(worker) for worker in valid_workers] @staticmethod def get_count(args) -> int: From 5cfcc4a075ad3a4fed3549888e75e98c314bba33 Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Wed, 21 Sep 2022 16:20:44 +0530 Subject: [PATCH 003/152] fix: Chart date format on x-axis is inaccurate (#18191) --- .../desk/doctype/dashboard_chart/dashboard_chart.py | 2 +- .../doctype/dashboard_chart/test_dashboard_chart.py | 10 +++++----- frappe/utils/data.py | 12 ++++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index a85f269c8f..6f675831a7 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -222,7 +222,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date): return { "labels": [ - format_date(get_period(r[0], timegrain)) + format_date(get_period(r[0], timegrain), parse_day_first=True) if timegrain in ("Daily", "Weekly") else get_period(r[0], timegrain) for r in result diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index 820f3c0555..ddbabedcb4 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -173,7 +173,7 @@ class TestDashboardChart(FrappeTestCase): self.assertEqual(result.get("datasets")[0].get("values"), [200.0, 400.0, 300.0, 0.0, 100.0, 0.0]) self.assertEqual( result.get("labels"), - ["06-01-2019", "07-01-2019", "08-01-2019", "09-01-2019", "10-01-2019", "11-01-2019"], + ["01-06-2019", "01-07-2019", "01-08-2019", "01-09-2019", "01-10-2019", "01-11-2019"], ) def test_weekly_dashboard_chart(self): @@ -203,7 +203,7 @@ class TestDashboardChart(FrappeTestCase): result = get(chart_name="Test Weekly Dashboard Chart", refresh=1) self.assertEqual(result.get("datasets")[0].get("values"), [50.0, 300.0, 800.0, 0.0]) - self.assertEqual(result.get("labels"), ["12-30-2018", "06-01-2019", "01-13-2019", "01-20-2019"]) + self.assertEqual(result.get("labels"), ["12-30-2018", "01-06-2019", "01-13-2019", "01-20-2019"]) def test_avg_dashboard_chart(self): insert_test_records() @@ -230,7 +230,7 @@ class TestDashboardChart(FrappeTestCase): with patch.object(frappe.utils.data, "get_first_day_of_the_week", return_value="Monday"): result = get(chart_name="Test Average Dashboard Chart", refresh=1) - self.assertEqual(result.get("labels"), ["12-30-2018", "06-01-2019", "01-13-2019", "01-20-2019"]) + self.assertEqual(result.get("labels"), ["12-30-2018", "01-06-2019", "01-13-2019", "01-20-2019"]) self.assertEqual(result.get("datasets")[0].get("values"), [50.0, 150.0, 266.6666666666667, 0.0]) def test_user_date_label_dashboard_chart(self): @@ -255,13 +255,13 @@ class TestDashboardChart(FrappeTestCase): with patch.object(frappe.utils.data, "get_user_date_format", return_value="dd.mm.yyyy"): result = get(chart_name="Test Dashboard Chart Date Label") self.assertEqual( - sorted(result.get("labels")), sorted(["01.05.2019", "01.12.2019", "19.01.2019"]) + sorted(result.get("labels")), sorted(["05.01.2019", "12.01.2019", "19.01.2019"]) ) with patch.object(frappe.utils.data, "get_user_date_format", return_value="mm-dd-yyyy"): result = get(chart_name="Test Dashboard Chart Date Label") self.assertEqual( - sorted(result.get("labels")), sorted(["01-19-2019", "05-01-2019", "12-01-2019"]) + sorted(result.get("labels")), sorted(["01-19-2019", "01-05-2019", "01-12-2019"]) ) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 6d4a96ce5f..9f794be0fc 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -72,7 +72,9 @@ def is_invalid_date_string(date_string: str) -> bool: ) -def getdate(string_date: Optional["DateTimeLikeObject"] = None) -> datetime.date | None: +def getdate( + string_date: Optional["DateTimeLikeObject"] = None, parse_day_first: bool = False +) -> datetime.date | None: """ Converts string date (yyyy-mm-dd) to datetime.date object. If no input is provided, current date is returned. @@ -91,7 +93,7 @@ def getdate(string_date: Optional["DateTimeLikeObject"] = None) -> datetime.date if is_invalid_date_string(string_date): return None try: - return parser.parse(string_date).date() + return parser.parse(string_date, dayfirst=parse_day_first).date() except ParserError: frappe.throw( frappe._("{} is not a valid date string.").format(frappe.bold(string_date)), @@ -548,7 +550,9 @@ def get_user_time_format() -> str: return frappe.local.user_time_format or "HH:mm:ss" -def format_date(string_date=None, format_string: str | None = None) -> str: +def format_date( + string_date=None, format_string: str | None = None, parse_day_first: bool = False +) -> str: """Converts the given string date to :data:`user_date_format` User format specified in defaults @@ -564,7 +568,7 @@ def format_date(string_date=None, format_string: str | None = None) -> str: if not string_date: return "" - date = getdate(string_date) + date = getdate(string_date, parse_day_first) if not format_string: format_string = get_user_date_format() format_string = format_string.replace("mm", "MM").replace("Y", "y") From 4263aace2750e903039a3122df2fea6083e190d0 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 22 Sep 2022 14:52:26 +0530 Subject: [PATCH 004/152] chore: dont run cypress on forks --- .github/workflows/ui-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 4aa6ed0393..96d629fb90 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -37,7 +37,7 @@ jobs: test: runs-on: ubuntu-latest needs: checkrun - if: ${{ needs.checkrun.outputs.build == 'strawberry' }} + if: ${{ needs.checkrun.outputs.build == 'strawberry' && env.GITHUB_REPOSITORY_OWNER == 'frappe' }} timeout-minutes: 60 strategy: From 002b27dbddcefb4c6e63611c5d2637556b3b157a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 15:46:31 +0530 Subject: [PATCH 005/152] fix: pypika does not parse datetime.time (backport #18184) (#18205) * fix: pypika does not parse datetime.time (cherry picked from commit b8f5a4304cccda954822cfe69d4805a18d9f07a7) * fix: style - imports sort order fixed (cherry picked from commit c3562c643ab9bff38d230202675d8ce1ae190912) * test: add test for query builder parsing datetime.time (cherry picked from commit 99889c270199da4b26b0d3858ae0f0a416d49d90) * fix: format_time instead of format_datetime, test was failing! (cherry picked from commit 5d697a22ac8cb98c8f8f44b3f99c57b932c5223c) * fix(style): linter issues (cherry picked from commit e231e1b0eadf63e84c9f81cfed9e2926e086fc44) * test: add test for postgres (cherry picked from commit 695591c43af9672cb83ce856a46c97e0bddfa9c3) * fix: converting datepart and timepart to strings for Combinedatetime (cherry picked from commit 1ebda943a607688bfb3db9fb42c80723a9050973) * fix: style, linter issues (cherry picked from commit c01262ad02b8831fdb0c5332b6973499e8adf6ad) Co-authored-by: Anoop Kurungadam Co-authored-by: Aradhya --- frappe/query_builder/functions.py | 4 +++ frappe/query_builder/terms.py | 9 ++++--- frappe/tests/test_query_builder.py | 43 ++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/frappe/query_builder/functions.py b/frappe/query_builder/functions.py index e725dff828..24e2ee0e5f 100644 --- a/frappe/query_builder/functions.py +++ b/frappe/query_builder/functions.py @@ -1,3 +1,4 @@ +from datetime import time from enum import Enum from pypika.functions import * @@ -47,6 +48,9 @@ Match = ImportMapper({db_type_is.MARIADB: MATCH, db_type_is.POSTGRES: TO_TSVECTO class _PostgresTimestamp(ArithmeticExpression): def __init__(self, datepart, timepart, alias=None): + """Postgres would need both datepart and timepart to be a string for concatenation""" + if isinstance(timepart, time) or isinstance(datepart, time): + timepart, datepart = str(timepart), str(datepart) if isinstance(datepart, str): datepart = Cast(datepart, "date") if isinstance(timepart, str): diff --git a/frappe/query_builder/terms.py b/frappe/query_builder/terms.py index 4d3c98b6a3..c1af0d9aa2 100644 --- a/frappe/query_builder/terms.py +++ b/frappe/query_builder/terms.py @@ -1,11 +1,11 @@ -from datetime import timedelta +from datetime import time, timedelta from typing import Any from pypika.queries import QueryBuilder from pypika.terms import Criterion, Function, ValueWrapper from pypika.utils import format_alias_sql -from frappe.utils.data import format_timedelta +from frappe.utils.data import format_time, format_timedelta class NamedParameterWrapper: @@ -55,9 +55,12 @@ class ParameterizedValueWrapper(ValueWrapper): value_sql = self.get_value_sql(quote_char=quote_char, **kwargs) sql = param_wrapper.get_sql(param_value=value_sql, **kwargs) else: - # * BUG: pypika doesen't parse timedeltas + # * BUG: pypika doesen't parse timedeltas and datetime.time if isinstance(self.value, timedelta): self.value = format_timedelta(self.value) + elif isinstance(self.value, time): + self.value = format_time(self.value) + sql = self.get_value_sql( quote_char=quote_char, secondary_quote_char=secondary_quote_char, diff --git a/frappe/tests/test_query_builder.py b/frappe/tests/test_query_builder.py index 06f2f5f6a7..b80e3ad8e2 100644 --- a/frappe/tests/test_query_builder.py +++ b/frappe/tests/test_query_builder.py @@ -1,5 +1,6 @@ import unittest from collections.abc import Callable +from datetime import time import frappe from frappe.query_builder import Case @@ -74,6 +75,26 @@ class TestCustomFunctionsMariaDB(FrappeTestCase): str(select_query).lower(), ) + def test_time(self): + note = frappe.qb.DocType("Note") + self.assertEqual( + "TIMESTAMP('2021-01-01','00:00:21')", CombineDatetime("2021-01-01", time(0, 0, 21)).get_sql() + ) + + select_query = frappe.qb.from_(note).select( + CombineDatetime(note.posting_date, note.posting_time) + ) + self.assertIn("select timestamp(`posting_date`,`posting_time`)", str(select_query).lower()) + + select_query = select_query.where( + CombineDatetime(note.posting_date, note.posting_time) + >= CombineDatetime("2021-01-01", time(0, 0, 1)) + ) + self.assertIn( + "timestamp(`posting_date`,`posting_time`)>=timestamp('2021-01-01','00:00:01')", + str(select_query).lower(), + ) + def test_cast(self): note = frappe.qb.DocType("Note") self.assertEqual("CONCAT(name,'')", Cast_(note.name, "varchar").get_sql()) @@ -141,6 +162,28 @@ class TestCustomFunctionsPostgres(FrappeTestCase): '"tabnote"."posting_date"+"tabnote"."posting_time" "timestamp"', str(select_query).lower() ) + def test_time(self): + note = frappe.qb.DocType("Note") + + self.assertEqual( + "CAST('2021-01-01' AS DATE)+CAST('00:00:21' AS TIME)", + CombineDatetime("2021-01-01", time(0, 0, 21)).get_sql(), + ) + + select_query = frappe.qb.from_(note).select( + CombineDatetime(note.posting_date, note.posting_time) + ) + self.assertIn('select "posting_date"+"posting_time"', str(select_query).lower()) + + select_query = select_query.where( + CombineDatetime(note.posting_date, note.posting_time) + >= CombineDatetime("2021-01-01", time(0, 0, 1)) + ) + self.assertIn( + """where "posting_date"+"posting_time">=cast('2021-01-01' as date)+cast('00:00:01' as time)""", + str(select_query).lower(), + ) + def test_cast(self): note = frappe.qb.DocType("Note") self.assertEqual("CAST(name AS VARCHAR)", Cast_(note.name, "varchar").get_sql()) From 967cc26faba46177aacb4ba48be4242d71095433 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 23 Sep 2022 16:46:33 +0530 Subject: [PATCH 006/152] feat: capture custom values in frappe monitor lets monitor add extra info for: - Save/Submit by doctype - Report generation time by standard report name --- .github/helper/db/mariadb.json | 1 + .../core/doctype/prepared_report/prepared_report.py | 3 +++ frappe/desk/form/save.py | 3 +++ frappe/desk/query_report.py | 3 +++ frappe/monitor.py | 11 +++++++++++ 5 files changed, 21 insertions(+) diff --git a/.github/helper/db/mariadb.json b/.github/helper/db/mariadb.json index 8bb654da66..e86e701dc3 100644 --- a/.github/helper/db/mariadb.json +++ b/.github/helper/db/mariadb.json @@ -13,5 +13,6 @@ "root_login": "root", "root_password": "travis", "host_name": "http://test_site:8000", + "monitor": 1, "server_script_enabled": true } diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index 0ff4ce3070..0b8e25229d 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -8,6 +8,7 @@ import frappe from frappe.desk.form.load import get_attachments from frappe.desk.query_report import generate_report_result from frappe.model.document import Document +from frappe.monitor import add_data_to_monitor from frappe.utils import gzip_compress, gzip_decompress from frappe.utils.background_jobs import enqueue @@ -25,6 +26,8 @@ def run_background(prepared_report): instance = frappe.get_doc("Prepared Report", prepared_report) report = frappe.get_doc("Report", instance.ref_report_doctype) + add_data_to_monitor(report=instance.ref_report_doctype) + try: report.custom_columns = [] diff --git a/frappe/desk/form/save.py b/frappe/desk/form/save.py index f3e7b6294f..d709f7b592 100644 --- a/frappe/desk/form/save.py +++ b/frappe/desk/form/save.py @@ -5,6 +5,7 @@ import json import frappe from frappe.desk.form.load import run_onload +from frappe.monitor import add_data_to_monitor @frappe.whitelist() @@ -25,6 +26,8 @@ def savedocs(doc, action): run_onload(doc) send_updated_docs(doc) + add_data_to_monitor(doctype=doc.doctype, action=action) + frappe.msgprint(frappe._("Saved"), indicator="green", alert=True) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index e88a453e64..2971dbe9e0 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -12,6 +12,7 @@ from frappe import _ from frappe.core.utils import ljust_list from frappe.model.utils import render_include from frappe.modules import get_module_path, scrub +from frappe.monitor import add_data_to_monitor from frappe.permissions import get_role_permissions from frappe.translate import send_translations from frappe.utils import ( @@ -254,6 +255,8 @@ def run( result["add_total_row"] = report.add_total_row and not result.get("skip_total_row", False) + add_data_to_monitor(report=report) + return result diff --git a/frappe/monitor.py b/frappe/monitor.py index 8d5391cb77..52e55e7559 100644 --- a/frappe/monitor.py +++ b/frappe/monitor.py @@ -25,6 +25,13 @@ def stop(response=None): frappe.local.monitor.dump(response) +def add_data_to_monitor(**kwargs) -> None: + """Add additional custom key-value pairs along with monitor log. + Note: Key-value pairs should be simple JSON exportable types.""" + if hasattr(frappe.local, "monitor"): + frappe.local.monitor.add_custom_data(**kwargs) + + def log_file(): return os.path.join(frappe.utils.get_bench_path(), "logs", "monitor.json.log") @@ -71,6 +78,10 @@ class Monitor: waitdiff = self.data.timestamp - job.enqueued_at self.data.job.wait = int(waitdiff.total_seconds() * 1000000) + def add_custom_data(self, **kwargs): + if self.data: + self.data.update(kwargs) + def dump(self, response=None): try: timediff = datetime.utcnow() - self.data.timestamp From 939bf872ae15e27d5195af967755f019c566f3a4 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Sat, 24 Sep 2022 10:06:57 +0530 Subject: [PATCH 007/152] fix: use compact JSON representation for monitor --- .github/workflows/ui-tests.yml | 2 +- frappe/monitor.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 96d629fb90..33c83bf5e2 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -37,7 +37,7 @@ jobs: test: runs-on: ubuntu-latest needs: checkrun - if: ${{ needs.checkrun.outputs.build == 'strawberry' && env.GITHUB_REPOSITORY_OWNER == 'frappe' }} + if: ${{ needs.checkrun.outputs.build == 'strawberry' && github.repository_owner == 'frappe' }} timeout-minutes: 60 strategy: diff --git a/frappe/monitor.py b/frappe/monitor.py index 52e55e7559..8db1e25d32 100644 --- a/frappe/monitor.py +++ b/frappe/monitor.py @@ -105,7 +105,7 @@ class Monitor: def store(self): if frappe.cache().llen(MONITOR_REDIS_KEY) > MONITOR_MAX_ENTRIES: frappe.cache().ltrim(MONITOR_REDIS_KEY, 1, -1) - serialized = json.dumps(self.data, sort_keys=True, default=str) + serialized = json.dumps(self.data, sort_keys=True, default=str, separators=(",", ":")) frappe.cache().rpush(MONITOR_REDIS_KEY, serialized) From 5330814d7ad5982fdd0c45237044a5a73c0d4ab7 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Sun, 25 Sep 2022 05:44:13 -0400 Subject: [PATCH 008/152] fix: make module to export required. (#18204) --- frappe/custom/doctype/customize_form/customize_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js index a35db2ca18..8d8249b532 100644 --- a/frappe/custom/doctype/customize_form/customize_form.js +++ b/frappe/custom/doctype/customize_form/customize_form.js @@ -178,6 +178,7 @@ frappe.ui.form.on("Customize Form", { fieldname: "module", options: "Module Def", label: __("Module to Export"), + reqd: 1, }, { fieldtype: "Check", From 9c84d078faf22b049bf5280c2a2eb87653076902 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 26 Sep 2022 10:51:02 +0530 Subject: [PATCH 009/152] fix: remove mariadb specific comments from column MariaDB has additional syntax for comments which are like python. --- frappe/utils/data.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 9f794be0fc..8f0065b04c 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -45,6 +45,7 @@ URL_NOTATION_PATTERN = re.compile( ) # background-image: url('/assets/...') DURATION_PATTERN = re.compile(r"^(?:(\d+d)?((^|\s)\d+h)?((^|\s)\d+m)?((^|\s)\d+s)?)$") HTML_TAG_PATTERN = re.compile("<[^>]+>") +MARIADB_SPECIFIC_COMMENT = re.compile(r"#.*") class Weekday(Enum): @@ -1827,8 +1828,11 @@ def sanitize_column(column_name: str) -> None: from frappe import _ - regex = re.compile("^.*[,'();].*") column_name = sqlparse.format(column_name, strip_comments=True, keyword_case="lower") + if frappe.db and frappe.db.db_type == "mariadb": + # strip mariadb specific comments which are like python single line comments + column_name = MARIADB_SPECIFIC_COMMENT.sub("", column_name) + blacklisted_keywords = [ "select", "create", @@ -1844,6 +1848,7 @@ def sanitize_column(column_name: str) -> None: def _raise_exception(): frappe.throw(_("Invalid field name {0}").format(column_name), frappe.DataError) + regex = re.compile("^.*[,'();].*") if "ifnull" in column_name: if regex.match(column_name): # to avoid and, or From c76277f1bf7426adc95a859b59dc0e2074577bd5 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 26 Sep 2022 11:26:03 +0530 Subject: [PATCH 010/152] fix: correctly order args and kwargs --- frappe/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 359926b5b0..7845d814c6 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -456,7 +456,7 @@ def get_site_base_path(): def get_site_path(*path): - return get_path(base=get_site_base_path(), *path) + return get_path(*path, base=get_site_base_path()) def get_files_path(*path, **kwargs): From 6ba28061f6583fb3d2ebe07837ef27e0fa9ea371 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 26 Sep 2022 12:33:20 +0530 Subject: [PATCH 011/152] test: flaky API tests due to autherror (#18221) --- frappe/tests/test_commands.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 9fd505a9c3..a7f1a7eeb9 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -413,6 +413,14 @@ class TestCommands(BaseTestCommands): self.execute("bench --site {site} set-admin-password test2") self.assertEqual(self.returncode, 0) self.assertEqual(check_password("Administrator", "test2"), "Administrator") + frappe.db.commit() + + # Reset it back to original password + original_password = frappe.conf.admin_password or "admin" + self.execute("bench --site {site} set-admin-password %s" % original_password) + self.assertEqual(self.returncode, 0) + self.assertEqual(check_password("Administrator", original_password), "Administrator") + frappe.db.commit() @skipIf( not ( From 56920e409aa3d6f2e164527f88de7ef145b36c22 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 26 Sep 2022 17:50:49 +0530 Subject: [PATCH 012/152] perf: send all translations for setup wizard (#18226) Computing all translations is far slower than just sending everything. This is how boot works too. --- frappe/desk/page/setup_wizard/setup_wizard.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index 3422602720..408776fcb9 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -2,11 +2,10 @@ # License: MIT. See LICENSE import json -import os import frappe from frappe.geo.country_info import get_country_info -from frappe.translate import get_dict, send_translations, set_default_language +from frappe.translate import get_messages_for_boot, send_translations, set_default_language from frappe.utils import cint, strip from frappe.utils.password import update_password @@ -290,15 +289,7 @@ def load_messages(language): frappe.clear_cache() set_default_language(get_language_code(language)) frappe.db.commit() - m = get_dict("page", "setup-wizard") - - for path in frappe.get_hooks("setup_wizard_requires"): - # common folder `assets` served from `sites/` - js_file_path = os.path.abspath(frappe.get_site_path("..", *path.strip("/").split("/"))) - m.update(get_dict("jsfile", js_file_path)) - - m.update(get_dict("boot")) - send_translations(m) + send_translations(get_messages_for_boot()) return frappe.local.lang From 13e6aca115360a27bb9c198c20606b7b8394f1dc Mon Sep 17 00:00:00 2001 From: aliX40 <55487948+aliX40@users.noreply.github.com> Date: Mon, 26 Sep 2022 16:03:22 +0200 Subject: [PATCH 013/152] fix: chart label not being translated (#18212) * Fix chart translation issue also used .html() instead of .text() in line 58, because otherwise it resulted in html escape errors. In french ' is used in many words and when using the text() method it results in this string being inserted ' * refactor: use data attribute for semantic consistency Co-authored-by: Ankush Menat --- .../public/js/frappe/utils/dashboard_utils.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js index eb009ef76a..488aa20742 100644 --- a/frappe/public/js/frappe/utils/dashboard_utils.js +++ b/frappe/public/js/frappe/utils/dashboard_utils.js @@ -15,7 +15,7 @@ frappe.dashboard_utils = { let chart_filter_html = `
  • ${option} + ${__(option)}
    • ` ) .join(""); } else { - // TODO: Make option translatable - be careful, since the text of the a tag is later used to perform some action options_html = filter.options - .map((option) => `
  • ${option}
    • `) + .map( + (option) => + `
  • ${__(option)}
    • ` + ) .join(""); } @@ -54,8 +59,8 @@ frappe.dashboard_utils = { fieldname = $el.attr("data-fieldname"); } - let selected_item = $el.text(); - $el.parents(`.${button_class}`).find(".filter-label").text(selected_item); + let selected_item = decodeURIComponent($el.data("option")); + $el.parents(`.${button_class}`).find(".filter-label").html(__(selected_item)); filter.action(selected_item, fieldname); }); }); From 43101e0356e0719dc8afdaf1412b1e8748c80644 Mon Sep 17 00:00:00 2001 From: Ritwik Puri Date: Tue, 27 Sep 2022 13:46:30 +0530 Subject: [PATCH 014/152] fix(minor): consider only email id as sender email for auto email report (#18231) --- frappe/email/doctype/auto_email_report/auto_email_report.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 7b18c8632b..60a69607a2 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -40,8 +40,7 @@ class AutoEmailReport(Document): @property def sender_email(self): - email_id, login_id = frappe.db.get_value("Email Account", self.sender, ["email_id", "login_id"]) - return login_id if login_id else email_id + return frappe.db.get_value("Email Account", self.sender, "email_id") def validate_emails(self): """Cleanup list of emails""" From 07662ebaf37ef599b663769823f58763eca53991 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 27 Sep 2022 18:17:58 +0530 Subject: [PATCH 015/152] fix: only allow verified_command on GET requests (#18235) --- frappe/utils/verified_command.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/frappe/utils/verified_command.py b/frappe/utils/verified_command.py index f46c8a8e73..7367643cff 100644 --- a/frappe/utils/verified_command.py +++ b/frappe/utils/verified_command.py @@ -33,8 +33,6 @@ def verify_request(): frappe.local.flags.signed_query_string or getattr(frappe.request, "query_string", None) ) - valid = False - signature_string = "&_signature=" if signature_string in query_string: params, signature = query_string.split(signature_string) @@ -42,15 +40,19 @@ def verify_request(): given_signature = hmac.new(params.encode("utf-8"), digestmod=hashlib.md5) given_signature.update(get_secret().encode()) - valid = signature == given_signature.hexdigest() + valid_signature = signature == given_signature.hexdigest() + valid_method = frappe.request.method == "GET" + valid_request_data = not (frappe.request.form or frappe.request.data) - if not valid: - frappe.respond_as_web_page( - _("Invalid Link"), - _("This link is invalid or expired. Please make sure you have pasted correctly."), - ) + if valid_signature and valid_method and valid_request_data: + return True - return valid + frappe.respond_as_web_page( + _("Invalid Link"), + _("This link is invalid or expired. Please make sure you have pasted correctly."), + ) + + return False def get_url(cmd, params, nonce=None, secret=None): From 0642708f017fa517f0d303a56f3b6de301cdc1b1 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 27 Sep 2022 19:21:02 +0530 Subject: [PATCH 016/152] perf: use `modified` instead of `creation` in scheduler (#18234) creation doesn't have index and does full table scan. On large site with ~3M activity logs it takes ~1.5 seconds just to begin scheduler. [skip ci] --- frappe/tests/test_scheduler.py | 17 ++++++++++++----- frappe/utils/scheduler.py | 14 +++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 8725ce5e8c..0cefd4843e 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -7,7 +7,12 @@ import frappe from frappe.core.doctype.scheduled_job_type.scheduled_job_type import ScheduledJobType, sync_jobs from frappe.utils import add_days, get_datetime from frappe.utils.doctor import purge_pending_jobs -from frappe.utils.scheduler import enqueue_events, is_dormant, schedule_jobs_based_on_activity +from frappe.utils.scheduler import ( + _get_last_modified_timestamp, + enqueue_events, + is_dormant, + schedule_jobs_based_on_activity, +) def test_timeout_10(): @@ -56,7 +61,7 @@ class TestScheduler(TestCase): self.assertFalse(is_dormant(check_time=frappe.db.get_last_created("Activity Log"))) def test_once_a_day_for_dormant(self): - frappe.db.clear_table("Scheduled Job Log") + frappe.db.truncate("Scheduled Job Log") self.assertTrue(schedule_jobs_based_on_activity(check_time=get_datetime("2100-01-01 00:00:00"))) self.assertTrue( schedule_jobs_based_on_activity( @@ -68,19 +73,21 @@ class TestScheduler(TestCase): job = get_test_job(method="frappe.tests.test_scheduler.test_method", frequency="Daily") job.execute() job_log = frappe.get_doc("Scheduled Job Log", dict(scheduled_job_type=job.name)) - job_log.db_set("creation", add_days(frappe.db.get_last_created("Activity Log"), 5)) + job_log.db_set( + "modified", add_days(_get_last_modified_timestamp("Activity Log"), 5), update_modified=False + ) # inactive site with recent job, don't run self.assertFalse( schedule_jobs_based_on_activity( - check_time=add_days(frappe.db.get_last_created("Activity Log"), 5) + check_time=add_days(_get_last_modified_timestamp("Activity Log"), 5) ) ) # one more day has passed self.assertTrue( schedule_jobs_based_on_activity( - check_time=add_days(frappe.db.get_last_created("Activity Log"), 6) + check_time=add_days(_get_last_modified_timestamp("Activity Log"), 6) ) ) diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index d7393c4d45..018f86cea6 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -18,7 +18,7 @@ import schedule # imports - module imports import frappe from frappe.installer import update_site_config -from frappe.utils import get_sites, now_datetime +from frappe.utils import get_datetime, get_sites, now_datetime from frappe.utils.background_jobs import get_jobs DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -146,7 +146,7 @@ def schedule_jobs_based_on_activity(check_time=None): Returns True for inactive sites once in 24 hours""" if is_dormant(check_time=check_time): # ensure last job is one day old - last_job_timestamp = frappe.db.get_last_created("Scheduled Job Log") + last_job_timestamp = _get_last_modified_timestamp("Scheduled Job Log") if not last_job_timestamp: return True else: @@ -162,7 +162,7 @@ def schedule_jobs_based_on_activity(check_time=None): def is_dormant(check_time=None): - last_activity_log_timestamp = frappe.db.get_last_created("Activity Log") + last_activity_log_timestamp = _get_last_modified_timestamp("Activity Log") since = (frappe.get_system_settings("dormant_days") or 4) * 86400 if not last_activity_log_timestamp: return True @@ -171,6 +171,14 @@ def is_dormant(check_time=None): return False +def _get_last_modified_timestamp(doctype): + timestamp = frappe.db.get_value( + doctype, filters={}, fieldname="modified", order_by="modified desc" + ) + if timestamp: + return get_datetime(timestamp) + + @frappe.whitelist() def activate_scheduler(): if is_scheduler_disabled(): From d399951fabbf5cd343bd90865e7732622675f079 Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Tue, 27 Sep 2022 23:45:41 -0600 Subject: [PATCH 017/152] fix: add translate function to some strings (#18188) * fix: typo on dashboard_view * fix: add string to translate function * fix: add string to translate function * fix: add string to translate function * fix: upddate translatet text to single quote * fix: update translated strings to single quote * fix: add country to translate function * fix: add country to translate function * fix: add string to translate function * fix: add string to translate function * fix: add string to translate function * fix: Revert translate for country * fix: revert single quote to Search for icons text * fix: refactor the translate labels directly to html variable --- .../js/frappe/phone_picker/phone_picker.js | 2 +- .../frappe/views/dashboard/dashboard_view.js | 2 +- .../js/frappe/views/workspace/blocks/block.js | 4 +- .../views/workspace/blocks/paragraph.js | 2 +- .../frappe/views/workspace/blocks/spacer.js | 2 +- .../js/frappe/views/workspace/workspace.js | 38 +++++++++---------- .../js/frappe/widgets/quick_list_widget.js | 12 +++--- .../public/js/frappe/widgets/widget_dialog.js | 10 ++--- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/frappe/public/js/frappe/phone_picker/phone_picker.js b/frappe/public/js/frappe/phone_picker/phone_picker.js index aec6fb295e..ae6ddcb32b 100644 --- a/frappe/public/js/frappe/phone_picker/phone_picker.js +++ b/frappe/public/js/frappe/phone_picker/phone_picker.js @@ -17,7 +17,7 @@ class PhonePicker { this.phone_picker_wrapper = $(`
    - + ${frappe.utils.icon("search", "sm")}
    diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js index 51163142a7..12d2d4701f 100644 --- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js +++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js @@ -395,7 +395,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView { fieldtype: "Select", fieldname: "aggregate_function_based_on", options: fields.aggregate_function_fields, - depends_on: 'eval: ["Sum", "Avergage"].includes(doc.group_by_type)', + depends_on: 'eval: ["Sum", "Average"].includes(doc.group_by_type)', }, { fieldname: "cb_2", diff --git a/frappe/public/js/frappe/views/workspace/blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js index cea1dad5ee..54c59df05a 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -200,9 +200,9 @@ export default class Block { let dropdown_item = function (label, title, icon, action) { let html = $(` -
    +
    ${icon} - ${label} + ${__(label)}
    `); diff --git a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js index 3c49f5460b..cbd3ef9b65 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/paragraph.js +++ b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js @@ -75,7 +75,7 @@ export default class Paragraph extends Block { } open_block_list() { - let dropdown_title = "Templates"; + let dropdown_title = __("Templates"); let $block_list_container = $(`
    ${dropdown_title.toUpperCase()}
    diff --git a/frappe/public/js/frappe/views/workspace/blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js index aa5c3684d2..7cababac59 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/spacer.js +++ b/frappe/public/js/frappe/views/workspace/blocks/spacer.js @@ -23,7 +23,7 @@ export default class Spacer extends Block { let $spacer = $(`
    -
    Spacer
    +
    ${__("Spacer")}
    `); diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 229126f908..8d5535cf80 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -578,8 +578,8 @@ frappe.views.Workspace = class Workspace { }, callback: function (res) { if (res.message) { - let message = `Workspace ${old_item.title} Edited Successfully`; - frappe.show_alert({ message: __(message), indicator: "green" }); + let message = __("Workspace {0} Edited Successfully", [old_item.title.bold()]); + frappe.show_alert({ message: message, indicator: "green" }); } }, }); @@ -706,20 +706,20 @@ frappe.views.Workspace = class Workspace { add_settings_button(item, sidebar_control) { this.dropdown_list = [ { - label: "Edit", - title: "Edit Workspace", + label: __("Edit"), + title: __("Edit Workspace"), icon: frappe.utils.icon("edit", "sm"), action: () => this.edit_page(item), }, { - label: "Duplicate", - title: "Duplicate Workspace", + label: __("Duplicate"), + title: __("Duplicate Workspace"), icon: frappe.utils.icon("duplicate", "sm"), action: () => this.duplicate_page(item), }, { - label: "Delete", - title: "Delete Workspace", + label: __("Delete"), + title: __("Delete Workspace"), icon: frappe.utils.icon("delete-active", "sm"), action: () => this.delete_page(item), }, @@ -766,15 +766,15 @@ frappe.views.Workspace = class Workspace { } delete_page(page) { - frappe.confirm(__("Are you sure you want to delete page {0}?", [page.title]), () => { + frappe.confirm(__("Are you sure you want to delete page {0}?", [page.title.bold()]), () => { frappe.call({ method: "frappe.desk.doctype.workspace.workspace.delete_page", args: { page: page }, callback: function (res) { if (res.message) { let page = res.message; - let message = `Workspace ${page.title} Deleted Successfully`; - frappe.show_alert({ message: __(message), indicator: "green" }); + let message = __("Workspace {0} Deleted Successfully", [page.title.bold()]); + frappe.show_alert({ message: message, indicator: "green" }); } }, }); @@ -851,8 +851,8 @@ frappe.views.Workspace = class Workspace { callback: function (res) { if (res.message) { let new_page = res.message; - let message = `Duplicate of ${page.title} named as ${new_page.title} is created successfully`; - frappe.show_alert({ message: __(message), indicator: "green" }); + let message = __("Duplicate of {0} named as {1} is created successfully", [page.title.bold(), new_page.title.bold()]); + frappe.show_alert({ message: message, indicator: "green" }); } }, }); @@ -1071,9 +1071,9 @@ frappe.views.Workspace = class Workspace { }, callback: function (res) { if (res.message) { - let message = `Workspace ${new_page.title} Created Successfully`; + let message = __("Workspace {0} Created Successfully", [new_page.title.bold()]); frappe.show_alert({ - message: __(message), + message: message, indicator: "green", }); } @@ -1103,18 +1103,18 @@ frappe.views.Workspace = class Workspace { let section = this.sidebar_categories[new_page.is_public]; if (to_pages && to_pages.filter((p) => p.title == new_page.title)[0]) { - message = `Page with title ${new_page.title} already exist.`; + message = __("Page with title {0} already exist.", [new_page.title.bold()]); } if (frappe.router.doctype_route_exist(frappe.router.slug(new_page.title))) { - message = "Doctype with same route already exist. Please choose different title."; + message = __("Doctype with same route already exist. Please choose different title."); } let child_pages = old_page && from_pages.filter((p) => p.parent_page == old_page.title); if (child_pages) { child_pages.every((child_page) => { if (to_pages && to_pages.find((p) => p.title == child_page.title)) { - message = `One of the child page with name ${child_page.title} already exist in ${section} Section. Please update the name of the child page first before moving`; + message = __("One of the child page with name {0} already exist in {1} Section. Please update the name of the child page first before moving", [child_page.title.bold(), section.bold()]); cur_dialog.hide(); return false; } @@ -1186,7 +1186,7 @@ frappe.views.Workspace = class Workspace { class: this.blocks["paragraph"], inlineToolbar: ["HeaderSize", "bold", "italic", "link"], config: { - placeholder: "Choose a block or continue typing", + placeholder: __("Choose a block or continue typing"), }, }, chart: { diff --git a/frappe/public/js/frappe/widgets/quick_list_widget.js b/frappe/public/js/frappe/widgets/quick_list_widget.js index b383d99423..4fefbf4271 100644 --- a/frappe/public/js/frappe/widgets/quick_list_widget.js +++ b/frappe/public/js/frappe/widgets/quick_list_widget.js @@ -26,9 +26,9 @@ export default class QuickListWidget extends Widget { setup_add_new_button() { this.add_new_button = $( - `
    + `
    ${frappe.utils.icon("add", "sm")}
    ` ); @@ -99,7 +99,7 @@ export default class QuickListWidget extends Widget { ]; let me = this; this.dialog = new frappe.ui.Dialog({ - title: __("Set Filters for {0}", [this.document_type]), + title: __("Set Filters for {0}", [__(this.document_type)]), fields: fields, primary_action: function () { let old_filter = me.quick_list_filter; @@ -114,7 +114,7 @@ export default class QuickListWidget extends Widget { me.set_body(); } }, - primary_action_label: "Set", + primary_action_label: __("Set"), }); this.dialog.show(); @@ -243,7 +243,7 @@ export default class QuickListWidget extends Widget { } let route = frappe.utils.generate_route({ type: "doctype", name: this.document_type }); this.see_all_button = $(` - View List + ${__("View List")} `).appendTo(this.footer); } } diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 545388c31d..b577700715 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -272,7 +272,7 @@ class CardDialog extends WidgetDialog { { fieldname: "only_for", fieldtype: "Link", - label: "Only for ", + label: "Only for", options: "Country", }, { @@ -296,18 +296,18 @@ class CardDialog extends WidgetDialog { let message = ""; if (!data.links) { - message = "You must add atleast one link."; + message = __("You must add atleast one link."); } else { data.links.map((item, idx) => { let row = idx + 1; if (!item.link_type) { - message = "Following fields have missing values:

      "; - message += `
    • Link Type in Row ${row}
      • `; + message = __("Following fields have missing values") + ":

        "; + message += `
      • ${__("Link Type in Row")} ${row}
        • `; } if (!item.link_to) { - message += `
      • Link To in Row ${row}
        • `; + message += `
      • ${__("Link To in Row")} ${row}
        • `; } item.label = item.label ? item.label : item.link_to; From 4b67ebc2f1e43703ce8f4df65d3e204364116e1e Mon Sep 17 00:00:00 2001 From: Ernesto Ruiz Date: Tue, 27 Sep 2022 23:47:41 -0600 Subject: [PATCH 018/152] fix: Add translate function to strings (#18153) * fix: Add translate function to strings fix: Add translate function to strings * fix: add more strings to translate function * fix: Add strings on translate function HTML tags * fix: lint text on translate function * fix: use single quotes on translate strings * fix: Add template literals to translate HTML strings * Update frappe/public/js/frappe/ui/toolbar/about.js Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frappe/public/js/frappe/ui/toolbar/about.js | 38 ++++++++++----------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/about.js b/frappe/public/js/frappe/ui/toolbar/about.js index 5a45440f7f..78517c24b4 100644 --- a/frappe/public/js/frappe/ui/toolbar/about.js +++ b/frappe/public/js/frappe/ui/toolbar/about.js @@ -5,26 +5,24 @@ frappe.ui.misc.about = function () { $(d.body).html( repl( - "
        \ -

        " + - __("Open Source Applications for the Web") + - "

        \ -

        \ - Website: https://frappeframework.com

        \ -

        \ - Source: https://github.com/frappe

        \ -

        \ - Linkedin: https://linkedin.com/company/frappe-tech

        \ -

        \ - Facebook: https://facebook.com/erpnext

        \ -

        \ - Twitter: https://twitter.com/erpnext

        \ -
        \ -

        Installed Apps

        \ -
        Loading versions...
        \ -
        \ -

        © Frappe Technologies Pvt. Ltd. and contributors

        \ -
        ", + `
        +

        ${__('Open Source Applications for the Web')}

        +

        + ${__('Website')}: https://frappeframework.com

        +

        + ${__('Source')}: https://github.com/frappe

        +

        + Linkedin: https://linkedin.com/company/frappe-tech

        +

        + Facebook: https://facebook.com/erpnext

        +

        + Twitter: https://twitter.com/erpnext

        +
        +

        ${__('Installed Apps')}

        +
        ${__('Loading versions...')}
        +
        +

        ${__('© Frappe Technologies Pvt. Ltd. and contributors')}

        +
        `, frappe.app ) ); From 0825fd55c004e07aa0cc4067eb2e2edae9ace071 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 28 Sep 2022 11:21:22 +0530 Subject: [PATCH 019/152] style: prettier --- .../js/frappe/phone_picker/phone_picker.js | 2 +- frappe/public/js/frappe/ui/toolbar/about.js | 14 ++-- .../js/frappe/views/workspace/workspace.js | 66 ++++++++++++------- 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/frappe/public/js/frappe/phone_picker/phone_picker.js b/frappe/public/js/frappe/phone_picker/phone_picker.js index ae6ddcb32b..aec6fb295e 100644 --- a/frappe/public/js/frappe/phone_picker/phone_picker.js +++ b/frappe/public/js/frappe/phone_picker/phone_picker.js @@ -17,7 +17,7 @@ class PhonePicker { this.phone_picker_wrapper = $(`
        - + ${frappe.utils.icon("search", "sm")}
        diff --git a/frappe/public/js/frappe/ui/toolbar/about.js b/frappe/public/js/frappe/ui/toolbar/about.js index 78517c24b4..e23706eff1 100644 --- a/frappe/public/js/frappe/ui/toolbar/about.js +++ b/frappe/public/js/frappe/ui/toolbar/about.js @@ -6,11 +6,13 @@ frappe.ui.misc.about = function () { $(d.body).html( repl( `
        -

        ${__('Open Source Applications for the Web')}

        +

        ${__("Open Source Applications for the Web")}

        - ${__('Website')}: https://frappeframework.com

        + ${__("Website")}: + https://frappeframework.com

        - ${__('Source')}: https://github.com/frappe

        + ${__("Source")}: + https://github.com/frappe

        Linkedin: https://linkedin.com/company/frappe-tech

        @@ -18,10 +20,10 @@ frappe.ui.misc.about = function () {

        Twitter: https://twitter.com/erpnext

        -

        ${__('Installed Apps')}

        -
        ${__('Loading versions...')}
        +

        ${__("Installed Apps")}

        +
        ${__("Loading versions...")}
        -

        ${__('© Frappe Technologies Pvt. Ltd. and contributors')}

        +

        ${__("© Frappe Technologies Pvt. Ltd. and contributors")}

        `, frappe.app ) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 8d5535cf80..96b3f4e15a 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -578,7 +578,9 @@ frappe.views.Workspace = class Workspace { }, callback: function (res) { if (res.message) { - let message = __("Workspace {0} Edited Successfully", [old_item.title.bold()]); + let message = __("Workspace {0} Edited Successfully", [ + old_item.title.bold(), + ]); frappe.show_alert({ message: message, indicator: "green" }); } }, @@ -766,29 +768,37 @@ frappe.views.Workspace = class Workspace { } delete_page(page) { - frappe.confirm(__("Are you sure you want to delete page {0}?", [page.title.bold()]), () => { - frappe.call({ - method: "frappe.desk.doctype.workspace.workspace.delete_page", - args: { page: page }, - callback: function (res) { - if (res.message) { - let page = res.message; - let message = __("Workspace {0} Deleted Successfully", [page.title.bold()]); - frappe.show_alert({ message: message, indicator: "green" }); - } - }, - }); + frappe.confirm( + __("Are you sure you want to delete page {0}?", [page.title.bold()]), + () => { + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.delete_page", + args: { page: page }, + callback: function (res) { + if (res.message) { + let page = res.message; + let message = __("Workspace {0} Deleted Successfully", [ + page.title.bold(), + ]); + frappe.show_alert({ message: message, indicator: "green" }); + } + }, + }); - this.page.clear_primary_action(); - this.update_cached_values(page); + this.page.clear_primary_action(); + this.update_cached_values(page); - if (this.current_page.name == page.title && this.current_page.public == page.public) { - frappe.set_route("/"); + if ( + this.current_page.name == page.title && + this.current_page.public == page.public + ) { + frappe.set_route("/"); + } + + this.make_sidebar(); + this.show_sidebar_actions(); } - - this.make_sidebar(); - this.show_sidebar_actions(); - }); + ); } duplicate_page(page) { @@ -851,7 +861,10 @@ frappe.views.Workspace = class Workspace { callback: function (res) { if (res.message) { let new_page = res.message; - let message = __("Duplicate of {0} named as {1} is created successfully", [page.title.bold(), new_page.title.bold()]); + let message = __( + "Duplicate of {0} named as {1} is created successfully", + [page.title.bold(), new_page.title.bold()] + ); frappe.show_alert({ message: message, indicator: "green" }); } }, @@ -1071,7 +1084,9 @@ frappe.views.Workspace = class Workspace { }, callback: function (res) { if (res.message) { - let message = __("Workspace {0} Created Successfully", [new_page.title.bold()]); + let message = __("Workspace {0} Created Successfully", [ + new_page.title.bold(), + ]); frappe.show_alert({ message: message, indicator: "green", @@ -1114,7 +1129,10 @@ frappe.views.Workspace = class Workspace { if (child_pages) { child_pages.every((child_page) => { if (to_pages && to_pages.find((p) => p.title == child_page.title)) { - message = __("One of the child page with name {0} already exist in {1} Section. Please update the name of the child page first before moving", [child_page.title.bold(), section.bold()]); + message = __( + "One of the child page with name {0} already exist in {1} Section. Please update the name of the child page first before moving", + [child_page.title.bold(), section.bold()] + ); cur_dialog.hide(); return false; } From abeed354612ca034eeb09b5ad4a1f419853bdcd0 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 28 Sep 2022 14:29:38 +0530 Subject: [PATCH 020/152] fix: throw exception if backup failed (#18230) --- frappe/tests/test_commands.py | 15 ++++++++++++++- frappe/utils/__init__.py | 11 ++++++++--- frappe/utils/backups.py | 13 ++++++++----- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index a7f1a7eeb9..343184d01a 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -31,7 +31,7 @@ from frappe.query_builder.utils import db_type_is from frappe.tests.test_query_builder import run_only_if from frappe.tests.utils import FrappeTestCase from frappe.utils import add_to_date, get_bench_path, get_bench_relative_path, now -from frappe.utils.backups import fetch_latest_backups +from frappe.utils.backups import BackupGenerator, fetch_latest_backups from frappe.utils.jinja_globals import bundled_asset _result: Result | None = None @@ -515,6 +515,19 @@ class TestBackups(BaseTestCommands): self.assertIn("successfully completed", self.stdout) self.assertNotEqual(before_backup["database"], after_backup["database"]) + def test_backup_fails_with_exit_code(self): + """Provide incorrect options to check if exit code is 1""" + odb = BackupGenerator( + frappe.conf.db_name, + frappe.conf.db_name, + frappe.conf.db_password + "INCORRECT PASSWORD", + db_host=frappe.db.host, + db_port=frappe.db.port, + db_type=frappe.conf.db_type, + ) + with self.assertRaises(Exception): + odb.take_dump() + def test_backup_with_files(self): """Take a backup with files (--with-files)""" before_backup = fetch_latest_backups() diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 7845d814c6..3e70f719da 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -415,7 +415,7 @@ def unesc(s, esc_chars): return s -def execute_in_shell(cmd, verbose=0, low_priority=False): +def execute_in_shell(cmd, verbose=False, low_priority=False, check_exit_code=False): # using Popen instead of os.system - as recommended by python docs import tempfile from subprocess import Popen @@ -427,7 +427,7 @@ def execute_in_shell(cmd, verbose=0, low_priority=False): kwargs["preexec_fn"] = lambda: os.nice(10) p = Popen(cmd, **kwargs) - p.wait() + exit_code = p.wait() stdout.seek(0) out = stdout.read() @@ -435,12 +435,17 @@ def execute_in_shell(cmd, verbose=0, low_priority=False): stderr.seek(0) err = stderr.read() - if verbose: + failed = check_exit_code and exit_code + + if verbose or failed: if err: print(err) if out: print(out) + if failed: + raise Exception("Command failed") + return err, out diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index b5722def4f..2a2eeb8efc 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -420,8 +420,9 @@ class BackupGenerator: ) cmd_string = ( - "{db_exc} postgres://{user}:{password}@{db_host}:{db_port}/{db_name}" - " {include} {exclude} | {gzip} >> {backup_path_db}" + "self=$$; " + "( {db_exc} postgres://{user}:{password}@{db_host}:{db_port}/{db_name}" + " {include} {exclude} || kill $self ) | {gzip} >> {backup_path_db}" ) else: @@ -433,8 +434,10 @@ class BackupGenerator: ) cmd_string = ( - "{db_exc} --single-transaction --quick --lock-tables=false -u {user}" - " -p{password} {db_name} -h {db_host} -P {db_port} {include} {exclude}" + # Remember process of this shell and kill it if mysqldump exits w/ non-zero code + "self=$$; " + " ( {db_exc} --single-transaction --quick --lock-tables=false -u {user}" + " -p{password} {db_name} -h {db_host} -P {db_port} {include} {exclude} || kill $self ) " " | {gzip} >> {backup_path_db}" ) @@ -454,7 +457,7 @@ class BackupGenerator: if self.verbose: print(command.replace(args.password, "*" * 10) + "\n") - frappe.utils.execute_in_shell(command, low_priority=True) + frappe.utils.execute_in_shell(command, low_priority=True, check_exit_code=True) def send_email(self): """ From 44e9f6b9abff67186ba3d4ca8bb1e508065af58f Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 28 Sep 2022 14:55:07 +0530 Subject: [PATCH 021/152] build(deps): Bump from vue 2 to vue 3 --- esbuild/esbuild.js | 27 ++++++++++++++++----- esbuild/frappe-vue-style.js | 48 +++++++++++++++++++++++++++++++++++++ package.json | 10 ++++---- 3 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 esbuild/frappe-vue-style.js diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index 69e479a6ff..ad7e8e741a 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -3,11 +3,12 @@ const path = require("path"); const fs = require("fs"); const glob = require("fast-glob"); const esbuild = require("esbuild"); -const vue = require("esbuild-vue"); +const vue = require("esbuild-plugin-vue3"); const yargs = require("yargs"); const cliui = require("cliui")(); const chalk = require("chalk"); const html_plugin = require("./frappe-html"); +const vue_style_plugin = require("./frappe-vue-style"); const rtlcss = require("rtlcss"); const postCssPlugin = require("@frappe/esbuild-plugin-postcss2").default; const ignore_assets = require("./ignore-assets"); @@ -155,7 +156,7 @@ function build_assets_for_apps(apps, files) { style_file_map[output_name] = file; rtl_style_file_map[output_name.replace("/css/", "/css-rtl/")] = file; } else { - file_map[output_name] = file; + file_map[output_name.replace("/js/", "/")] = file; } } let build = build_files({ @@ -218,8 +219,9 @@ function get_files_to_build(files) { } function build_files({ files, outdir }) { - let build_plugins = [html_plugin, build_cleanup_plugin, vue()]; - return esbuild.build(get_build_options(files, outdir, build_plugins)); + let build_plugins = [vue(), html_plugin, build_cleanup_plugin, vue_style_plugin]; + let entry_names = "[dir]/[ext]/[name].[hash]"; + return esbuild.build(get_build_options(files, outdir, build_plugins, entry_names)); } function build_style_files({ files, outdir, rtl_style = false }) { @@ -241,10 +243,11 @@ function build_style_files({ files, outdir, rtl_style = false }) { return esbuild.build(get_build_options(files, outdir, build_plugins)); } -function get_build_options(files, outdir, plugins) { +function get_build_options(files, outdir, plugins, entry_names) { + let entryNames = entry_names || "[dir]/[name].[hash]"; return { entryPoints: files, - entryNames: "[dir]/[name].[hash]", + entryNames, target: ["es2017"], outdir, sourcemap: true, @@ -254,6 +257,8 @@ function get_build_options(files, outdir, plugins) { nodePaths: NODE_PATHS, define: { "process.env.NODE_ENV": JSON.stringify(PRODUCTION ? "production" : "development"), + "__VUE_OPTIONS_API__": JSON.stringify(true), + "__VUE_PROD_DEVTOOLS__": JSON.stringify(false), }, plugins: plugins, watch: get_watch_config(), @@ -378,6 +383,16 @@ async function write_assets_json(metafile) { key = `rtl_${key}`; } out[key] = asset_path; + } else if (Object.keys(info.inputs).length !== 0) { + for (let input in info.inputs) { + if (input.includes(".vue?type=style")) { + // remove hash from css file name + let key = path.basename(asset_path); + key = key.split('.css')[0]; + key = key.substring(0, key.lastIndexOf(".")) + '.css'; + out[key] = asset_path; + } + } } } diff --git a/esbuild/frappe-vue-style.js b/esbuild/frappe-vue-style.js new file mode 100644 index 0000000000..8147aec777 --- /dev/null +++ b/esbuild/frappe-vue-style.js @@ -0,0 +1,48 @@ +const fs = require("fs"); +const path = require("path"); +const { sites_path } = require("./utils"); + +module.exports = { + name: "frappe-vue-style", + setup(build) { + build.initialOptions.write = false; + build.onEnd((result) => { + let files = get_files(result.metafile.outputs); + let keys = Object.keys(files); + for (let out of result.outputFiles) { + let asset_path = "/" + path.relative(sites_path, out.path); + let dir = path.dirname(out.path); + if (out.path.endsWith(".js") && keys.includes(asset_path)) { + let bundle_css = files[asset_path]; + let include_css = '\nfrappe.require("' + bundle_css + '");\n'; + let modified = include_css + out.text; + out.contents = Buffer.from(modified); + } + if (!fs.existsSync(dir)){ + fs.mkdirSync(dir); + } + fs.writeFile(out.path, out.contents, (err) => { + err && console.error(err); + }); + } + }); + }, +}; + +function get_files(files) { + let result = {}; + for (let file in files) { + let info = files[file]; + let asset_path = "/" + path.relative(sites_path, file); + if (info && info.entryPoint && Object.keys(info.inputs).length !== 0) { + for (let input in info.inputs) { + if (input.includes(".vue?type=style")) { + let bundle_css = path.basename(info.entryPoint).replace(".js", ".css"); + result[asset_path] = bundle_css; + break; + } + } + } + } + return result; +} diff --git a/package.json b/package.json index 18063c69cf..b1252a1b83 100644 --- a/package.json +++ b/package.json @@ -58,23 +58,23 @@ "sortablejs": "1.9.0", "superagent": "^3.8.2", "touch": "^3.1.0", - "vue": "2.6.14", - "vue-router": "^2.0.0", + "vue": "3.2.39", + "vue-router": "^4.1.5", "vuedraggable": "^2.24.3", - "vuex": "3", + "vuex": "4.0.2", "@frappe/esbuild-plugin-postcss2": "^0.1.3", "@vue/component-compiler": "^4.2.4", "autoprefixer": "10", "chalk": "^2.3.2", "cliui": "^7.0.4", "esbuild": "^0.14.29", - "esbuild-vue": "^1.2.1", + "esbuild-plugin-vue3": "^0.3.0", "fast-glob": "^3.2.5", "launch-editor": "^2.2.1", "md5": "^2.3.0", "postcss": "8", "rtlcss": "^3.2.1", - "vue-template-compiler": "2.6.14", + "@vue/compiler-sfc": "^3.2.39", "yargs": "^17.5.1" }, "snyk": true, From 2c9a447f838fb5166401ba6e2ee8a4d074a8f72f Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 28 Sep 2022 15:30:59 +0530 Subject: [PATCH 022/152] chore: linter fixes --- esbuild/esbuild.js | 8 ++++---- esbuild/frappe-vue-style.js | 2 +- frappe/public/js/frappe/widgets/quick_list_widget.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index ad7e8e741a..afda75ebb0 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -257,8 +257,8 @@ function get_build_options(files, outdir, plugins, entry_names) { nodePaths: NODE_PATHS, define: { "process.env.NODE_ENV": JSON.stringify(PRODUCTION ? "production" : "development"), - "__VUE_OPTIONS_API__": JSON.stringify(true), - "__VUE_PROD_DEVTOOLS__": JSON.stringify(false), + __VUE_OPTIONS_API__: JSON.stringify(true), + __VUE_PROD_DEVTOOLS__: JSON.stringify(false), }, plugins: plugins, watch: get_watch_config(), @@ -388,8 +388,8 @@ async function write_assets_json(metafile) { if (input.includes(".vue?type=style")) { // remove hash from css file name let key = path.basename(asset_path); - key = key.split('.css')[0]; - key = key.substring(0, key.lastIndexOf(".")) + '.css'; + key = key.split(".css")[0]; + key = key.substring(0, key.lastIndexOf(".")) + ".css"; out[key] = asset_path; } } diff --git a/esbuild/frappe-vue-style.js b/esbuild/frappe-vue-style.js index 8147aec777..d8b4711e30 100644 --- a/esbuild/frappe-vue-style.js +++ b/esbuild/frappe-vue-style.js @@ -18,7 +18,7 @@ module.exports = { let modified = include_css + out.text; out.contents = Buffer.from(modified); } - if (!fs.existsSync(dir)){ + if (!fs.existsSync(dir)) { fs.mkdirSync(dir); } fs.writeFile(out.path, out.contents, (err) => { diff --git a/frappe/public/js/frappe/widgets/quick_list_widget.js b/frappe/public/js/frappe/widgets/quick_list_widget.js index 4fefbf4271..dbb26cb62c 100644 --- a/frappe/public/js/frappe/widgets/quick_list_widget.js +++ b/frappe/public/js/frappe/widgets/quick_list_widget.js @@ -26,7 +26,7 @@ export default class QuickListWidget extends Widget { setup_add_new_button() { this.add_new_button = $( - `
        ${frappe.utils.icon("add", "sm")} From 6bd95516bad0a0403183fecbc676edc942b6caaa Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 28 Sep 2022 15:35:28 +0530 Subject: [PATCH 023/152] chore: removed compiler-sfc from package.json since it comes with vue --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index b1252a1b83..15e8e9bbc7 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,6 @@ "md5": "^2.3.0", "postcss": "8", "rtlcss": "^3.2.1", - "@vue/compiler-sfc": "^3.2.39", "yargs": "^17.5.1" }, "snyk": true, From b9e757782f126d78fa871a9379de9b2912406259 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 28 Sep 2022 15:49:15 +0530 Subject: [PATCH 024/152] fix: correct boilerplate for virtual doctypes (#18248) --- frappe/modules/utils.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/modules/utils.py b/frappe/modules/utils.py index aa4ef6cb68..09a91f21fd 100644 --- a/frappe/modules/utils.py +++ b/frappe/modules/utils.py @@ -305,13 +305,16 @@ def make_boilerplate( def db_update(self): pass - def get_list(self, args): + @staticmethod + def get_list(args): pass - def get_count(self, args): + @staticmethod + def get_count(args): pass - def get_stats(self, args): + @staticmethod + def get_stats(args): pass """ ), From 0e0e7f276ccf5355ba3a05223d158b08f994cf8d Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 29 Sep 2022 10:45:37 +0530 Subject: [PATCH 025/152] fix: dont assume issingle exists (#18236) --- frappe/model/base_document.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 5b6caf4f6e..3cdc2e4c1d 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -744,7 +744,7 @@ class BaseDocument: # don't cache if fetching other values too values = frappe.db.get_value(doctype, docname, values_to_fetch, as_dict=True) - if frappe.get_meta(doctype).issingle: + if getattr(frappe.get_meta(doctype), "issingle", 0): values.name = doctype if frappe.get_meta(doctype).get("is_virtual"): @@ -884,7 +884,7 @@ class BaseDocument: if frappe.flags.in_install: return - if self.meta.issingle: + if getattr(self.meta, "issingle", 0): # single doctype value type is mediumtext return From 60d9335d383dc6b5c38bab4524856c62b90f2c33 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 29 Sep 2022 14:24:34 +0530 Subject: [PATCH 026/152] refactor: Recorder code to vue3 --- frappe/core/page/recorder/recorder.js | 4 +- .../js/frappe/recorder/RecorderDetail.vue | 385 ++++++++++-------- .../js/frappe/recorder/RecorderRoot.vue | 29 +- .../js/frappe/recorder/RequestDetail.vue | 250 ++++++------ .../js/frappe/recorder/recorder.bundle.js | 5 + frappe/public/js/frappe/recorder/recorder.js | 48 --- frappe/public/js/frappe/recorder/router.js | 28 ++ frappe/public/js/frappe/recorder/utils.js | 3 + frappe/public/js/recorder.bundle.js | 1 - 9 files changed, 384 insertions(+), 369 deletions(-) create mode 100644 frappe/public/js/frappe/recorder/recorder.bundle.js delete mode 100644 frappe/public/js/frappe/recorder/recorder.js create mode 100644 frappe/public/js/frappe/recorder/router.js create mode 100644 frappe/public/js/frappe/recorder/utils.js delete mode 100644 frappe/public/js/recorder.bundle.js diff --git a/frappe/core/page/recorder/recorder.js b/frappe/core/page/recorder/recorder.js index 83b8d1a636..1f004915fe 100644 --- a/frappe/core/page/recorder/recorder.js +++ b/frappe/core/page/recorder/recorder.js @@ -22,7 +22,7 @@ class Recorder { } show() { - if (!this.view || this.view.$route.name == "recorder-detail") return; - this.view.$router.replace({ name: "recorder-detail" }); + if (!this.route || this.route.name == "RecorderDetail") return; + this.router?.replace({ name: "RecorderDetail" }); } } diff --git a/frappe/public/js/frappe/recorder/RecorderDetail.vue b/frappe/public/js/frappe/recorder/RecorderDetail.vue index 0b6354db7e..001eb0a0bf 100644 --- a/frappe/public/js/frappe/recorder/RecorderDetail.vue +++ b/frappe/public/js/frappe/recorder/RecorderDetail.vue @@ -5,15 +5,24 @@
        -
        {{ columns.filter(c => c.slug == query.sort)[0].label }} +
        + + + {{ columns.filter(c => c.slug == query.sort)[0].label }} + +
        -

        -

        {{ __("Recorder is Inactive.") }}

        -

        {{ __("Start recording or drag & drop a previously exported data file to view it.") }}

        +

        + +

        +

        {{ translated_string("Recorder is Inactive.") }}

        +

        {{ translated_string("Start recording or drag & drop a previously exported data file to view it.") }}

        -

        {{ __("No Requests found") }}

        -

        {{ __("Go make some noise") }}

        +

        {{ translated_string("No Requests found") }}

        +

        {{ translated_string("Go make some noise") }}

        @@ -102,181 +115,193 @@
        - - diff --git a/frappe/public/js/frappe/recorder/RecorderRoot.vue b/frappe/public/js/frappe/recorder/RecorderRoot.vue index 479ab1b2ca..60c5c59453 100644 --- a/frappe/public/js/frappe/recorder/RecorderRoot.vue +++ b/frappe/public/js/frappe/recorder/RecorderRoot.vue @@ -1,17 +1,20 @@ - diff --git a/frappe/public/js/frappe/recorder/RequestDetail.vue b/frappe/public/js/frappe/recorder/RequestDetail.vue index 8ee6ff631b..a77766e8de 100644 --- a/frappe/public/js/frappe/recorder/RequestDetail.vue +++ b/frappe/public/js/frappe/recorder/RequestDetail.vue @@ -16,7 +16,7 @@
        -
        {{ __("SQL Queries") }}
        +
        {{ translated_string("SQL Queries") }}
        @@ -37,7 +37,7 @@
        @@ -48,15 +48,15 @@
        - {{ __("Index") }}
        + {{ translated_string("Index") }}
        -
        {{ __("Query") }}
        +
        {{ translated_string("Query") }}
        -
        {{ __("Duration (ms)") }}
        +
        {{ translated_string("Duration (ms)") }}"
        -
        {{ __("Exact Copies") }}
        +
        {{ translated_string("Exact Copies") }}
        @@ -82,7 +82,7 @@
        - {{ __("SQL Query") }} #{{ call.index }} + {{ translated_string("SQL Query") }} #{{ call.index }}
        @@ -95,25 +95,25 @@
        -
        +
        -
        +
        -
        +
        -
        +
        @@ -134,7 +132,7 @@
        -
        +