From 01d69b67c72e04d5ce1d57d86946e12fdc8e208f Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Fri, 17 Sep 2021 11:59:05 +0530 Subject: [PATCH 01/29] feat: automatically reload web pages whenever JS/CSS assets are rebuilt --- esbuild/esbuild.js | 10 ++++++++-- frappe/build.py | 3 +++ .../js/frappe/build_events/BuildSuccess.vue | 17 +++++++++++++---- .../frappe/build_events/build_events.bundle.js | 5 +++-- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index 9074beae06..b0ed92f9ec 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -44,6 +44,11 @@ let argv = yargs type: "boolean", description: "Run in watch mode and rebuild on file changes" }) + .option("auto-reload", { + type: "boolean", + description: `Automatically reload webpages when assets are rebuilt. + Can only be used with the --watch flag.` + }) .option("production", { type: "boolean", description: "Run build in production mode" @@ -475,7 +480,8 @@ async function notify_redis({ error, success }) { } if (success) { payload = { - success: true + success: true, + autoreload: argv["auto-reload"] }; } @@ -528,4 +534,4 @@ function log_rebuilt_assets(prev_assets, new_assets) { log(" " + filename); } log(); -} \ No newline at end of file +} diff --git a/frappe/build.py b/frappe/build.py index dfbe20f31e..ec092d4b57 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -235,6 +235,9 @@ def watch(apps=None): if apps: command += " --apps {apps}".format(apps=apps) + if frappe.conf.autoreload_on_build: + command += " --auto-reload" + check_node_executable() frappe_app_path = frappe.get_app_path("frappe", "..") frappe.commands.popen(command, cwd=frappe_app_path, env=get_node_env()) diff --git a/frappe/public/js/frappe/build_events/BuildSuccess.vue b/frappe/public/js/frappe/build_events/BuildSuccess.vue index 75a365fdc2..d489c4a1a3 100644 --- a/frappe/public/js/frappe/build_events/BuildSuccess.vue +++ b/frappe/public/js/frappe/build_events/BuildSuccess.vue @@ -3,8 +3,11 @@ v-if="is_shown" class="flex justify-between build-success-message align-center" > -
Compiled successfully
- + Compiled successfully + Refresh @@ -14,11 +17,17 @@ export default { name: "BuildSuccess", data() { return { - is_shown: false + is_shown: false, + autoreload: false, }; }, methods: { - show() { + show(data) { + if (data.autoreload) { + this.autoreload = true; + this.reload(); + } + this.is_shown = true; if (this.timeout) { clearTimeout(this.timeout); diff --git a/frappe/public/js/frappe/build_events/build_events.bundle.js b/frappe/public/js/frappe/build_events/build_events.bundle.js index 6c8986af3f..13b9c7a334 100644 --- a/frappe/public/js/frappe/build_events/build_events.bundle.js +++ b/frappe/public/js/frappe/build_events/build_events.bundle.js @@ -13,10 +13,11 @@ frappe.realtime.on("build_event", data => { } }); -function show_build_success() { +function show_build_success(data) { if (error) { error.hide(); } + if (!success) { let target = $('
') .appendTo($container) @@ -27,7 +28,7 @@ function show_build_success() { }); success = vm.$children[0]; } - success.show(); + success.show(data); } function show_build_error(data) { From f7ad01cb64812b99f97866d9010aa216b5610a49 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 7 Oct 2021 19:38:42 +0530 Subject: [PATCH 02/29] fix: Update check all checkbox based on checked rows in List View --- frappe/public/js/frappe/list/list_view.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 1cf4b4c6ac..56c47d0d8a 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -302,9 +302,20 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { refresh(refresh_header=false) { super.refresh().then(() => { this.render_header(refresh_header); + this.update_checkbox(); }); } + update_checkbox(target) { + let $check_all_checkbox = this.$checkbox_actions.find(".list-check-all"); + + if ($check_all_checkbox.prop("checked") && target && !target.prop("checked")) { + $check_all_checkbox.prop("checked", false); + } + + $check_all_checkbox.prop("checked", this.$checks.length === this.data.length); + } + setup_freeze_area() { this.$freeze = $( `
${__( @@ -1253,6 +1264,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } this.$checkbox_cursor = $target; + + this.update_checkbox($target); }); } @@ -1398,6 +1411,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { this.$checkbox_actions.show(); this.$list_head_subject.hide(); } + this.update_checkbox(); this.toggle_actions_menu_button(this.$checks.length > 0); } From 096700a77aaf74e66c7e795a42ba69869d41bf96 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 12 Oct 2021 19:11:25 +0530 Subject: [PATCH 03/29] fix: Loading state for query reports --- .../js/frappe/views/reports/query_report.js | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7d68919821..8a50a516af 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -107,7 +107,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } if (this.report_name !== frappe.get_route()[1]) { - // this.toggle_loading(true); // different report this.load_report(); } @@ -556,6 +555,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { refresh() { this.toggle_message(true); this.toggle_report(false); + this.show_loading_indicator(); let filters = this.get_filter_values(true); // only one refresh at a time @@ -645,6 +645,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.show_footer_message(); frappe.hide_progress(); + }).finally(() => { + this.hide_loading_indicator(); }); } @@ -869,6 +871,22 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } } + show_loading_indicator() { + this.$loading.find('div').html(`
+
+ Generic Empty State +
+

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

+
`); + this.$report.hide(); + this.$loading.show(); + } + + hide_loading_indicator() { + this.$loading.hide(); + this.$report.show(); + } + get_chart_options(data) { let options = this.report_settings.get_chart_data ? this.report_settings.get_chart_data(data.columns, data.result) @@ -1679,6 +1697,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { .hide().appendTo(this.page.main); this.$chart = $('
').hide().appendTo(this.page.main); + + this.$loading = $(this.message_div('')).hide().appendTo(this.page.main); + this.$report = $('
').appendTo(this.page.main); this.$message = $(this.message_div('')).hide().appendTo(this.page.main); } @@ -1738,11 +1759,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.refresh(); } - toggle_loading(flag) { - this.toggle_message(flag, __('Loading') + '...'); - } - - toggle_nothing_to_show(flag) { let message = this.prepared_report ? __('This is a background report. Please set the appropriate filters and then generate a new one.') From d257adc1302b720016cc3ed830ede379aee4403e Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 16 Oct 2021 16:48:33 +0530 Subject: [PATCH 04/29] fix: Rename loader functions --- .../js/frappe/views/reports/query_report.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 8a50a516af..4a3a953a01 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -555,7 +555,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { refresh() { this.toggle_message(true); this.toggle_report(false); - this.show_loading_indicator(); + this.show_loading_screen(); let filters = this.get_filter_values(true); // only one refresh at a time @@ -646,7 +646,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.show_footer_message(); frappe.hide_progress(); }).finally(() => { - this.hide_loading_indicator(); + this.hide_loading_screen(); }); } @@ -871,18 +871,20 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } } - show_loading_indicator() { - this.$loading.find('div').html(`
+ show_loading_screen() { + const loading_state = `
Generic Empty State

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

-
`); +
`; + + this.$loading.find('div').html(loading_state); this.$report.hide(); this.$loading.show(); } - hide_loading_indicator() { + hide_loading_screen() { this.$loading.hide(); this.$report.show(); } @@ -1699,7 +1701,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.$chart = $('
').hide().appendTo(this.page.main); this.$loading = $(this.message_div('')).hide().appendTo(this.page.main); - this.$report = $('
').appendTo(this.page.main); this.$message = $(this.message_div('')).hide().appendTo(this.page.main); } From 236c84ab8bbba439057149c9a20eb289f7b85b52 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 18 Oct 2021 16:35:13 +0530 Subject: [PATCH 05/29] feat: semgrep rule for db.sql --- .github/helper/semgrep_rules/frappe_correctness.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/helper/semgrep_rules/frappe_correctness.yml b/.github/helper/semgrep_rules/frappe_correctness.yml index d9603e89aa..04341b3430 100644 --- a/.github/helper/semgrep_rules/frappe_correctness.yml +++ b/.github/helper/semgrep_rules/frappe_correctness.yml @@ -131,3 +131,10 @@ rules: key `$X` is uselessly assigned twice. This could be a potential bug. languages: [python] severity: ERROR + +- id: frappe-using-db.sql + pattern-regex: \.sql.*\( + message: | + The PR contains a SQL query that may be re-written with frappe.qb (https://frappeframework.com/docs/user/en/api/query-builder) or the Database API (https://frappeframework.com/docs/user/en/api/database) + languages: [python] + severity: ERROR \ No newline at end of file From c560d67a5709320054b5b265f8f32ece5800ae6e Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Mon, 18 Oct 2021 16:47:11 +0530 Subject: [PATCH 06/29] fix: remove/update older whitelist calls --- frappe/core/doctype/navbar_settings/navbar_settings.py | 1 - frappe/core/doctype/user_permission/user_permission.py | 2 +- frappe/desk/form/load.py | 4 ++-- frappe/desk/listview.py | 2 +- frappe/desk/reportview.py | 2 +- .../integrations/doctype/dropbox_settings/dropbox_settings.py | 1 - frappe/sessions.py | 4 ++-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/navbar_settings/navbar_settings.py b/frappe/core/doctype/navbar_settings/navbar_settings.py index fd8db31d10..46eb5c3e7a 100644 --- a/frappe/core/doctype/navbar_settings/navbar_settings.py +++ b/frappe/core/doctype/navbar_settings/navbar_settings.py @@ -22,7 +22,6 @@ class NavbarSettings(Document): if not frappe.flags.in_patch and (len(before_save_items) > len(after_save_items)): frappe.throw(_("Please hide the standard navbar items instead of deleting them")) -@frappe.whitelist(allow_guest=True) def get_app_logo(): app_logo = frappe.db.get_single_value('Navbar Settings', 'app_logo', cache=True) if not app_logo: diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py index 66ffd48822..1366ace115 100644 --- a/frappe/core/doctype/user_permission/user_permission.py +++ b/frappe/core/doctype/user_permission/user_permission.py @@ -54,7 +54,7 @@ class UserPermission(Document): ref_link = frappe.get_desk_link(self.doctype, overlap_exists[0].name) frappe.throw(_("{0} has already assigned default value for {1}.").format(ref_link, self.allow)) -@frappe.whitelist(allow_guest=True) +@frappe.whitelist() def get_user_permissions(user=None): '''Get all users permissions for the user as a dict of doctype''' # if this is called from client-side, diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index d276a9707f..89e6598859 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -13,7 +13,7 @@ from frappe.desk.form.document_follow import is_document_followed from frappe import _ from urllib.parse import quote -@frappe.whitelist(allow_guest=True) +@frappe.whitelist() def getdoc(doctype, name, user=None): """ Loads a doclist for a given document. This method is called directly from the client. @@ -52,7 +52,7 @@ def getdoc(doctype, name, user=None): frappe.response.docs.append(doc) -@frappe.whitelist(allow_guest=True) +@frappe.whitelist() def getdoctype(doctype, with_parent=False, cached_timestamp=None): """load doctype""" diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index f079205cb0..e733adf868 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -2,7 +2,7 @@ # License: MIT. See LICENSE import frappe -@frappe.whitelist(allow_guest=True) +@frappe.whitelist() def get_list_settings(doctype): try: return frappe.get_cached_doc("List View Settings", doctype) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 31eb224652..6c9fa2e937 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -14,7 +14,7 @@ from frappe.utils import cstr, format_duration from frappe.model.base_document import get_controller -@frappe.whitelist(allow_guest=True) +@frappe.whitelist() @frappe.read_only() def get(): args = get_form_params() diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py index 90927e13f8..9ccd1c0210 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py @@ -336,7 +336,6 @@ def dropbox_auth_finish(return_access_token=False): _("Dropbox access is approved!") + close, indicator_color='green') -@frappe.whitelist(allow_guest=True) def set_dropbox_access_token(access_token): frappe.db.set_value("Dropbox Settings", None, 'dropbox_access_token', access_token) frappe.db.commit() diff --git a/frappe/sessions.py b/frappe/sessions.py index ce104968ad..bdf18f8d82 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -17,8 +17,8 @@ import redis from urllib.parse import unquote from frappe.cache_manager import clear_user_cache -@frappe.whitelist(allow_guest=True) -def clear(user=None): +@frappe.whitelist() +def clear(): frappe.local.session_obj.update(force=True) frappe.local.db.commit() clear_user_cache(frappe.session.user) From d99403393acfbdefefce406a0025a7811306e4d3 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Mon, 18 Oct 2021 17:52:33 +0530 Subject: [PATCH 07/29] fix: rename `auto-reload` to `live-reload` --- esbuild/esbuild.js | 4 ++-- frappe/build.py | 8 ++++++-- frappe/public/js/frappe/build_events/BuildSuccess.vue | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index b0ed92f9ec..c71fbc752c 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -44,7 +44,7 @@ let argv = yargs type: "boolean", description: "Run in watch mode and rebuild on file changes" }) - .option("auto-reload", { + .option("live-reload", { type: "boolean", description: `Automatically reload webpages when assets are rebuilt. Can only be used with the --watch flag.` @@ -481,7 +481,7 @@ async function notify_redis({ error, success }) { if (success) { payload = { success: true, - autoreload: argv["auto-reload"] + live_reload: argv["live-reload"] }; } diff --git a/frappe/build.py b/frappe/build.py index ec092d4b57..4472049ab7 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -235,8 +235,12 @@ def watch(apps=None): if apps: command += " --apps {apps}".format(apps=apps) - if frappe.conf.autoreload_on_build: - command += " --auto-reload" + live_reload = frappe.conf.live_reload + if "LIVE_RELOAD" in os.environ: + live_reload = os.environ["LIVE_RELOAD"] + + if live_reload: + command += " --live-reload" check_node_executable() frappe_app_path = frappe.get_app_path("frappe", "..") diff --git a/frappe/public/js/frappe/build_events/BuildSuccess.vue b/frappe/public/js/frappe/build_events/BuildSuccess.vue index d489c4a1a3..5ab40271bb 100644 --- a/frappe/public/js/frappe/build_events/BuildSuccess.vue +++ b/frappe/public/js/frappe/build_events/BuildSuccess.vue @@ -5,7 +5,7 @@ > Compiled successfully Refresh @@ -18,13 +18,13 @@ export default { data() { return { is_shown: false, - autoreload: false, + live_reload: false, }; }, methods: { show(data) { - if (data.autoreload) { - this.autoreload = true; + if (data.live_reload) { + this.live_reload = true; this.reload(); } From 3cec476cbc2f62d2ce4bd010657a7ec7455a7bc6 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Mon, 18 Oct 2021 19:07:13 +0530 Subject: [PATCH 08/29] fix: add whitespace --- esbuild/esbuild.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index c71fbc752c..faccb36698 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -46,7 +46,7 @@ let argv = yargs }) .option("live-reload", { type: "boolean", - description: `Automatically reload webpages when assets are rebuilt. + description: `Automatically reload web pages when assets are rebuilt. Can only be used with the --watch flag.` }) .option("production", { From 059e5441c27baf0a81b2356359eabd1e3eb354ab Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 18 Oct 2021 21:33:06 +0530 Subject: [PATCH 09/29] ci: use semgrep pattern instead of regex --- .github/helper/semgrep_rules/frappe_correctness.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/helper/semgrep_rules/frappe_correctness.yml b/.github/helper/semgrep_rules/frappe_correctness.yml index 04341b3430..662e6e8022 100644 --- a/.github/helper/semgrep_rules/frappe_correctness.yml +++ b/.github/helper/semgrep_rules/frappe_correctness.yml @@ -132,8 +132,8 @@ rules: languages: [python] severity: ERROR -- id: frappe-using-db.sql - pattern-regex: \.sql.*\( +- id: frappe-using-db-sql + pattern: frappe.db.sql(...) message: | The PR contains a SQL query that may be re-written with frappe.qb (https://frappeframework.com/docs/user/en/api/query-builder) or the Database API (https://frappeframework.com/docs/user/en/api/database) languages: [python] From ac1bb636cf86490702dc6330d4c7e01937bb5d13 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 18 Oct 2021 22:11:38 +0530 Subject: [PATCH 10/29] ci: flag new instances of sql_ddl and sql_list --- .github/helper/semgrep_rules/frappe_correctness.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/helper/semgrep_rules/frappe_correctness.yml b/.github/helper/semgrep_rules/frappe_correctness.yml index 662e6e8022..1297d7fa67 100644 --- a/.github/helper/semgrep_rules/frappe_correctness.yml +++ b/.github/helper/semgrep_rules/frappe_correctness.yml @@ -133,8 +133,11 @@ rules: severity: ERROR - id: frappe-using-db-sql - pattern: frappe.db.sql(...) + pattern-either: + - pattern: frappe.db.sql(...) + - pattern: frappe.db.sql_ddl(...) + - pattern: frappe.db.sql_list(...) message: | The PR contains a SQL query that may be re-written with frappe.qb (https://frappeframework.com/docs/user/en/api/query-builder) or the Database API (https://frappeframework.com/docs/user/en/api/database) languages: [python] - severity: ERROR \ No newline at end of file + severity: ERROR From 770bda8cc624b9dc6a97113186701e8156b85034 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 19 Oct 2021 04:04:00 +0530 Subject: [PATCH 11/29] fix: use `cint`, as `os.environ` only contains string values --- frappe/build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/build.py b/frappe/build.py index 4472049ab7..ddce94ac2f 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -235,9 +235,9 @@ def watch(apps=None): if apps: command += " --apps {apps}".format(apps=apps) - live_reload = frappe.conf.live_reload - if "LIVE_RELOAD" in os.environ: - live_reload = os.environ["LIVE_RELOAD"] + live_reload = frappe.utils.cint( + os.environ.get("LIVE_RELOAD", frappe.conf.live_reload) + ) if live_reload: command += " --live-reload" From 2e4f5e0796a202d5100c5de69ac9e11772029726 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 19 Oct 2021 01:41:02 +0200 Subject: [PATCH 12/29] fix: handle negative duration --- frappe/public/js/frappe/utils/utils.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 831538d255..065ae415f5 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1049,16 +1049,16 @@ Object.assign(frappe.utils, { return duration; }, - seconds_to_duration(value, duration_options) { - let secs = value; + seconds_to_duration(secs, duration_options) { + let round = secs > 0 ? Math.floor : Math.ceil; let total_duration = { - days: Math.floor(secs / (3600 * 24)), - hours: Math.floor(secs % (3600 * 24) / 3600), - minutes: Math.floor(secs % 3600 / 60), - seconds: Math.floor(secs % 60) + days: round(secs / (3600 * 24)), + hours: round(secs % (3600 * 24) / 3600), + minutes: round(secs % 3600 / 60), + seconds: round(secs % 60) }; if (duration_options.hide_days) { - total_duration.hours = Math.floor(secs / 3600); + total_duration.hours = round(secs / 3600); total_duration.days = 0; } return total_duration; From a575cff8a7f55fc5550bd6a519e3e6288b9200ee Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 19 Oct 2021 12:35:55 +0530 Subject: [PATCH 13/29] fix: Retry flaky test_printview_page if errored --- frappe/tests/test_website.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 818dc8bce6..688679a80f 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -4,6 +4,7 @@ import frappe from frappe.utils import set_request from frappe.website.serve import get_response, get_response_content from frappe.website.utils import (build_response, clear_website_cache, get_home_page) +from tenacity import retry, stop_after_attempt, retry_if_exception_type class TestWebsite(unittest.TestCase): @@ -196,6 +197,11 @@ class TestWebsite(unittest.TestCase): delattr(frappe.hooks, 'page_renderer') frappe.cache().delete_key('app_hooks') + # TODO: Get rid of this retry logic + # Added since test is flaky and we can't figure out why at this point + @retry( + stop=stop_after_attempt(5), retry=retry_if_exception_type(AssertionError), + ) def test_printview_page(self): content = get_response_content('/Language/en') self.assertIn('
', content) From 4a5bb2873dc900f7c4394f6cb5ecf6d5170cfb18 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 19 Oct 2021 13:25:37 +0530 Subject: [PATCH 14/29] ci: Ignore sql=>qb rule for test files --- .github/helper/semgrep_rules/frappe_correctness.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/helper/semgrep_rules/frappe_correctness.yml b/.github/helper/semgrep_rules/frappe_correctness.yml index 1297d7fa67..33a22fba6a 100644 --- a/.github/helper/semgrep_rules/frappe_correctness.yml +++ b/.github/helper/semgrep_rules/frappe_correctness.yml @@ -137,6 +137,9 @@ rules: - pattern: frappe.db.sql(...) - pattern: frappe.db.sql_ddl(...) - pattern: frappe.db.sql_list(...) + paths: + exclude: + - "test_*.py" message: | The PR contains a SQL query that may be re-written with frappe.qb (https://frappeframework.com/docs/user/en/api/query-builder) or the Database API (https://frappeframework.com/docs/user/en/api/database) languages: [python] From 7649cdff4cb21ee62b2c0cc254d7b722d6d11c3b Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 19 Oct 2021 14:00:19 +0530 Subject: [PATCH 15/29] fix: minor cleanup --- frappe/public/js/frappe/utils/utils.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 065ae415f5..b49dfa0280 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1049,18 +1049,20 @@ Object.assign(frappe.utils, { return duration; }, - seconds_to_duration(secs, duration_options) { - let round = secs > 0 ? Math.floor : Math.ceil; - let total_duration = { - days: round(secs / (3600 * 24)), - hours: round(secs % (3600 * 24) / 3600), - minutes: round(secs % 3600 / 60), - seconds: round(secs % 60) + seconds_to_duration(seconds, duration_options) { + const round = seconds > 0 ? Math.floor : Math.ceil; + const total_duration = { + days: round(seconds / 86400), // 60 * 60 * 24 + hours: round(seconds % 86400 / 3600), + minutes: round(seconds % 3600 / 60), + seconds: round(seconds % 60) }; + if (duration_options.hide_days) { - total_duration.hours = round(secs / 3600); + total_duration.hours = round(seconds / 3600); total_duration.days = 0; } + return total_duration; }, From 4f94f19940c23835bff26911d89f5d50e746d691 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 19 Oct 2021 14:46:01 +0530 Subject: [PATCH 16/29] ci: Remove Github status for UI coverage --- codecov.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/codecov.yml b/codecov.yml index eeba1ff381..90fec8fbcb 100644 --- a/codecov.yml +++ b/codecov.yml @@ -10,11 +10,6 @@ coverage: threshold: 0.5% flags: - server - ui-tests: - target: auto - threshold: 0.5% - flags: - - ui-tests comment: layout: "diff, flags" @@ -28,4 +23,4 @@ flags: ui-tests: paths: - ".*\\.js" - carryforward: true \ No newline at end of file + carryforward: true From 5c86dc80c7905896b9b308754c012afc4576f1c5 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 19 Oct 2021 15:03:17 +0530 Subject: [PATCH 17/29] fix: `if_owner` constraint being applied wrongly (#14471) * fix: `if_owner` constraint being applied wrongly * test: check if owner on `frappe.get_list` Co-authored-by: Pruthvi Patel --- frappe/model/db_query.py | 23 +++++++++++++++++++++-- frappe/permissions.py | 21 +++++++++------------ frappe/tests/test_permissions.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 14 deletions(-) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 978f3062c5..8f0e0aaefc 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -597,8 +597,8 @@ class DatabaseQuery(object): self.conditions.append(self.get_share_condition()) else: - #if has if_owner permission skip user perm check - if role_permissions.get("has_if_owner_enabled") and role_permissions.get("if_owner", {}): + # skip user perm check if owner constraint is required + if requires_owner_constraint(role_permissions): self.match_conditions.append( f"`tab{self.doctype}`.`owner` = {frappe.db.escape(self.user, percent=False)}" ) @@ -895,3 +895,22 @@ def get_date_range(operator, value): timespan = period_map[operator] + ' ' + timespan_map[value] if operator != 'timespan' else value return get_timespan_date_range(timespan) + +def requires_owner_constraint(role_permissions): + """Returns True if "select" or "read" isn't available without being creator.""" + + if not role_permissions.get("has_if_owner_enabled"): + return + + if_owner_perms = role_permissions.get("if_owner") + if not if_owner_perms: + return + + # has select or read without if owner, no need for constraint + for perm_type in ("select", "read"): + if role_permissions.get(perm_type) and perm_type not in if_owner_perms: + return + + # not checking if either select or read if present in if_owner_perms + # because either of those is required to perform a query + return True diff --git a/frappe/permissions.py b/frappe/permissions.py index 7ee1119ebb..a086c73920 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -107,13 +107,9 @@ def get_doc_permissions(doc, user=None, ptype=None): meta = frappe.get_meta(doc.doctype) def is_user_owner(): - doc_owner = doc.get('owner') or '' - doc_owner = doc_owner.lower() - session_user = frappe.session.user.lower() - return doc_owner == session_user + return (doc.get("owner") or "").lower() == frappe.session.user.lower() - - if has_controller_permissions(doc, ptype, user=user) == False : + if has_controller_permissions(doc, ptype, user=user) is False: push_perm_check_log('Not allowed via controller permission check') return {ptype: 0} @@ -182,22 +178,23 @@ def get_role_permissions(doctype_meta, user=None, is_owner=None): applicable_permissions = list(filter(is_perm_applicable, getattr(doctype_meta, 'permissions', []))) has_if_owner_enabled = any(p.get('if_owner', 0) for p in applicable_permissions) - perms['has_if_owner_enabled'] = has_if_owner_enabled for ptype in rights: pvalue = any(p.get(ptype, 0) for p in applicable_permissions) # check if any perm object allows perm type perms[ptype] = cint(pvalue) - if (pvalue - and has_if_owner_enabled - and not has_permission_without_if_owner_enabled(ptype) - and ptype != 'create'): + if ( + pvalue + and has_if_owner_enabled + and not has_permission_without_if_owner_enabled(ptype) + and ptype != 'create' + ): perms['if_owner'][ptype] = cint(pvalue and is_owner) # has no access if not owner # only provide select or read access so that user is able to at-least access list # (and the documents will be filtered based on owner sin further checks) - perms[ptype] = 1 if ptype in ['select', 'read'] else 0 + perms[ptype] = 1 if ptype in ('select', 'read') else 0 frappe.local.role_permissions[cache_key] = perms diff --git a/frappe/tests/test_permissions.py b/frappe/tests/test_permissions.py index 48510f55f6..f4276b2d59 100644 --- a/frappe/tests/test_permissions.py +++ b/frappe/tests/test_permissions.py @@ -493,6 +493,34 @@ class TestPermissions(unittest.TestCase): frappe.set_user("test2@example.com") self.assertRaises(frappe.PermissionError, getdoc, 'Blog Post', doc.name) + def test_if_owner_permission_on_get_list(self): + doc = frappe.get_doc({ + "doctype": "Blog Post", + "blog_category": "-test-blog-category", + "blogger": "_Test Blogger 1", + "title": "_Test If Owner Permissions on Get List", + "content": "_Test Blog Post Content" + }) + + doc.insert(ignore_if_duplicate=True) + + update('Blog Post', 'Blogger', 0, 'if_owner', 1) + update('Blog Post', 'Blogger', 0, 'read', 1) + user = frappe.get_doc("User", "test2@example.com") + user.add_roles("Website Manager") + frappe.clear_cache(doctype="Blog Post") + + frappe.set_user("test2@example.com") + self.assertIn(doc.name, frappe.get_list("Blog Post", pluck="name")) + + # Become system manager to remove role + frappe.set_user("test1@example.com") + user.remove_roles("Website Manager") + frappe.clear_cache(doctype="Blog Post") + + frappe.set_user("test2@example.com") + self.assertNotIn(doc.name, frappe.get_list("Blog Post", pluck="name")) + def test_if_owner_permission_on_delete(self): update('Blog Post', 'Blogger', 0, 'if_owner', 1) update('Blog Post', 'Blogger', 0, 'read', 1) From d18852f793932da510752d171060ef6e290d9535 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 19 Oct 2021 18:18:22 +0530 Subject: [PATCH 18/29] test: timeline.js ui test fix --- cypress/integration/timeline.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/timeline.js b/cypress/integration/timeline.js index 66ba0761c4..04a4b55918 100644 --- a/cypress/integration/timeline.js +++ b/cypress/integration/timeline.js @@ -49,8 +49,8 @@ context('Timeline', () => { cy.click_modal_primary_button('Yes'); //Deleting the added ToDo - cy.get('.menu-btn-group button').eq(1).click(); - cy.get('.menu-btn-group [data-label="Delete"]').click(); + cy.get('[id="page-ToDo"] .menu-btn-group button').eq(1).click(); + cy.get('[id="page-ToDo"] .menu-btn-group [data-label="Delete"]').click(); cy.findByRole('button', {name: 'Yes'}).click(); }); From c968712450f0369d8f4a30579bf4856528fb6e43 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 19 Oct 2021 18:22:09 +0530 Subject: [PATCH 19/29] fix: Return unsorted json in case of type error --- frappe/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 64e445973f..1b4429d55b 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1480,7 +1480,10 @@ def get_value(*args, **kwargs): def as_json(obj, indent=1): from frappe.utils.response import json_handler - return json.dumps(obj, indent=indent, sort_keys=True, default=json_handler, separators=(',', ': ')) + try: + return json.dumps(obj, indent=indent, sort_keys=True, default=json_handler, separators=(',', ': ')) + except TypeError: + return json.dumps(obj, indent=indent, default=json_handler, separators=(',', ': ')) def are_emails_muted(): from frappe.utils import cint From d47f23dd3a2e088b3a215b9e7998efb1143bbaee Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 19 Oct 2021 18:43:44 +0530 Subject: [PATCH 20/29] fix(Print): Select button alignment issue --- frappe/printing/page/print/print.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/page/print/print.js b/frappe/printing/page/print/print.js index 1e158c616e..7f40fd3127 100644 --- a/frappe/printing/page/print/print.js +++ b/frappe/printing/page/print/print.js @@ -134,7 +134,7 @@ frappe.ui.form.PrintView = class { add_sidebar_item(df, is_dynamic) { if (df.fieldtype == 'Select') { - df.input_class = 'btn btn-default btn-sm'; + df.input_class = 'btn btn-default btn-sm text-left'; } let field = frappe.ui.form.make_control({ From 7f86137b74ce94bfb9dc24466e5b25bb94923984 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 19 Oct 2021 18:44:01 +0530 Subject: [PATCH 21/29] fix: List header alignment --- frappe/public/scss/desk/list.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss index 4456acabb3..a49b5a463e 100644 --- a/frappe/public/scss/desk/list.scss +++ b/frappe/public/scss/desk/list.scss @@ -147,7 +147,6 @@ .list-row-head { @extend .list-row; - padding: 15px; cursor: default; .list-subject { @@ -214,6 +213,10 @@ input.list-check-all, input.list-row-checkbox { --checkbox-right-margin: calc(var(--checkbox-size) / 2 + #{$level-margin-right}); } +input.list-check-all { + margin-left: 15px; +} + .render-list-checkbox { margin-left: 15px; } From 50e9930ca5d630ec9366b2ec87c5a785230783b5 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 19 Oct 2021 18:53:43 +0530 Subject: [PATCH 22/29] ci: Disable patch status Can be enabled later --- codecov.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/codecov.yml b/codecov.yml index 90fec8fbcb..a9f6df0296 100644 --- a/codecov.yml +++ b/codecov.yml @@ -3,6 +3,7 @@ codecov: coverage: status: + patch: off project: default: false server: From 06c8cbceb997a0e8c12bb5750df550e0318e8c01 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 19 Oct 2021 19:46:33 +0530 Subject: [PATCH 23/29] test: Commenting relative_time_filters.js --- cypress/integration/relative_time_filters.js | 91 ++++++++++---------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/cypress/integration/relative_time_filters.js b/cypress/integration/relative_time_filters.js index cbb0524c24..362d3a219b 100644 --- a/cypress/integration/relative_time_filters.js +++ b/cypress/integration/relative_time_filters.js @@ -1,44 +1,47 @@ -context('Relative Timeframe', () => { - before(() => { - cy.login(); - cy.visit('/app/website'); - cy.window().its('frappe').then(frappe => { - frappe.call("frappe.tests.ui_test_helpers.create_todo_records"); - }); - }); - it('sets relative timespan filter for last week and filters list', () => { - cy.visit('/app/List/ToDo/List'); - cy.clear_filters(); - cy.get('.list-row:contains("this is fourth todo")').should('exist'); - cy.add_filter(); - cy.get('.fieldname-select-area').should('exist'); - cy.get('.fieldname-select-area input').type("Due Date{enter}", { delay: 100 }); - cy.get('select.condition.form-control').select("Timespan"); - cy.get('.filter-field select.input-with-feedback.form-control').select("last week"); - cy.intercept('POST', '/api/method/frappe.desk.reportview.get').as('list_refresh'); - cy.get('.filter-popover .apply-filters').click({ force: true }); - cy.wait('@list_refresh'); - cy.get('.list-row-container').its('length').should('eq', 1); - cy.get('.list-row-container').should('contain', 'this is second todo'); - cy.intercept('POST', '/api/method/frappe.model.utils.user_settings.save') - .as('save_user_settings'); - cy.clear_filters(); - cy.wait('@save_user_settings'); - }); - it('sets relative timespan filter for next week and filters list', () => { - cy.visit('/app/List/ToDo/List'); - cy.clear_filters(); - cy.get('.list-row:contains("this is fourth todo")').should('exist'); - cy.add_filter(); - cy.get('.fieldname-select-area input').type("Due Date{enter}", { delay: 100 }); - cy.get('select.condition.form-control').select("Timespan"); - cy.get('.filter-field select.input-with-feedback.form-control').select("next week"); - cy.intercept('POST', '/api/method/frappe.desk.reportview.get').as('list_refresh'); - cy.get('.filter-popover .apply-filters').click({ force: true }); - cy.wait('@list_refresh'); - cy.intercept('POST', '/api/method/frappe.model.utils.user_settings.save') - .as('save_user_settings'); - cy.clear_filters(); - cy.wait('@save_user_settings'); - }); -}); +// TODO: Enable this again +// currently this is flaky possibly because of different timezone in CI + +// context('Relative Timeframe', () => { +// before(() => { +// cy.login(); +// cy.visit('/app/website'); +// cy.window().its('frappe').then(frappe => { +// frappe.call("frappe.tests.ui_test_helpers.create_todo_records"); +// }); +// }); +// it('sets relative timespan filter for last week and filters list', () => { +// cy.visit('/app/List/ToDo/List'); +// cy.clear_filters(); +// cy.get('.list-row:contains("this is fourth todo")').should('exist'); +// cy.add_filter(); +// cy.get('.fieldname-select-area').should('exist'); +// cy.get('.fieldname-select-area input').type("Due Date{enter}", { delay: 100 }); +// cy.get('select.condition.form-control').select("Timespan"); +// cy.get('.filter-field select.input-with-feedback.form-control').select("last week"); +// cy.intercept('POST', '/api/method/frappe.desk.reportview.get').as('list_refresh'); +// cy.get('.filter-popover .apply-filters').click({ force: true }); +// cy.wait('@list_refresh'); +// cy.get('.list-row-container').its('length').should('eq', 1); +// cy.get('.list-row-container').should('contain', 'this is second todo'); +// cy.intercept('POST', '/api/method/frappe.model.utils.user_settings.save') +// .as('save_user_settings'); +// cy.clear_filters(); +// cy.wait('@save_user_settings'); +// }); +// it('sets relative timespan filter for next week and filters list', () => { +// cy.visit('/app/List/ToDo/List'); +// cy.clear_filters(); +// cy.get('.list-row:contains("this is fourth todo")').should('exist'); +// cy.add_filter(); +// cy.get('.fieldname-select-area input').type("Due Date{enter}", { delay: 100 }); +// cy.get('select.condition.form-control').select("Timespan"); +// cy.get('.filter-field select.input-with-feedback.form-control').select("next week"); +// cy.intercept('POST', '/api/method/frappe.desk.reportview.get').as('list_refresh'); +// cy.get('.filter-popover .apply-filters').click({ force: true }); +// cy.wait('@list_refresh'); +// cy.intercept('POST', '/api/method/frappe.model.utils.user_settings.save') +// .as('save_user_settings'); +// cy.clear_filters(); +// cy.wait('@save_user_settings'); +// }); +// }); From 3b4530ef5d93fa41be611569611281e16ada0476 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 20 Oct 2021 10:38:30 +0530 Subject: [PATCH 24/29] fix: prevent report error for AttachmentLimitReached exceptions --- frappe/exceptions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/exceptions.py b/frappe/exceptions.py index 31a94ac883..4b59f8f38f 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -99,8 +99,8 @@ class IncompatibleApp(ValidationError): pass class InvalidDates(ValidationError): pass class DataTooLongException(ValidationError): pass class FileAlreadyAttachedException(Exception): pass -class DocumentAlreadyRestored(Exception): pass -class AttachmentLimitReached(Exception): pass +class DocumentAlreadyRestored(ValidationError): pass +class AttachmentLimitReached(ValidationError): pass # OAuth exceptions class InvalidAuthorizationHeader(CSRFTokenError): pass class InvalidAuthorizationPrefix(CSRFTokenError): pass From a6c752458bee62570dff3d1f94ca2309b8e1442d Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 20 Oct 2021 11:13:06 +0530 Subject: [PATCH 25/29] refactor!: remove faker from requirements.txt --- dev-requirements.txt | 1 + frappe/__init__.py | 4 +--- requirements.txt | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 dev-requirements.txt diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 0000000000..ce9c5fbf5b --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1 @@ +Faker~=8.1.0 diff --git a/frappe/__init__.py b/frappe/__init__.py index 1b4429d55b..c8245b0bf0 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -30,9 +30,6 @@ from .utils.lazy_loader import lazy_import from frappe.query_builder import get_query_builder, patch_query_execute -# Lazy imports -faker = lazy_import('faker') - __version__ = '14.0.0-dev' __title__ = "Frappe Framework" @@ -1838,6 +1835,7 @@ def parse_json(val): return parse_json(val) def mock(type, size=1, locale='en'): + import faker results = [] fake = faker.Faker(locale) if type not in dir(fake): diff --git a/requirements.txt b/requirements.txt index 7a17d3794d..37b48bc943 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,6 @@ croniter~=1.0.11 cryptography~=3.4.7 dropbox~=11.7.0 email-reply-parser~=0.5.12 -Faker~=8.1.0 git-url-parse~=1.2.2 gitdb~=4.0.7 GitPython~=3.1.14 From 49b157e7e5f3945e5b4f5823cfce3e42c9a7fb93 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 20 Oct 2021 11:14:48 +0530 Subject: [PATCH 26/29] refactor!: remove ngrok from requirements.txt --- dev-requirements.txt | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index ce9c5fbf5b..fb4b9e3bb1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1 +1,2 @@ Faker~=8.1.0 +pyngrok~=5.0.5 diff --git a/requirements.txt b/requirements.txt index 37b48bc943..6ed174b0ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,7 +43,6 @@ pyasn1~=0.4.8 pycryptodome~=3.10.1 PyJWT~=2.0.1 PyMySQL~=1.0.2 -pyngrok~=5.0.5 pyOpenSSL~=20.0.1 pyotp~=2.6.0 PyPDF2~=1.26.0 From a0262fd779a6bb5f862c715faa54d27e200a2f60 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 20 Oct 2021 11:18:04 +0530 Subject: [PATCH 27/29] refactor!: remove unittest-xml-reporting dependency --- dev-requirements.txt | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index fb4b9e3bb1..df3ae9484a 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,2 +1,3 @@ Faker~=8.1.0 pyngrok~=5.0.5 +unittest-xml-reporting~=3.0.4 diff --git a/requirements.txt b/requirements.txt index 6ed174b0ac..ae7ecaa59d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -67,7 +67,6 @@ six~=1.15.0 sqlparse~=0.4.1 stripe~=2.56.0 terminaltables~=3.1.0 -unittest-xml-reporting~=3.0.4 urllib3~=1.26.4 Werkzeug~=0.16.1 Whoosh~=2.7.4 From 121533cf13ee27030234832d6dfafbe7e14a0f3e Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 20 Oct 2021 11:32:19 +0530 Subject: [PATCH 28/29] refactor: remove chalk dependency --- frappe/build.py | 7 +++---- requirements.txt | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/frappe/build.py b/frappe/build.py index 8b32b03d60..6b93b8b93a 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -16,7 +16,6 @@ from frappe.utils.minify import JavascriptMinify import click import psutil from urllib.parse import urlparse -from simple_chalk import green from semantic_version import Version from requests import head from requests.exceptions import HTTPError @@ -108,7 +107,7 @@ def fetch_assets(url, frappe_head): if not assets_archive: raise AssetsNotDownloadedError(f"Assets could not be retrived from {url}") - print(f"\n{green('✔')} Downloaded Frappe assets from {url}") + click.echo(click.style("✔", fg="green") + f" Downloaded Frappe assets from {url}") return assets_archive @@ -131,7 +130,7 @@ def setup_assets(assets_archive): directories_created.add(asset_directory) tar.makefile(file, dest) - print("{0} Restored {1}".format(green('✔'), show)) + click.echo(click.style("✔", fg="green") + f" Restored {show}") return directories_created @@ -379,7 +378,7 @@ def make_asset_dirs(hard_link=False): except Exception: print(fail_message, end="\r") - print(unstrip(f"{green('✔')} Application Assets Linked") + "\n") + click.echo(unstrip(click.style("✔", fg="green") + " Application Assets Linked") + "\n") def link_assets_dir(source, target, hard_link=False): diff --git a/requirements.txt b/requirements.txt index ae7ecaa59d..17f77efa5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -62,7 +62,6 @@ rq~=1.8.0 rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability schedule~=1.1.0 semantic-version~=2.8.5 -simple-chalk~=0.1.0 six~=1.15.0 sqlparse~=0.4.1 stripe~=2.56.0 From 61a59240dd38b3475f1ea2a56ca0c1528b7a3a07 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 20 Oct 2021 12:27:57 +0530 Subject: [PATCH 29/29] ci: install dev dependencies for server tests --- .github/helper/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 6c81d6298a..454cc89694 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -50,6 +50,7 @@ if [ "$TYPE" == "server" ]; then sed -i 's/^socketio:/# socketio:/g' Procfile; f if [ "$TYPE" == "server" ]; then sed -i 's/^redis_socketio:/# redis_socketio:/g' Procfile; fi if [ "$TYPE" == "ui" ]; then bench setup requirements --node; fi +if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi # install node-sass which is required for website theme test cd ./apps/frappe || exit