From d6b126ac6fb4e0991e7d8f96ea37e053c34e46f6 Mon Sep 17 00:00:00 2001 From: Robert Duncan <74115869+robproject@users.noreply.github.com> Date: Tue, 6 Feb 2024 01:48:06 -0800 Subject: [PATCH 01/14] fix: console import progress off-by-one (#24777) * fix: importer console progress off-by-one * fix: improve progress message * chore: typo --------- Co-authored-by: Robert Duncan Co-authored-by: Ankush Menat --- frappe/core/doctype/data_import/importer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py index c83d60ea8b..a4d25074a1 100644 --- a/frappe/core/doctype/data_import/importer.py +++ b/frappe/core/doctype/data_import/importer.py @@ -149,8 +149,8 @@ class Importer: if self.console: update_progress_bar( - f"Importing {total_payload_count} records", - current_index, + f"Importing {self.doctype}: {total_payload_count} records", + current_index - 1, total_payload_count, ) elif total_payload_count > 5: From 33d0db364bbc4e95173a19230c3359cff4917664 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 6 Feb 2024 15:36:48 +0530 Subject: [PATCH 02/14] feat: allow configuring coverage from envvar (#24788) --- frappe/commands/utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 6151a844e0..0bf5a0fd23 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -791,7 +791,12 @@ def run_tests( @click.option("--app", help="For App", default="frappe") @click.option("--build-number", help="Build number", default=1) @click.option("--total-builds", help="Total number of builds", default=1) -@click.option("--with-coverage", is_flag=True, help="Build coverage file") +@click.option( + "--with-coverage", + is_flag=True, + help="Build coverage file", + envvar="CAPTURE_COVERAGE", +) @click.option("--use-orchestrator", is_flag=True, help="Use orchestrator to run parallel tests") @click.option("--dry-run", is_flag=True, default=False, help="Dont actually run tests") @pass_context From 68003a23d53a90c3a47cdb56ace072c97d6ada49 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 6 Feb 2024 15:38:59 +0530 Subject: [PATCH 03/14] feat: show doctype description on workspace link hover (#24598) --- frappe/desk/desktop.py | 3 ++ .../public/js/frappe/widgets/links_widget.js | 50 +++++++++++++------ 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 26f69be4d2..c31be72461 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -193,6 +193,9 @@ class Workspace: item["count"] = count + if item.get("link_type") == "DocType": + item["description"] = frappe.get_meta(item.link_to).description + # Translate label item["label"] = _(item.label) if item.label else _(item.name) diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js index 2af4564ffa..b83cf04954 100644 --- a/frappe/public/js/frappe/widgets/links_widget.js +++ b/frappe/public/js/frappe/widgets/links_widget.js @@ -60,9 +60,7 @@ export default class LinksWidget extends Widget { const get_link_for_item = (item) => { if (is_link_disabled(item)) { - return `${ - item.label ? item.label : item.name - } + return `${item.link_title}