From 9a25674c49e6d68fde63bf706eabdbe555bb318b Mon Sep 17 00:00:00 2001 From: "[Kesavan-001]" <[kesavanp0395@gmail.com]> Date: Wed, 11 Feb 2026 12:19:52 +0530 Subject: [PATCH 001/108] fix: Add Item Below not working in Sidebar Editor --- frappe/public/js/frappe/ui/sidebar/sidebar_item.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar_item.js b/frappe/public/js/frappe/ui/sidebar/sidebar_item.js index 760b81e193..efc3a8686c 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar_item.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar_item.js @@ -128,7 +128,8 @@ frappe.ui.sidebar_item.TypeLink = class SidebarItem { label: "Add Item Below", icon: "add", onClick: () => { - frappe.app.sidebar.editor.perform_action("add_below", me.item); + console.log("Moving"); + frappe.app.sidebar.editor.perform_action("add_item_below", me.item); }, }, { From 361ffab36a40622f0d0e993a707d914c51c3180f Mon Sep 17 00:00:00 2001 From: "[Kesavan-001]" <[kesavanp0395@gmail.com]> Date: Wed, 11 Feb 2026 12:24:20 +0530 Subject: [PATCH 002/108] fix: Add Item Below not working in Sidebar Editor --- frappe/public/js/frappe/ui/sidebar/sidebar_item.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar_item.js b/frappe/public/js/frappe/ui/sidebar/sidebar_item.js index efc3a8686c..23bc095e35 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar_item.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar_item.js @@ -128,7 +128,6 @@ frappe.ui.sidebar_item.TypeLink = class SidebarItem { label: "Add Item Below", icon: "add", onClick: () => { - console.log("Moving"); frappe.app.sidebar.editor.perform_action("add_item_below", me.item); }, }, @@ -143,7 +142,6 @@ frappe.ui.sidebar_item.TypeLink = class SidebarItem { label: "Delete", icon: "trash-2", onClick: () => { - console.log(me.item); frappe.app.sidebar.editor.perform_action("delete", me.item); }, }, From 319786cd97c812d0c18ffd75530cc820b42a9835 Mon Sep 17 00:00:00 2001 From: "[Kesavan-001]" <[kesavanp0395@gmail.com]> Date: Wed, 11 Feb 2026 12:45:45 +0530 Subject: [PATCH 003/108] fix: Add Item Below not working in Sidebar Editor --- frappe/public/js/frappe/ui/sidebar/sidebar_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js b/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js index f952727da7..b806c19e10 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js @@ -566,7 +566,7 @@ export class SidebarEditor { this.delete_item(item_data); break; case "add_item_below": - this.edit_item(item_data); + this.add_below(item_data); break; case "duplicate": this.duplicate_item(item_data); From 7958ffdda92ef051be2cb01a13cd59f93b2faf62 Mon Sep 17 00:00:00 2001 From: "[Kesavan-001]" <[kesavanp0395@gmail.com]> Date: Wed, 11 Feb 2026 14:33:42 +0530 Subject: [PATCH 004/108] fix: Add Item Below not working in Sidebar Editor --- frappe/public/js/frappe/ui/sidebar/sidebar_editor.js | 2 +- frappe/public/js/frappe/ui/sidebar/sidebar_item.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js b/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js index b806c19e10..8b849382e8 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar_editor.js @@ -565,7 +565,7 @@ export class SidebarEditor { case "delete": this.delete_item(item_data); break; - case "add_item_below": + case "add_below": this.add_below(item_data); break; case "duplicate": diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar_item.js b/frappe/public/js/frappe/ui/sidebar/sidebar_item.js index 23bc095e35..760b81e193 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar_item.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar_item.js @@ -128,7 +128,7 @@ frappe.ui.sidebar_item.TypeLink = class SidebarItem { label: "Add Item Below", icon: "add", onClick: () => { - frappe.app.sidebar.editor.perform_action("add_item_below", me.item); + frappe.app.sidebar.editor.perform_action("add_below", me.item); }, }, { @@ -142,6 +142,7 @@ frappe.ui.sidebar_item.TypeLink = class SidebarItem { label: "Delete", icon: "trash-2", onClick: () => { + console.log(me.item); frappe.app.sidebar.editor.perform_action("delete", me.item); }, }, From 697978c8f3aa2ad192a518dc4e9d394eaf4dcb27 Mon Sep 17 00:00:00 2001 From: "stravo1@mac" Date: Fri, 13 Feb 2026 21:37:57 +0530 Subject: [PATCH 005/108] fix(website_404): cache website 404 results wrt to users fixes #37007 --- frappe/website/page_renderers/not_found_page.py | 2 +- frappe/website/path_resolver.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_renderers/not_found_page.py b/frappe/website/page_renderers/not_found_page.py index 704dca77d1..1898d7dece 100644 --- a/frappe/website/page_renderers/not_found_page.py +++ b/frappe/website/page_renderers/not_found_page.py @@ -21,7 +21,7 @@ class NotFoundPage(TemplatePage): def render(self): if self.can_cache_404(): - frappe.cache.hset("website_404", self.request_url, True) + frappe.cache.hset("website_404", f"{frappe.session.user}|{self.request_url}", True) return super().render() def can_cache_404(self): diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 0a2e302118..929438e055 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -35,7 +35,7 @@ class PathResolver: return "desk", TemplatePage("desk", self.http_status_code) # check if the request url is in 404 list - if request.url and can_cache() and frappe.cache.hget("website_404", request.url): + if request.url and can_cache() and frappe.cache.hget("website_404", f"{frappe.session.user}|{request.url}"): return self.path, NotFoundPage(self.path) try: From a534936726adaaaa5d6b44dfacd036659b2c67df Mon Sep 17 00:00:00 2001 From: "stravo1@mac" Date: Mon, 16 Feb 2026 22:15:01 +0530 Subject: [PATCH 006/108] Revert "fix(website_404): cache website 404 results wrt to users" This reverts commit 697978c8f3aa2ad192a518dc4e9d394eaf4dcb27. --- frappe/website/page_renderers/not_found_page.py | 2 +- frappe/website/path_resolver.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_renderers/not_found_page.py b/frappe/website/page_renderers/not_found_page.py index 1898d7dece..704dca77d1 100644 --- a/frappe/website/page_renderers/not_found_page.py +++ b/frappe/website/page_renderers/not_found_page.py @@ -21,7 +21,7 @@ class NotFoundPage(TemplatePage): def render(self): if self.can_cache_404(): - frappe.cache.hset("website_404", f"{frappe.session.user}|{self.request_url}", True) + frappe.cache.hset("website_404", self.request_url, True) return super().render() def can_cache_404(self): diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 929438e055..0a2e302118 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -35,7 +35,7 @@ class PathResolver: return "desk", TemplatePage("desk", self.http_status_code) # check if the request url is in 404 list - if request.url and can_cache() and frappe.cache.hget("website_404", f"{frappe.session.user}|{request.url}"): + if request.url and can_cache() and frappe.cache.hget("website_404", request.url): return self.path, NotFoundPage(self.path) try: From 9dcaab96eef44c54aa3e7d53ae9afc30f21357cb Mon Sep 17 00:00:00 2001 From: "stravo1@mac" Date: Mon, 16 Feb 2026 23:41:32 +0530 Subject: [PATCH 007/108] fix(website_404): skip caching 404 for pages with permission checks --- .../website/page_renderers/not_found_page.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/frappe/website/page_renderers/not_found_page.py b/frappe/website/page_renderers/not_found_page.py index 704dca77d1..9b980f5d51 100644 --- a/frappe/website/page_renderers/not_found_page.py +++ b/frappe/website/page_renderers/not_found_page.py @@ -2,6 +2,7 @@ import os from urllib.parse import urlparse import frappe +from frappe.website.page_renderers.document_page import _find_matching_document_webview from frappe.website.page_renderers.template_page import TemplatePage from frappe.website.utils import can_cache @@ -26,10 +27,26 @@ class NotFoundPage(TemplatePage): def can_cache_404(self): # do not cache 404 for custom homepages - return can_cache() and self.request_url and not self.is_custom_home_page() + # also skip caching docs with website permission checks (access is dynamic) + return ( + can_cache() + and self.request_url + and not self.is_custom_home_page() + and not self.has_website_permission_check() + ) def is_custom_home_page(self): url_parts = urlparse(self.request_url) request_url = os.path.splitext(url_parts.path)[0] request_path = os.path.splitext(self.request_path)[0] return request_url in HOMEPAGE_PATHS and request_path not in HOMEPAGE_PATHS + + def has_website_permission_check(self): + request_path = os.path.splitext(self.request_path)[0] + if not (document := _find_matching_document_webview(request_path)): + return False + doctype, docname = document + doc = frappe.get_cached_doc(doctype, docname) + return hasattr(doc, "has_website_permission") or bool( + frappe.get_hooks("has_website_permission", {}).get(doctype) + ) From b781fa4ee34bfe66651bdcd35ef1dcbac6d9fd8c Mon Sep 17 00:00:00 2001 From: Sumit Jain Date: Wed, 18 Feb 2026 14:04:58 +0530 Subject: [PATCH 008/108] fix: Copy `attached_to_field` and `folder` when amending documents --- frappe/core/doctype/file/test_file.py | 71 +++++++++++++++++++++++++++ frappe/desk/form/load.py | 2 +- frappe/model/document.py | 3 +- 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index 128d74dae8..fb14b30075 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -641,6 +641,77 @@ class TestAttachment(IntegrationTestCase): self.assertTrue(exists) +class TestCopyAttachmentsFromAmendedFrom(IntegrationTestCase): + """Test that attached_to_field and folder are copied when amending a document.""" + + @classmethod + def setUpClass(cls): + super().setUpClass() + from frappe.core.doctype.doctype.test_doctype import new_doctype + + cls.test_doctype = "Test Amendable Attachment" + new_doctype( + cls.test_doctype, + is_submittable=1, + fields=[ + {"label": "Title", "fieldname": "title", "fieldtype": "Data"}, + {"label": "Attachment", "fieldname": "attachment", "fieldtype": "Attach"}, + ], + ).insert(ignore_if_duplicate=True) + + @classmethod + def tearDownClass(cls): + frappe.db.rollback() + frappe.delete_doc_if_exists("DocType", cls.test_doctype) + + def test_attached_to_field_and_folder_copied_on_amend(self): + # Create custom folder + custom_folder = frappe.get_doc( + {"doctype": "File", "file_name": "Test Amend Folder", "is_folder": 1, "folder": "Home"} + ).insert() + + # Create original document and attach file with attached_to_field and custom folder + doc = frappe.get_doc(doctype=self.test_doctype, title="Original").insert() + file = frappe.get_doc( + { + "doctype": "File", + "file_name": "amend_test_attach.txt", + "content": "Test Content", + "attached_to_doctype": self.test_doctype, + "attached_to_name": doc.name, + "attached_to_field": "attachment", + "folder": custom_folder.name, + } + ).insert() + + doc.attachment = file.file_url + doc.save() + + # Submit and cancel + doc.submit() + doc.cancel() + + # Amend document + amended_doc = frappe.copy_doc(doc) + amended_doc.docstatus = 0 + amended_doc.amended_from = doc.name + amended_doc.save() + + # Verify copied file has attached_to_field and folder from original + copied_files = frappe.get_all( + "File", + filters={ + "attached_to_doctype": self.test_doctype, + "attached_to_name": amended_doc.name, + "file_name": "amend_test_attach.txt", + }, + fields=["name", "attached_to_field", "folder"], + ) + self.assertEqual(len(copied_files), 1, "Exactly one file should be copied to amended doc") + self.assertEqual(copied_files[0].attached_to_field, "attachment") + self.assertEqual(copied_files[0].folder, custom_folder.name) + + class TestAttachmentsAccess(IntegrationTestCase): def setUp(self) -> None: frappe.db.delete("File", {"is_folder": 0}) diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index 87f1954093..1e4af10aea 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -182,7 +182,7 @@ def get_milestones(doctype, name): def get_attachments(dt, dn): return frappe.get_all( "File", - fields=["name", "file_name", "file_url", "is_private"], + fields=["name", "file_name", "file_url", "is_private", "attached_to_field", "folder"], filters={"attached_to_name": str(dn), "attached_to_doctype": dt}, ) diff --git a/frappe/model/document.py b/frappe/model/document.py index 54e7795b62..30f65d9d0e 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -598,7 +598,8 @@ class Document(BaseDocument): "file_name": attach_item.file_name, "attached_to_name": self.name, "attached_to_doctype": self.doctype, - "folder": "Home/Attachments", + "attached_to_field": attach_item.attached_to_field, + "folder": attach_item.folder or "Home/Attachments", "is_private": attach_item.is_private, } ) From 3de1ed26a45434c7c87a9249b528a4c2d2a1fd77 Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Wed, 18 Feb 2026 14:54:52 +0530 Subject: [PATCH 009/108] fix: use autocomplete for showing child table links in web form --- frappe/website/doctype/web_form/web_form.py | 37 ++++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index bd12631577..1939271fef 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -416,7 +416,7 @@ def get_context(context): def load_list_data(self, context): if not self.list_columns: - self.list_columns = get_in_list_view_fields(self.doc_type) + self.list_columns = get_in_list_view_fields(self.doc_type, self.name) context.web_form_doc.list_columns = self.list_columns def load_form_data(self, context): @@ -453,7 +453,7 @@ def get_context(context): # For Table fields, server-side processing for meta for field in context.web_form_doc.web_form_fields: if field.fieldtype == "Table": - field.fields = get_in_list_view_fields(field.options) + field.fields = get_in_list_view_fields(field.options, self.name) if field.fieldtype == "Link": field.fieldtype = "Autocomplete" @@ -794,7 +794,7 @@ def get_form_data(doctype: str, docname: str | None = None, web_form_name: str | # For Table fields, server-side processing for meta for field in out.web_form.web_form_fields: if field.fieldtype == "Table": - field.fields = get_in_list_view_fields(field.options) + field.fields = get_in_list_view_fields(field.options, web_form_name) out.update({field.fieldname: field.fields}) if field.fieldtype == "Link": @@ -807,7 +807,7 @@ def get_form_data(doctype: str, docname: str | None = None, web_form_name: str | @frappe.whitelist() -def get_in_list_view_fields(doctype): +def get_in_list_view_fields(doctype, web_form_name=None): meta = frappe.get_meta(doctype) fields = [] @@ -824,21 +824,40 @@ def get_in_list_view_fields(doctype): def get_field_df(fieldname): if fieldname == "name": return {"label": "Name", "fieldname": "name", "fieldtype": "Data"} - return meta.get_field(fieldname).as_dict() + df = meta.get_field(fieldname).as_dict() + if df.get("options") and df.get("fieldtype") == "Link": + df["fieldtype"] = "Autocomplete" + df["options"] = get_link_options( + web_form_name, + doctype=df.options, + allow_read_on_all_link_options=df.get("allow_read_on_all_link_options", False), + ) + return df return [get_field_df(f) for f in fields] +def has_link_option(fields, doctype): + for f in fields: + if f.options == doctype: + return True + if hasattr(f, "fields") and isinstance(f.fields, list): + if has_link_option(f.fields, doctype): + return True + return False + + def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=False): web_form: WebForm = frappe.get_lazy_doc("Web Form", web_form_name) if web_form.login_required and frappe.session.user == "Guest": frappe.throw(_("You must be logged in to use this form."), frappe.PermissionError) - if not web_form.published or not any(f for f in web_form.web_form_fields if f.options == doctype): - frappe.throw( - _("You don't have permission to access the {0} DocType.").format(doctype), frappe.PermissionError - ) + if not web_form.published or not has_link_option(web_form.web_form_fields, doctype): + frappe.throw( + _("You don't have permission to access the {0} DocType.").format(doctype), + frappe.PermissionError, + ) link_options, filters = [], {} if web_form.login_required and not allow_read_on_all_link_options: From 3d4a14f7b12daab40b41532da9147306f1a146ed Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Wed, 18 Feb 2026 20:03:38 +0530 Subject: [PATCH 010/108] refactor: cleanup process link field --- frappe/website/doctype/web_form/web_form.py | 36 ++++++++++----------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 1939271fef..cf480a6d16 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -456,10 +456,7 @@ def get_context(context): field.fields = get_in_list_view_fields(field.options, self.name) if field.fieldtype == "Link": - field.fieldtype = "Autocomplete" - field.options = get_link_options( - self.name, field.options, field.allow_read_on_all_link_options - ) + process_link_field(field, self.name) context.reference_doc = {} @@ -608,6 +605,14 @@ def get_context(context): return permitted_attachments +def process_link_field(field, web_form_name): + field.fieldtype = "Autocomplete" + field.options = get_link_options( + web_form_name, field.options, getattr(field, "allow_read_on_all_link_options", False) + ) + return field + + def get_web_form_module(doc): if doc.is_standard: return get_doc_module(doc.module, doc.doctype, doc.name) @@ -798,10 +803,7 @@ def get_form_data(doctype: str, docname: str | None = None, web_form_name: str | out.update({field.fieldname: field.fields}) if field.fieldtype == "Link": - field.fieldtype = "Autocomplete" - field.options = get_link_options( - web_form_name, field.options, field.allow_read_on_all_link_options - ) + process_link_field(field, web_form_name) return out @@ -824,14 +826,10 @@ def get_in_list_view_fields(doctype, web_form_name=None): def get_field_df(fieldname): if fieldname == "name": return {"label": "Name", "fieldname": "name", "fieldtype": "Data"} + df = meta.get_field(fieldname).as_dict() if df.get("options") and df.get("fieldtype") == "Link": - df["fieldtype"] = "Autocomplete" - df["options"] = get_link_options( - web_form_name, - doctype=df.options, - allow_read_on_all_link_options=df.get("allow_read_on_all_link_options", False), - ) + process_link_field(df, web_form_name) return df return [get_field_df(f) for f in fields] @@ -853,11 +851,11 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals if web_form.login_required and frappe.session.user == "Guest": frappe.throw(_("You must be logged in to use this form."), frappe.PermissionError) - if not web_form.published or not has_link_option(web_form.web_form_fields, doctype): - frappe.throw( - _("You don't have permission to access the {0} DocType.").format(doctype), - frappe.PermissionError, - ) + if not web_form.published or not has_link_option(web_form.web_form_fields, doctype): + frappe.throw( + _("You don't have permission to access the {0} DocType.").format(doctype), + frappe.PermissionError, + ) link_options, filters = [], {} if web_form.login_required and not allow_read_on_all_link_options: From c97cc1a47164b5bac238b0c25c4bc1b60da76dce Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Thu, 19 Feb 2026 13:03:21 +0530 Subject: [PATCH 011/108] chore: remove unused whitelist decorator --- frappe/website/doctype/web_form/web_form.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index cf480a6d16..629fa58053 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -808,7 +808,6 @@ def get_form_data(doctype: str, docname: str | None = None, web_form_name: str | return out -@frappe.whitelist() def get_in_list_view_fields(doctype, web_form_name=None): meta = frappe.get_meta(doctype) fields = [] From 14159b72f3c03ae3470db5938f4d41b372732d16 Mon Sep 17 00:00:00 2001 From: KerollesFathy Date: Sat, 21 Feb 2026 19:16:19 +0000 Subject: [PATCH 012/108] fix: avoid append None to pages list --- frappe/desk/desktop.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index a2152f63d5..b852102613 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -490,7 +490,9 @@ def get_workspace_sidebar_items(): pages.extend(private_pages) if len(pages) == 0: - pages.append(next((x for x in all_pages if x["title"] == "Welcome Workspace"), None)) + welcome_workspace = next((x for x in all_pages if x["title"] == "Welcome Workspace"), None) + if welcome_workspace: + pages.append(welcome_workspace) return { "pages": pages, From b98396f4f407e1a2e5d66b6c8b230f3ec7de1903 Mon Sep 17 00:00:00 2001 From: Shrihari Mahabal Date: Mon, 23 Feb 2026 11:54:09 +0530 Subject: [PATCH 013/108] fix: fix: add doc button for long doctype name --- frappe/public/js/frappe/list/list_view.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index d9c6514556..6473db896e 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -291,8 +291,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { set_primary_action() { if (this.can_create && !frappe.boot.read_only) { const doctype_name = __(frappe.router.doctype_layout) || __(this.doctype); + const full_label = __("Add {0}", [doctype_name], "Primary action in list view"); const create_button = this.page.set_primary_action( - __("Add {0}", [doctype_name], "Primary action in list view"), + full_label, () => { if (this.settings.primary_action) { this.settings.primary_action(); @@ -304,12 +305,32 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { ); if (frappe.is_mobile()) { create_button.append(__("Add")); + } else { + this._trim_primary_action_if_overflow(create_button, full_label); } } else { this.page.clear_primary_action(); } } + _trim_primary_action_if_overflow(btn, full_label) { + const container = this.page.wrapper.find(".page-head-content")[0]; + if (!container || !btn[0]) return; + const containerRect = container.getBoundingClientRect(); + const btnRect = btn[0].getBoundingClientRect(); + if (btnRect.right > containerRect.right) { + const short_label = __("Add"); + btn.attr("title", full_label) + .tooltip({ delay: { show: 600, hide: 100 }, trigger: "hover" }) + .html( + `${frappe.utils.icon( + "add", + "xs" + )} ` + ); + } + } + make_new_doc() { const doctype = this.doctype; const options = {}; From c859375d2c32372f8e97616cac7beea696124c95 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 20 Feb 2026 20:55:50 +0530 Subject: [PATCH 014/108] feat: module onboarding --- frappe/boot.py | 5 +- frappe/desk/desktop.py | 95 +++--- .../module_onboarding/module_onboarding.json | 28 +- .../module_onboarding/module_onboarding.py | 3 - .../onboarding_step/onboarding_step.json | 5 +- .../workspace_sidebar/workspace_sidebar.json | 9 +- .../workspace_sidebar/workspace_sidebar.py | 1 + frappe/public/js/desk.bundle.js | 1 + frappe/public/js/frappe/form/quick_entry.js | 7 + .../public/js/frappe/ui/sidebar/sidebar.html | 7 + frappe/public/js/frappe/ui/sidebar/sidebar.js | 39 +++ .../ui/user_onboarding/OnboardingPanel.vue | 313 ++++++++++++++++++ .../user_onboarding/user_onboarding.bundle.js | 221 +++++++++++++ frappe/public/scss/desk/sidebar.scss | 15 + 14 files changed, 677 insertions(+), 72 deletions(-) create mode 100644 frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue create mode 100644 frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js diff --git a/frappe/boot.py b/frappe/boot.py index 3eeb7a868a..5042693b77 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -539,7 +539,9 @@ def get_sidebar_items(allowed_workspaces): from frappe import _ from frappe.desk.doctype.workspace_sidebar.workspace_sidebar import auto_generate_sidebar_from_module - workspace_sidebars = frappe.get_all("Workspace Sidebar", fields=["name", "header_icon"]) + workspace_sidebars = frappe.get_all( + "Workspace Sidebar", fields=["name", "header_icon", "module_onboarding"] + ) module_sidebars = auto_generate_sidebar_from_module() workspace_sidebars.extend(module_sidebars) sidebar_items = {} @@ -561,6 +563,7 @@ def get_sidebar_items(allowed_workspaces): "label": sidebar_title, "items": [], "header_icon": sidebar.get("header_icon"), + "module_onboarding": sidebar.get("module_onboarding"), "module": sidebar_doc.module, "app": sidebar_doc.app, } diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index a2152f63d5..e4fdbe98e0 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -51,14 +51,9 @@ class Workspace: self.allowed_pages = get_allowed_pages(cache=True) self.allowed_reports = get_allowed_reports(cache=True) + self.onboarding_list = self.get_onboarding_list() if not minimal: - if self.doc.content: - self.onboarding_list = [ - x["data"]["onboarding_name"] for x in loads(self.doc.content) if x["type"] == "onboarding" - ] - self.onboardings = [] - self.table_counts = get_table_with_counts() self.restricted_doctypes = ( frappe.cache.get_value("domain_restricted_doctypes") or build_domain_restricted_doctype_cache() @@ -67,6 +62,14 @@ class Workspace: frappe.cache.get_value("domain_restricted_pages") or build_domain_restricted_page_cache() ) + def get_onboarding_list(self): + return frappe.get_all( + "Module Onboarding", + filters={"is_complete": 0, "module": self.page_name}, + pluck="name", + order_by="creation", + ) + def is_permitted(self): """Return true if `Has Role` is not set or the user is allowed.""" from frappe.utils import has_common @@ -157,7 +160,6 @@ class Workspace: self.cards = {"items": self.get_links()} self.charts = {"items": self.get_charts()} self.shortcuts = {"items": self.get_shortcuts()} - self.onboardings = {"items": self.get_onboardings()} self.quick_lists = {"items": self.get_quick_lists()} self.number_cards = {"items": self.get_number_cards()} self.custom_blocks = {"items": self.get_custom_blocks()} @@ -315,38 +317,6 @@ class Workspace: return items - @handle_not_exist - def get_onboardings(self): - if self.onboarding_list: - for onboarding in self.onboarding_list: - onboarding_doc = self.get_onboarding_doc(onboarding) - if onboarding_doc: - item = { - "label": _(onboarding), - "title": _(onboarding_doc.title), - "subtitle": _(onboarding_doc.subtitle), - "success": _(onboarding_doc.success_message), - "docs_url": onboarding_doc.documentation_url, - "items": self.get_onboarding_steps(onboarding_doc), - } - self.onboardings.append(item) - return self.onboardings - - @handle_not_exist - def get_onboarding_steps(self, onboarding_doc): - steps = [] - for doc in onboarding_doc.get_steps(): - step = doc.as_dict().copy() - step.label = _(doc.title) - step.description = _(doc.description) - if step.action == "Create Entry": - step.is_submittable = frappe.db.get_value( - "DocType", step.reference_document, "is_submittable", cache=True - ) - steps.append(step) - - return steps - @handle_not_exist def get_number_cards(self): all_number_cards = [] @@ -400,7 +370,6 @@ def get_desktop_page(page: str): "charts": workspace.charts, "shortcuts": workspace.shortcuts, "cards": workspace.cards, - "onboardings": workspace.onboardings, "quick_lists": workspace.quick_lists, "number_cards": workspace.number_cards, "custom_blocks": workspace.custom_blocks, @@ -681,7 +650,7 @@ def prepare_widget(config, doctype, parentfield): @frappe.whitelist() -def update_onboarding_step(name: str | int, field: str, value: int | str): +def update_onboarding_step(name: str, field: str, value: any): """Update status of onboaridng step Args: @@ -700,3 +669,47 @@ def update_onboarding_step(name: str | int, field: str, value: int | str): @frappe.whitelist() def get_installed_apps(): return frappe.get_installed_apps() + + +@frappe.whitelist() +@frappe.read_only() +def get_onboarding_data(module: str): + """Get onboarding data for a page + + Args: + page (string): page name + + Return: + dict: onboarding data + """ + onboardings = [] + onboarding_doc = frappe.get_doc("Module Onboarding", module) + if onboarding_doc.is_complete: + return [] + + item = { + "label": _(module), + "title": _(onboarding_doc.title), + "subtitle": _(onboarding_doc.subtitle), + "success": _(onboarding_doc.success_message), + "docs_url": onboarding_doc.documentation_url, + "items": [], + } + + maps = get_onboarding_step_maps(onboarding_doc.name) + for step in maps: + steps = frappe.get_all("Onboarding Step", filters={"name": step}, order_by="idx", fields=["*"]) + + if steps: + item["items"].append(steps[0]) + + onboardings.append(item) + + if all(step.get("is_complete") or step.get("is_skipped") for step in item["items"]): + return [] + + return onboardings + + +def get_onboarding_step_maps(onboarding): + return frappe.get_all("Onboarding Step Map", filters={"parent": onboarding}, pluck="step", order_by="idx") diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.json b/frappe/desk/doctype/module_onboarding/module_onboarding.json index 4adda25c8e..099c75083e 100644 --- a/frappe/desk/doctype/module_onboarding/module_onboarding.json +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.json @@ -7,12 +7,9 @@ "engine": "InnoDB", "field_order": [ "title", - "subtitle", "module", - "allow_roles", "column_break_4", - "success_message", - "documentation_url", + "allow_roles", "is_complete", "section_break_6", "steps" @@ -25,12 +22,6 @@ "label": "Title", "reqd": 1 }, - { - "fieldname": "subtitle", - "fieldtype": "Data", - "label": "Subtitle", - "reqd": 1 - }, { "fieldname": "module", "fieldtype": "Link", @@ -46,18 +37,6 @@ "fieldname": "section_break_6", "fieldtype": "Section Break" }, - { - "fieldname": "success_message", - "fieldtype": "Data", - "label": "Success Message", - "reqd": 1 - }, - { - "fieldname": "documentation_url", - "fieldtype": "Data", - "label": "Documentation URL", - "reqd": 1 - }, { "default": "0", "fieldname": "is_complete", @@ -82,7 +61,7 @@ } ], "links": [], - "modified": "2024-03-23 16:03:30.074327", + "modified": "2026-02-20 13:30:25.659490", "modified_by": "Administrator", "module": "Desk", "name": "Module Onboarding", @@ -111,8 +90,9 @@ } ], "read_only": 1, + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py index 3675d08a30..88c67fcbc1 100644 --- a/frappe/desk/doctype/module_onboarding/module_onboarding.py +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py @@ -19,12 +19,9 @@ class ModuleOnboarding(Document): from frappe.types import DF allow_roles: DF.TableMultiSelect[OnboardingPermission] - documentation_url: DF.Data is_complete: DF.Check module: DF.Link steps: DF.Table[OnboardingStepMap] - subtitle: DF.Data - success_message: DF.Data title: DF.Data # end: auto-generated types diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.json b/frappe/desk/doctype/onboarding_step/onboarding_step.json index b16ee581e4..45efd216ff 100644 --- a/frappe/desk/doctype/onboarding_step/onboarding_step.json +++ b/frappe/desk/doctype/onboarding_step/onboarding_step.json @@ -217,7 +217,7 @@ } ], "links": [], - "modified": "2024-03-23 16:03:33.078443", + "modified": "2026-02-21 08:37:30.532549", "modified_by": "Administrator", "module": "Desk", "name": "Onboarding Step", @@ -248,8 +248,9 @@ ], "quick_entry": 1, "read_only": 1, + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.json b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.json index 371c6564df..9b14ba8d4a 100644 --- a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.json +++ b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.json @@ -13,6 +13,7 @@ "column_break_pukb", "standard", "app", + "module_onboarding", "section_break_vdyo", "items" ], @@ -67,12 +68,18 @@ { "fieldname": "section_break_vdyo", "fieldtype": "Section Break" + }, + { + "fieldname": "module_onboarding", + "fieldtype": "Link", + "label": "Module Onboarding", + "options": "Module Onboarding" } ], "grid_page_length": 50, "index_web_pages_for_search": 1, "links": [], - "modified": "2026-02-02 12:35:38.009501", + "modified": "2026-02-20 15:19:27.520469", "modified_by": "Administrator", "module": "Desk", "name": "Workspace Sidebar", diff --git a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py index b0fe4b5399..8246676e78 100644 --- a/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py +++ b/frappe/desk/doctype/workspace_sidebar/workspace_sidebar.py @@ -29,6 +29,7 @@ class WorkspaceSidebar(Document): for_user: DF.Link | None items: DF.Table[WorkspaceSidebarItem] module: DF.Text | None + module_onboarding: DF.Link | None standard: DF.Check title: DF.Data | None # end: auto-generated types diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index 071d0cba84..945a4e5ee2 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -109,6 +109,7 @@ import "./frappe/utils/dashboard_utils.js"; import "./frappe/ui/chart.js"; import "./frappe/ui/datatable.js"; import "./frappe/ui/driver.js"; +import "./frappe/ui/user_onboarding/user_onboarding.bundle.js"; import "./frappe/scanner"; import "./frappe/ui/address_autocomplete/autocomplete_dialog.js"; diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js index a2583ac15f..2a051d02fe 100644 --- a/frappe/public/js/frappe/form/quick_entry.js +++ b/frappe/public/js/frappe/form/quick_entry.js @@ -203,6 +203,13 @@ frappe.ui.form.QuickEntryForm = class QuickEntryForm extends frappe.ui.Dialog { let messagetxt = __("{1} saved", [__(me.doctype), me.doc.name.bold()]); me.dialog.animation_speed = "slow"; me.dialog.hide(); + if (frappe.route_hooks.after_save) { + let route_callback = frappe.route_hooks.after_save; + delete frappe.route_hooks.after_save; + + route_callback(me); + } + setTimeout(function () { frappe.show_alert( { diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.html b/frappe/public/js/frappe/ui/sidebar/sidebar.html index 226e968608..7e0d700800 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.html +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.html @@ -40,6 +40,12 @@ Save +

+ + {%= frappe.utils.icon("getting-started" , "sm", "", "", "text-ink-gray-7 current-color", true)%} + {%= __("Continue Onboarding") %} + +

{%= frappe.utils.icon("panel-right-open" , "sm", "", "", "text-ink-gray-7 current-color", true)%} {%= __("Collapse") %} @@ -84,5 +90,6 @@
+
diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.js b/frappe/public/js/frappe/ui/sidebar/sidebar.js index 65b373a58a..281baa107f 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.js @@ -78,6 +78,40 @@ frappe.ui.Sidebar = class Sidebar { } } + setup_onboarding() { + let me = this; + this.$onboarding = this.wrapper.find(".user_onboarding"); + this.$onboarding.empty(); + this.wrapper.find(".onboarding-sidebar").removeClass("hidden"); + + if (this.sidebar_data && this.sidebar_data.module_onboarding) { + return frappe + .call({ + method: "frappe.desk.desktop.get_onboarding_data", + args: { + // send sorted min requirements to increase chance of cache hit + module: this.sidebar_data.module_onboarding, + }, + type: "GET", + }) + .then((data) => { + if (data.message?.length > 0) { + let onboarding_data = data.message[0]; + me.onboarding_widget = new frappe.ui.UserOnboarding({ + title: onboarding_data.title, + steps: onboarding_data.items, + wrapper: me.$onboarding, + header_icon: me.sidebar_header.header_icon, + }); + } else { + this.wrapper.find(".onboarding-sidebar").addClass("hidden"); + } + }); + } else { + this.wrapper.find(".onboarding-sidebar").addClass("hidden"); + } + } + find_nested_items() { const me = this; let currentSection = null; @@ -109,6 +143,11 @@ frappe.ui.Sidebar = class Sidebar { this.sidebar_header = new frappe.ui.SidebarHeader(this); this.make_sidebar(); this.add_sidebar_cards(); + this.setup_onboarding(); + + this.wrapper.find(".onboarding-sidebar").click(() => { + this.setup_onboarding(); + }); } add_card(card) { if (this.cards && this.cards.find((i) => i.title === card.title)) return; diff --git a/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue new file mode 100644 index 0000000000..923a0d7f13 --- /dev/null +++ b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue @@ -0,0 +1,313 @@ + + + diff --git a/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js b/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js new file mode 100644 index 0000000000..c167d6df4e --- /dev/null +++ b/frappe/public/js/frappe/ui/user_onboarding/user_onboarding.bundle.js @@ -0,0 +1,221 @@ +import { createApp, ref, h } from "vue"; +import OnboardingPanel from "./OnboardingPanel.vue"; + +class UserOnboarding { + constructor({ title, steps, wrapper, header_icon }) { + this.title = title; + this.steps = steps; + this.$wrapper = $(wrapper); + this.header_icon = header_icon; + this.init(); + } + + init() { + addStyles(); + + let title = this.title || __("Welcome to Frappe!"); + let onboarding_checklist = this.steps || []; + let header_icon = this.header_icon; + + const app = createApp({ + components: { OnboardingPanel }, + + setup() { + const showPanel = ref(true); + const steps = ref(onboarding_checklist); + return () => + h(OnboardingPanel, { + modelValue: showPanel.value, + title: title, + steps: steps.value, + minimizeIcon: frappe.utils.icon("minimize-2", "sm"), + closeIcon: frappe.utils.icon("close", "sm"), + headerIcon: header_icon, + checklistIcon: frappe.utils.icon("circle-check", "sm"), + completeChecklistIcon: frappe.utils.icon( + "circle-check", + "sm", + "", + "", + "", + "", + "var(--green)" + ), + "onUpdate:modelValue": (v) => (showPanel.value = v), + }); + }, + }); + + SetVueGlobals(app); + app.mount(this.$wrapper.get(0)); + } +} + +function addStyles() { + if (document.getElementById("user-onboarding-styles")) return; + + const style = document.createElement("style"); + style.id = "user-onboarding-styles"; + + style.innerHTML = ` + .onb-panel { + position: fixed; + right: 24px; + bottom: 24px; + width: 380px; + max-height: 80vh; + background: #fff; + border-radius: 16px; + box-shadow: 0 12px 40px rgba(0,0,0,0.15); + padding: 16px; + z-index: 9999; + display: flex; + flex-direction: column; + } + + .onb-header-main { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 6px; + } + + .onb-header-left { + display: flex; + align-items: center; + gap: 8px; + } + + .onb-header-icon { + width: 24px; + height: 24px; + } + + .onb-header-title { + margin: 0; + font-size: 20px; + font-weight: 600; + } + + .onb-header-actions button { + border: none; + background: transparent; + cursor: pointer; + margin-left: 2px; + } + + .onb-step-left { + display: flex; + align-items: center; + gap: 8px; + flex: 1; /* takes remaining space */ + min-width: 0; /* allows truncation */ + } + + .onb-step-title { + display: flex; + align-items: center; + gap: 8px; + } + + .onb-step-icon { + margin-bottom: 2px; + align-items: center; + } + + .onb-step-text { + white-space: nowrap; + margin-top: 2px; + text-align: left; + font-size: 14px; + } + + .onb-progress { + height: 6px; + background: #eee; + border-radius: 4px; + margin: 12px 0; + } + + .onb-progress-label { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 13px; + color: #6b7280; + margin-top: 6px; + } + + .onb-skip { + color: #6b7280; + cursor: pointer; + font-weight: 500; + } + + .onb-skip:hover { + color: #111827; + } + + .onboarding-progress-bar { + height: 100%; + background: #ffcd78; + border-radius: 4px; + } + + .onb-steps { + margin-top: 16px; + padding: 0; + list-style: none; + display: flex; + flex-direction: column; + gap: 12px; + align-items: flex-start; + } + + .onb-group:hover { + color: #111827; + background: #f5f5f5; + } + + .onb-cursor-disabled { + cursor: not-allowed; + } + + .onb-select-cursor { + cursor: pointer; + } + + .onb-show-on-hover { + opacity: 0; + visibility: hidden; + transition: opacity 0.2s ease; + } + + .onb-group:hover .onb-show-on-hover { + opacity: 1; + visibility: visible; + } + + .onb-header-logo { + display: flex; + align-items: center; + gap: 8px; + } + + .onb-header-logo img { + width: 24px; + height: 24px; + } + + .onb-header-logo h4 { + margin: 0; + white-space: nowrap; + } + `; + + document.head.appendChild(style); +} + +frappe.provide("frappe.ui"); +frappe.ui.UserOnboarding = UserOnboarding; +export default UserOnboarding; diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss index 0f6740c771..739e2c3b16 100644 --- a/frappe/public/scss/desk/sidebar.scss +++ b/frappe/public/scss/desk/sidebar.scss @@ -127,6 +127,21 @@ } } + .onboarding-sidebar { + text-decoration: none; + font-size: var(--text-sm); + display: flex; + align-items: center; + svg { + margin: 0px; + flex: 0 0 auto; + } + span { + margin-left: 10px; + @include truncate(); + } + } + .collapse-sidebar-link { text-decoration: none; font-size: var(--text-sm); From 57f673425587349164328809178603d0e4fad7c5 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Mon, 23 Feb 2026 12:59:57 +0530 Subject: [PATCH 015/108] fix(sync): remove `is_standard` notifications records on deletion --- frappe/model/sync.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 12718d813a..b28d3de942 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -200,7 +200,7 @@ def remove_orphan_doctypes(): def remove_orphan_entities(): - entites = ["Workspace", "Dashboard", "Page", "Report"] + entites = ["Workspace", "Dashboard", "Page", "Report", "Notification"] app_level_entities = ["Workspace Sidebar", "Desktop Icon"] entity_filter_map = { "Workspace": [{"public": 1, "module": ["is", "set"], "app": ["is", "set"]}], @@ -209,6 +209,7 @@ def remove_orphan_entities(): "Dashboard": {"is_standard": True}, "Workspace Sidebar": {"standard": True}, "Desktop Icon": {"standard": True}, + "Notification": {"is_standard": True}, } entity_file_map = create_entity_file_map(entites) From d8c1e9400557e31e34cedad8da8787c861950246 Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 23 Feb 2026 14:17:05 +0530 Subject: [PATCH 016/108] fix: notification panel shadow --- frappe/public/scss/desk/notification.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/desk/notification.scss b/frappe/public/scss/desk/notification.scss index ba919797cc..c5ef9ea68f 100644 --- a/frappe/public/scss/desk/notification.scss +++ b/frappe/public/scss/desk/notification.scss @@ -60,7 +60,7 @@ min-height: 480px; position: absolute; top: 0; - box-shadow: var(--shadow-2xl); + box-shadow: rgba(0, 0, 0, 0.1) 8px 0px 8px; background-color: var(--bg-color); height: 100vh; overflow: hidden; From 29bbb183a1c01577006b61e4c8eda192fe18fb34 Mon Sep 17 00:00:00 2001 From: Sumit Jain <59503001+sumitjain236@users.noreply.github.com> Date: Mon, 23 Feb 2026 14:36:33 +0530 Subject: [PATCH 017/108] fix: duplicate last quoted messagg (#37240) --- frappe/public/js/frappe/views/communication.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 34871f275b..bfa1706f11 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -5,6 +5,8 @@ import localforage from "localforage"; frappe.last_edited_communication = {}; const separator_element = "
---
"; +// Quill uses

---

; match both when stripping quoted content +const separator_regex = /<(?:div|p)(?:\s[^>]*)?>---<\/(?:div|p)>/i; frappe.views.CommunicationComposer = class { constructor(opts) { @@ -566,6 +568,18 @@ frappe.views.CommunicationComposer = class { const last_edited = this.get_last_edited_communication(); if (!last_edited.content && !last_edited.html_content) return; + // For replies: strip duplicate quoted content (Quill uses

---

) + if (this.is_a_reply) { + const reply_block = this.get_earlier_reply(); + for (const field of ["content", "html_content"]) { + if (last_edited[field]) { + last_edited[field] = + (last_edited[field].split(separator_regex)[0] || "").trimEnd() + + reply_block; + } + } + } + // prevent re-triggering of email template if (last_edited.email_template) { const template_field = this.dialog.fields_dict.email_template; @@ -789,7 +803,7 @@ frappe.views.CommunicationComposer = class { save_as_draft() { if (this.dialog && this.frm) { let message = this.get_email_content(); - message = message.split(separator_element)[0]; + message = message.split(separator_regex)[0]; this.save_item_in_local_forage(this.frm.doctype + this.frm.docname, message); this.save_item_in_local_forage( this.frm.doctype + this.frm.docname + "_use_html", @@ -950,7 +964,7 @@ frappe.views.CommunicationComposer = class { } if (this.is_a_reply && !this.reply_set) { - message += this.get_earlier_reply(); + message = message.split(separator_regex)[0] + this.get_earlier_reply(); } await this.set_email_content(message); From bbf8f4d75b7f5e9dcc3f2651b9b10c3dcb2a130f Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Mon, 23 Feb 2026 14:41:36 +0530 Subject: [PATCH 018/108] fix: add id to file preview --- frappe/core/doctype/file/file.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js index f3f1380855..6495aa4c1b 100644 --- a/frappe/core/doctype/file/file.js +++ b/frappe/core/doctype/file/file.js @@ -54,14 +54,14 @@ frappe.ui.form.on("File", { `); } else if (frappe.utils.is_video_file(frm.doc.file_url)) { $preview = $(`
`); @@ -72,14 +72,16 @@ frappe.ui.form.on("File", { style="background:#323639;" width="100%" height="1190" - src="${frappe.utils.escape_html(frm.doc.file_url)}" type="application/pdf" + src="${frappe.utils.escape_html(frm.doc.file_url + "?fid=" + frm.doc.name)}" type="application/pdf" > `); } else if (file_extension === "mp3") { $preview = $(`
`); From 967edf99806c94fec83356c413310d4c8b7fe66d Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:09:06 +0530 Subject: [PATCH 019/108] fix: user action designs --- .../js/frappe/form/sidebar/form_sidebar.js | 19 +++-- .../frappe/form/templates/form_sidebar.html | 10 ++- frappe/public/scss/desk/form_sidebar.scss | 80 +++++++++++++++++++ 3 files changed, 101 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index 29f26b76db..ab02e96ab1 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -26,6 +26,7 @@ frappe.ui.form.Sidebar = class { .appendTo(this.page.sidebar.empty()); this.user_actions = this.sidebar.find(".user-actions"); + this.user_actions_list = this.sidebar.find(".user-actions-list"); this.image_section = this.sidebar.find(".sidebar-image-section"); this.image_wrapper = this.image_section.find(".sidebar-image-wrapper"); this.make_assignments(); @@ -245,19 +246,23 @@ frappe.ui.form.Sidebar = class { } add_user_action(label, click) { - return $("") - .html(label) - .appendTo( - $('
').appendTo( - this.user_actions.removeClass("hidden") - ) + const parent = this.user_actions_list.length ? this.user_actions_list : this.user_actions; + this.user_actions.removeClass("hidden"); + const row = $('
').appendTo(parent); + + return $('') + .html( + `${label} + ${frappe.utils.icon("external-link", "sm")}` ) + .appendTo(row) .on("click", click); } clear_user_actions() { this.user_actions.addClass("hidden"); - this.user_actions.find(".user-action-row").remove(); + const parent = this.user_actions_list.length ? this.user_actions_list : this.user_actions; + parent.find(".user-action-row").remove(); } refresh_image() {} diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index a43117a67d..30446fe72b 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -1,4 +1,3 @@ -
@@ -82,6 +81,15 @@
{% } %}
+
diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index fceffe52d7..36a7e411fd 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -20,6 +20,10 @@ flex-wrap: wrap; color: var(--text-light); + .icon { + stroke: var(--text-light); + } + .icon-btn { height: unset; } @@ -38,6 +42,82 @@ } } + .user-actions { + display: flex; + flex-direction: column; + gap: 8px; + padding: var(--padding-md); + + .user-actions-list { + display: flex; + flex-direction: column; + gap: 6px; + } + + .user-action-row { + margin: 0; + } + + .user-action-link { + display: flex; + align-items: center; + text-decoration: underline; + justify-content: space-between; + gap: var(--margin-sm); + width: 100%; + padding: 4px 8px; + margin-left: -4px; + margin-right: -8px; + border-radius: var(--border-radius-md); + transition: background-color 120ms ease; + + &:hover, + &:focus-visible { + background: var(--subtle-fg); + } + + &:focus-visible { + outline: none; + } + + .user-action-external-icon { + display: none; + line-height: 0; + + .icon { + margin: 0; + --icon-stroke: var(--text-muted); + } + } + + &[target="_blank"] .user-action-external-icon { + display: inline-flex; + align-items: center; + opacity: 0; + transform: translateX(-2px); + transition: opacity 120ms ease, transform 120ms ease; + } + + &[target="_blank"]:hover .user-action-external-icon, + &[target="_blank"]:focus-visible .user-action-external-icon { + opacity: 1; + transform: translateX(0); + } + } + + .user-action-label { + display: block; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + .sidebar-section.user-actions.border-bottom { + padding-bottom: 15px; + } + .form-tags { .tag-area { margin-top: -3px; From 8f21eb0e137fc3dc4525cf19a954e3b26b89027a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:09:34 +0530 Subject: [PATCH 020/108] fix: spacing between avatar and user name --- frappe/public/js/frappe/form/sidebar/assign_to.js | 2 +- frappe/public/scss/common/modal.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js index ce4e0ca995..eeed2632fd 100644 --- a/frappe/public/js/frappe/form/sidebar/assign_to.js +++ b/frappe/public/js/frappe/form/sidebar/assign_to.js @@ -286,7 +286,7 @@ frappe.ui.form.AssignmentClass = class AssignmentClass {
${frappe.avatar(assignment)} - ${frappe.user.full_name(assignment)} + ${frappe.user.full_name(assignment)}
diff --git a/frappe/public/scss/common/modal.scss b/frappe/public/scss/common/modal.scss index 3cb388a3fd..936dda7fef 100644 --- a/frappe/public/scss/common/modal.scss +++ b/frappe/public/scss/common/modal.scss @@ -299,6 +299,9 @@ body.modal-open[style^="padding-right"] { } .assignee { flex: 1; + display: flex; + gap: 8px; + align-items: center; } &:hover { .btn-group { @@ -306,9 +309,6 @@ body.modal-open[style^="padding-right"] { transition: opacity 0.1s ease-in-out; } } - .avatar { - margin-right: var(--margin-md); - } } // Stack minimized modals From bd022219ade197624a83267218f6b0b20f46bf94 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:09:45 +0530 Subject: [PATCH 021/108] fix: close icon --- frappe/public/js/frappe/form/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index c0da70f26e..893d8abe3e 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -121,7 +121,7 @@ frappe.ui.form.Layout = class Layout { } // Add close button to block if not permanent - const close_message = $(`
${frappe.utils.icon("close")}
`); + const close_message = $(`
${frappe.utils.icon("x")}
`); if (!permanent) { close_message.appendTo($html); close_message.on("click", () => $html.remove()); From 9a3d173b62159ff395afbd4b3278b9cdad5de6cf Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Mon, 23 Feb 2026 15:40:14 +0530 Subject: [PATCH 022/108] fix: prevent `UTF-8` corruption in text attachments --- frappe/email/email_body.py | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index c6be796b49..37729812c1 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -478,46 +478,59 @@ def inline_style_in_html(html, add_css=True): def add_attachment(fname, fcontent, content_type=None, parent=None, content_id=None, inline=False): """Add attachment to parent which must an email object""" + import mimetypes + from email import encoders from email.mime.audio import MIMEAudio from email.mime.base import MIMEBase from email.mime.image import MIMEImage from email.mime.text import MIMEText - if not content_type: - content_type, _encoding = mimetypes.guess_type(fname) - if not parent: return + # Guess content type if not provided + if not content_type: + content_type, _encoding = mimetypes.guess_type(fname) + if content_type is None: # No guess could be made, or the file is encoded (compressed), so # use a generic bag-of-bits type. content_type = "application/octet-stream" maintype, subtype = content_type.split("/", 1) + if maintype == "text": - # Note: we should handle calculating the charset + if isinstance(fcontent, bytes): + # If bytes are provided, assume UTF-8 + fcontent = fcontent.decode("utf-8") + + part = MIMEText(fcontent, _subtype=subtype, _charset="utf-8") + + elif maintype == "image": if isinstance(fcontent, str): fcontent = fcontent.encode("utf-8") - part = MIMEText(fcontent, _subtype=subtype, _charset="utf-8") - elif maintype == "image": part = MIMEImage(fcontent, _subtype=subtype) + elif maintype == "audio": + if isinstance(fcontent, str): + fcontent = fcontent.encode("utf-8") part = MIMEAudio(fcontent, _subtype=subtype) + else: + if isinstance(fcontent, str): + fcontent = fcontent.encode("utf-8") + part = MIMEBase(maintype, subtype) part.set_payload(fcontent) - # Encode the payload using Base64 - from email import encoders - encoders.encode_base64(part) # Set the filename parameter if fname: attachment_type = "inline" if inline else "attachment" - clean_filename = re.sub("[\r\n]", "", str(fname)) + clean_filename = re.sub(r"[\r\n]", "", str(fname)) part.add_header("Content-Disposition", attachment_type, filename=clean_filename) + if content_id: part.add_header("Content-ID", f"<{content_id}>") From 388ed746fba6b8d2546836206ab9561f702c906e Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 15:52:51 +0530 Subject: [PATCH 023/108] fix: alignment of user action row --- frappe/public/scss/desk/form_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index 36a7e411fd..ae4914022b 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -66,7 +66,7 @@ gap: var(--margin-sm); width: 100%; padding: 4px 8px; - margin-left: -4px; + margin-left: -6px; margin-right: -8px; border-radius: var(--border-radius-md); transition: background-color 120ms ease; From 74c1c5c9aaf3783c756d0048c3a89b57df56582a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 16:18:13 +0530 Subject: [PATCH 024/108] refactor: like count and like popover designs --- .../js/frappe/form/sidebar/form_sidebar.js | 3 - .../frappe/form/templates/form_sidebar.html | 2 - frappe/public/js/frappe/ui/like.js | 197 +++++++++++++----- frappe/public/scss/desk/form_sidebar.scss | 35 +++- 4 files changed, 177 insertions(+), 60 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js index ab02e96ab1..907c88b1ad 100644 --- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js +++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js @@ -116,7 +116,6 @@ frappe.ui.form.Sidebar = class { make_like() { this.like_wrapper = this.sidebar.find(".liked-by"); this.like_icon = this.sidebar.find(".liked-by .like-icon"); - this.like_count = this.sidebar.find(".liked-by .like-count"); frappe.ui.setup_like_popover(this.sidebar.find(".form-stats-likes"), ".like-icon"); this.like_icon.on("click", () => { @@ -139,8 +138,6 @@ frappe.ui.form.Sidebar = class { .toggleClass("liked", liked) .attr("data-doctype", this.frm.doctype) .attr("data-name", this.frm.doc.name); - - this.like_count && this.like_count.text(JSON.parse(this.frm.doc._liked_by || "[]").length); } refresh_web_view_count() { diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 30446fe72b..2f8be66da7 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -24,7 +24,6 @@ -
{% endif %} @@ -50,7 +49,6 @@ -
{% endif %} diff --git a/frappe/public/js/frappe/ui/like.js b/frappe/public/js/frappe/ui/like.js index e4b1c31ee8..2d6c7198be 100644 --- a/frappe/public/js/frappe/ui/like.js +++ b/frappe/public/js/frappe/ui/like.js @@ -1,5 +1,6 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // MIT License. See license.txt +import { createPopper } from "@popperjs/core"; frappe.ui.is_liked = function (doc) { return frappe.ui.get_liked_by(doc).includes(frappe.session.user); @@ -65,63 +66,157 @@ frappe.ui.setup_like_popover = ($parent, selector) => { return; } - $parent.on("mouseover", selector, function () { - const target_element = $(this); - target_element.popover({ - animation: true, - placement: "bottom", - trigger: "manual", - template: `
-
+ let active_target = null; + let active_popover = null; + let active_popper = null; + let hide_timer = null; + + const clear_hide_timer = () => { + if (hide_timer) { + clearTimeout(hide_timer); + hide_timer = null; + } + }; + + const destroy_active_popover = () => { + clear_hide_timer(); + if (active_target) { + active_target.off(".likePopover"); + } + if (active_popover) { + active_popover.off(".likePopover"); + active_popover.remove(); + } + if (active_popper) { + active_popper.destroy(); + } + active_target = null; + active_popover = null; + active_popper = null; + }; + + const schedule_hide = () => { + clear_hide_timer(); + hide_timer = setTimeout(() => { + destroy_active_popover(); + }, 120); + }; + + const get_liked_by_users = (target_element) => { + let liked_by = target_element.parents(".liked-by").attr("data-liked-by"); + liked_by = liked_by ? decodeURI(liked_by) : "[]"; + return JSON.parse(liked_by); + }; + + const get_popover_content = (target_element) => { + const liked_by = get_liked_by_users(target_element); + const content = $('
'); + const like_count = liked_by.length; + + if (like_count > 3) { + const like_summary = __("Liked by {0} people", [like_count]); + const like_count_html = $( + `
${like_summary}
` + ); + content.append(like_count_html); + } + + if (!liked_by.length) { + return content; + } + + const liked_by_list = $('
    '); + const link_base = "/desk/user/"; + + liked_by.forEach((user) => { + liked_by_list.append(` +
  • ${frappe.avatar(user, "avatar-xs")} + ${frappe.user.full_name(user)} +
    • + `); + }); + + liked_by_list.children("li").on("click", (ev) => { + ev.preventDefault(); + ev.stopPropagation(); + const user = ev.currentTarget.dataset.user; + setTimeout(() => destroy_active_popover(), 0); + frappe.set_route(link_base + user); + }); + + content.append(liked_by_list); + return content; + }; + + const show_popover = (target_element) => { + if (!get_liked_by_users(target_element).length) { + destroy_active_popover(); + return; + } + + if (active_target?.get(0) === target_element.get(0) && active_popover) { + clear_hide_timer(); + active_popper?.update(); + return; + } + + destroy_active_popover(); + + const popover = $( + ``, - content: () => { - let liked_by = target_element.parents(".liked-by").attr("data-liked-by"); - liked_by = liked_by ? decodeURI(liked_by) : "[]"; - liked_by = JSON.parse(liked_by); +
    ` + ); - if (!liked_by.length) { - return ""; - } + popover.find(".popover-content").append(get_popover_content(target_element)); + $(document.body).append(popover); - let liked_by_list = $(`
      `); - - // to show social profile of the user - let link_base = "/desk/user/"; - - liked_by.forEach((user) => { - // append user list item - liked_by_list.append(` -
    • ${frappe.avatar(user, "avatar-xs")} - ${frappe.user.full_name(user)} -
      • - `); - }); - - liked_by_list.children("li").click((ev) => { - let user = ev.currentTarget.dataset.user; - target_element.popover("hide"); - frappe.set_route(link_base + user); - }); - - return liked_by_list; - }, - html: true, - container: "body", + const popper = createPopper(target_element.get(0), popover.get(0), { + placement: "bottom", + modifiers: [ + { + name: "offset", + options: { + offset: [0, 8], + }, + }, + { + name: "preventOverflow", + options: { + padding: 12, + }, + }, + { + name: "flip", + options: { + padding: 12, + fallbackPlacements: ["bottom-start", "top", "top-start"], + }, + }, + ], }); - target_element.popover("show"); + active_target = target_element; + active_popover = popover; + active_popper = popper; - $(".popover").on("mouseleave", () => { - target_element.popover("hide"); - }); + target_element + .off(".likePopover") + .on("mouseenter.likePopover", clear_hide_timer) + .on("mouseleave.likePopover", schedule_hide); - target_element.on("mouseout", () => { - setTimeout(() => { - if (!$(".popover:hover").length) { - target_element.popover("hide"); - } - }, 100); - }); + popover + .off(".likePopover") + .on("mousedown.likePopover click.likePopover", (ev) => { + ev.stopPropagation(); + }) + .on("mouseenter.likePopover", clear_hide_timer) + .on("mouseleave.likePopover", schedule_hide); + }; + + $parent.on("mouseenter", selector, function () { + show_popover($(this)); }); + + $parent.on("mouseleave", selector, schedule_hide); }; diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index ae4914022b..498dbd4916 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -222,7 +222,8 @@ } .form-stats-likes { - gap: 8px; + gap: 2px; + margin-top: -2px; .form-print { button:hover { background: var(--btn-default-hover-bg); @@ -495,17 +496,43 @@ body[data-route^="Form"] { } } +.liked-by { + display: flex; + align-items: center; + justify-content: center; + width: 28px; + height: 28px; +} + .liked-by-popover { + max-width: 240px; + border-radius: var(--border-radius-md); + box-shadow: var(--shadow-md); + overflow: hidden; + .popover-body { - min-height: 30px; padding: 0px; + .liked-by-popover-summary { + padding: 4px 10px; + margin: 0; + color: var(--text-muted); + border-bottom: 1px solid var(--subtle-accent); + @include get_textstyle("sm", "regular"); + } + ul.list-unstyled { margin-bottom: 0px; + padding: 4px; li { - padding: var(--padding-xs) var(--padding-sm); - margin: 2px; + display: flex; + align-items: center; + gap: var(--padding-xs); + padding: var(--padding-xs); + margin: 0; + border-radius: var(--border-radius-sm); + cursor: pointer; &:hover { background-color: var(--fg-hover-color); From 8f95c1ccdd05a72eb1e725a2834f6c6d40ab56fb Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 16:34:11 +0530 Subject: [PATCH 025/108] fix: form sidebar title text alignment & weight --- frappe/public/js/frappe/form/templates/form_sidebar.html | 6 +++--- frappe/public/scss/desk/form_sidebar.scss | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 2f8be66da7..c93b475f08 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -32,14 +32,14 @@
      {% let title = frm.get_title(); %} - {% if (title && title !== frm.doc.name) { %}
      {%= frappe.utils.escape_html(frappe.utils.html2text(title)) %}
      - {% } %} -
      + {% if (title && title !== frm.doc.name) { %} +
      {%= frm.doc.name %}
      + {% } %}
      {% if not image_field %}
      diff --git a/frappe/public/scss/desk/form_sidebar.scss b/frappe/public/scss/desk/form_sidebar.scss index 498dbd4916..bc29e81f38 100644 --- a/frappe/public/scss/desk/form_sidebar.scss +++ b/frappe/public/scss/desk/form_sidebar.scss @@ -221,9 +221,13 @@ } } + .form-title-text { + // to match the actions button height for center alignment + line-height: 28px; + } + .form-stats-likes { gap: 2px; - margin-top: -2px; .form-print { button:hover { background: var(--btn-default-hover-bg); From 7363ed222a01e545e06c0bcce48d328b507dbfd5 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 23 Feb 2026 16:35:42 +0530 Subject: [PATCH 026/108] refactor: "Report bug" link and experimental badge in form sidebar --- frappe/public/js/frappe/form/form.js | 12 ++++++++++++ .../js/frappe/form/templates/form_sidebar.html | 15 +++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index cefd7e1527..2a07f647fd 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -783,6 +783,7 @@ frappe.ui.form.Form = class FrappeForm { this.show_submit_message(); this.clear_custom_buttons(); this.show_web_link(); + this.show_report_bug_link(); this.show_workflow_read_only_banner(); } @@ -1280,6 +1281,17 @@ frappe.ui.form.Form = class FrappeForm { } } + show_report_bug_link() { + if (this.meta.beta) { + this.add_web_link( + "https://github.com/frappe/" + + frappe.boot.module_app[frappe.scrub(this.meta.module)] + + "/issues/new", + __("Report bug") + ); + } + } + add_web_link(path, label) { label = __(label) || __("See on Website"); this.web_link = this.sidebar diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index c93b475f08..ba71f85f74 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -35,6 +35,11 @@
      {%= frappe.utils.escape_html(frappe.utils.html2text(title)) %}
      + {% if frm.meta.beta %} +
      + +
      + {% endif %} {% if (title && title !== frm.doc.name) { %}
      {%= frm.doc.name %} @@ -53,16 +58,6 @@
      {% endif %}
      - {% if frm.meta.beta %} -
      - - -
      - {% endif %}
      From 657b1eb50c35343e3a3a519ebf6cd5958fea8da4 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 23 Feb 2026 17:19:15 +0530 Subject: [PATCH 027/108] fix!: Restrict allowed HTML in msgprints (#37399) Co-authored-by: AarDG10 --- frappe/tests/test_utils.py | 16 ++++++++++++++++ frappe/utils/messages.py | 24 ++++++++++++++++++------ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/frappe/tests/test_utils.py b/frappe/tests/test_utils.py index 496083de18..3093fba8b0 100644 --- a/frappe/tests/test_utils.py +++ b/frappe/tests/test_utils.py @@ -1679,3 +1679,19 @@ class TestDataUtils(UnitTestCase): self.assertEqual(comma_or(["a", "b", "c"]), "'a', 'b' ou 'c'") self.assertEqual(comma_or(["a", "b", "c"], add_quotes=False), "a, b ou c") + + +class TestMsgPrint(UnitTestCase): + def tearDown(self) -> None: + super().tearDown() + frappe.clear_messages() + + def test_msgprint(self): + frappe.msgprint("Validate: ") + message = frappe.get_message_log()[-1] + + self.assertNotIn("script", message.message) + + frappe.msgprint("
      • abc
      ") + message = frappe.get_message_log()[-1] + self.assertIn("
      • ", message.message) diff --git a/frappe/utils/messages.py b/frappe/utils/messages.py index b7bb665387..3ced869043 100644 --- a/frappe/utils/messages.py +++ b/frappe/utils/messages.py @@ -1,4 +1,3 @@ -import functools import sys from collections.abc import Sequence from typing import Literal @@ -8,8 +7,6 @@ from frappe import _ from frappe.utils import strip_html_tags from frappe.utils.data import safe_decode -_strip_html_tags = functools.lru_cache(maxsize=1024)(strip_html_tags) - def msgprint( msg: str | Sequence[str] | Sequence[Sequence[str]], @@ -24,6 +21,7 @@ def msgprint( wide: bool = False, *, realtime=False, + allow_dangerous_html=False, ) -> None: """Print a message to the user (via HTTP response). Messages are sent in the `__server_messages` property in the @@ -38,9 +36,12 @@ def msgprint( :param is_minimizable: [optional] Allow users to minimize the modal :param wide: [optional] Show wide modal :param realtime: Publish message immediately using websocket. + :param allow_dangerous_html: Allow arbitrary HTML in message. """ import inspect + from frappe.utils.html_utils import clean_html + msg = safe_decode(msg) out = frappe._dict(message=msg) @@ -67,13 +68,21 @@ def msgprint( else: out.as_table = as_table + if not allow_dangerous_html: + if out.as_list: + out.message = [clean_html(cell) for cell in msg] + elif out.as_table: + out.message = [[clean_html(cell) for cell in row] for row in msg] + else: + out.message = clean_html(msg) + if sys.stdin and sys.stdin.isatty(): if out.as_list: - msg = [_strip_html_tags(cell) for cell in msg] + msg = [strip_html_tags(cell) for cell in msg] elif out.as_table: - msg = [[_strip_html_tags(cell) for cell in row] for row in msg] + msg = [[strip_html_tags(cell) for cell in row] for row in msg] else: - msg = _strip_html_tags(msg) + msg = strip_html_tags(msg) if frappe.flags.print_messages and out.message: print(f"Message: {msg}") @@ -134,6 +143,8 @@ def throw( wide: bool = False, as_list: bool = False, primary_action=None, + *, + allow_dangerous_html=False, ) -> None: """Throw execption and show message (`msgprint`). @@ -154,6 +165,7 @@ def throw( wide=wide, as_list=as_list, primary_action=primary_action, + allow_dangerous_html=allow_dangerous_html, ) From c3781f1bd783e2319472bb5cfe754c26db51db80 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 23 Feb 2026 17:37:11 +0530 Subject: [PATCH 028/108] fix: Clear active sessions when user type changes (#37402) Users often need to log out and log back in when session type changes. This PR just does it for them. Co-authored-by: AarDG10 --- frappe/core/doctype/user/user.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index cebd245531..b1831d59f9 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -393,6 +393,9 @@ class User(Document): """Set as System User if any of the given roles has desk_access""" self.user_type = "System User" if self.has_desk_access() else "Website User" + if self.has_value_changed("user_type"): + clear_sessions(user=self.name, force=True) + def set_roles_and_modules_based_on_user_type(self): user_type_doc = frappe.get_cached_doc("User Type", self.user_type) if user_type_doc.role: @@ -427,15 +430,6 @@ class User(Document): self.doctype, self.name, self.name, write=1, share=1, flags={"ignore_share_permission": True} ) - def validate_share(self, docshare): - pass - # if docshare.user == self.name: - # if self.user_type=="System User": - # if docshare.share != 1: - # frappe.throw(_("Sorry! User should have complete access to their own record.")) - # else: - # frappe.throw(_("Sorry! Sharing with Website User is prohibited.")) - def send_password_notification(self, new_password): try: if self.flags.in_insert: From 85e0fdaa6c1629d832d8e84f7b70952d77a56a97 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 23 Feb 2026 17:55:27 +0530 Subject: [PATCH 029/108] fix: Apply full perm logic on global search (#37400) Co-authored-by: AarDG10 --- frappe/utils/global_search.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 8437f736e7..207b622301 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -530,14 +530,16 @@ def search(text: str, start: int = 0, limit: int = 20, doctype: str = ""): if r.doctype == doctype and r.rank > 0.0: try: meta = frappe.get_meta(r.doctype) + doc = frappe.get_lazy_doc(r.doctype, r.name) if meta.image_field: - r.image = frappe.db.get_value(r.doctype, r.name, meta.image_field) + r.image = doc.get(meta.image_field) if meta.title_field: - r.title = frappe.db.get_value(r.doctype, r.name, meta.title_field) + r.title = doc.get(meta.title_field) except Exception: frappe.clear_messages() - sorted_results.extend([r]) + if doc.has_permission(): + sorted_results.append(r) return sorted_results From 852c76617e19e4f206e53b9d33436f627d5a4379 Mon Sep 17 00:00:00 2001 From: Safwan Samsudeen Date: Mon, 23 Feb 2026 17:55:54 +0530 Subject: [PATCH 030/108] fix: redirect to login if user is logged out Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/request.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js index 2f6f4475ba..84c671c66c 100644 --- a/frappe/public/js/frappe/request.js +++ b/frappe/public/js/frappe/request.js @@ -145,7 +145,14 @@ frappe.request.call = function (opts) { opts.error_callback && opts.error_callback(); }, 403: function (xhr) { - if (frappe.session.user === "Guest" && frappe.session.logged_in_user !== "Guest") { + const user_id = document.cookie + .split(";") + .find((c) => c.trim().startsWith("user_id=")) + ?.split("=")[1]; + if ( + user_id === "Guest" || + (frappe.session.user === "Guest" && frappe.session.logged_in_user !== "Guest") + ) { // session expired frappe.app.handle_session_expired(); } else if (xhr.responseJSON && xhr.responseJSON._error_message) { From fc5ea753507f004e5b72c27466c5fb7c8fa9e70f Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 23 Feb 2026 18:13:12 +0530 Subject: [PATCH 031/108] fix: hide old_parent field by default in Tree DocTypes (#37410) Co-authored-by: Vibhuti Garachh --- frappe/core/doctype/doctype/doctype.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 0b5557202e..a5f0cc3d52 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -992,7 +992,13 @@ class DocType(Document): self.append("fields", {"label": "Is Group", "fieldtype": "Check", "fieldname": "is_group"}) self.append( "fields", - {"label": "Old Parent", "fieldtype": "Link", "options": self.name, "fieldname": "old_parent"}, + { + "label": "Old Parent", + "fieldtype": "Link", + "options": self.name, + "fieldname": "old_parent", + "hidden": 1, + }, ) parent_field_label = f"Parent {self.name}" From 461ea8178364917aff1440fd48b3843950d4d954 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Mon, 23 Feb 2026 18:23:49 +0530 Subject: [PATCH 032/108] fix(ldap): sync backend and frontend restrictions (#37411) Only System Managers can use this functionality. Signed-off-by: Akhil Narang --- frappe/integrations/doctype/ldap_settings/ldap_settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py index bb84b7241f..e010f93b79 100644 --- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py +++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py @@ -424,6 +424,8 @@ def login(): @frappe.whitelist() def reset_password(user: str, password: str, logout: int): + frappe.only_for("System Manager") + ldap: LDAPSettings = frappe.get_doc("LDAP Settings") if not ldap.enabled: frappe.throw(_("LDAP is not enabled.")) From e86df0f9ccc103a789120c27dd5e2a59e86b213e Mon Sep 17 00:00:00 2001 From: Priyal208 <135015851+Priyal208@users.noreply.github.com> Date: Mon, 23 Feb 2026 18:29:57 +0530 Subject: [PATCH 033/108] fix: skip `_validate_update_after_submit()` for virtual fields (#37390) --- frappe/model/base_document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index af11b43948..c4930e2048 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -1324,7 +1324,7 @@ class BaseDocument: df = self.meta.get_field(key) db_value = db_values.get(key) - if df and not df.allow_on_submit and (self.get(key) or db_value): + if df and not df.allow_on_submit and not df.is_virtual and (self.get(key) or db_value): if df.fieldtype in table_fields: # just check if the table size has changed # individual fields will be checked in the loop for children From 539d0f9d7a3852d9dabd891a22e33d3e88bcc3d1 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Mon, 23 Feb 2026 17:13:59 +0530 Subject: [PATCH 034/108] fix: delete standard notification and report files after `commit` --- frappe/core/doctype/report/report.py | 23 +++++++++-------- .../doctype/notification/notification.py | 25 +++++++++---------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 6d890a6736..828a28a075 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -93,20 +93,23 @@ class Report(Document): doc.prepared_report = 0 def on_trash(self): - if ( - self.is_standard == "Yes" - and not cint(getattr(frappe.local.conf, "developer_mode", 0)) - and not frappe.flags.in_migrate - and not frappe.flags.in_patch - ): - frappe.throw(_("You are not allowed to delete Standard Report")) + if self.is_standard == "Yes": + if ( + not cint(getattr(frappe.local.conf, "developer_mode", 0)) + and not frappe.flags.in_migrate + and not frappe.flags.in_patch + ): + frappe.throw(_("You are not allowed to delete Standard Report")) + + if frappe.conf.developer_mode and not frappe.flags.in_test: + frappe.db.after_commit(self.delete_report_folder) + delete_custom_role("report", self.name) - def after_delete(self): + def delete_report_folder(self): from frappe.modules.export_file import delete_folder - if not frappe.flags.in_test and frappe.conf.developer_mode: - delete_folder(self.module, "Report", self.name) + delete_folder(self.module, "Report", self.name) def get_permission_log_options(self, event=None): return {"fields": ["roles"]} diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index 04fc726272..3a800c6311 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -721,23 +721,22 @@ def get_context(context): self.message = self.get_template(md_as_html=True) def on_trash(self): - # Prevent deletion of standard notifications outside developer mode to avoid restoration during migration - if ( - self.is_standard - and not frappe.conf.developer_mode - and not frappe.flags.in_migrate - and not frappe.flags.in_patch - ): - frappe.throw( - _("You are not allowed to delete a standard Notification. You can disable it instead.") - ) + if self.is_standard: + # Prevent deletion of standard notifications outside developer mode to avoid restoration during migration + if not frappe.conf.developer_mode and not frappe.flags.in_migrate and not frappe.flags.in_patch: + frappe.throw( + _("You are not allowed to delete a standard Notification. You can disable it instead.") + ) + + if frappe.conf.developer_mode and not frappe.flags.in_test: + frappe.db.after_commit(self.delete_notification_folder) + clear_notification_cache() - def after_delete(self): + def delete_notification_folder(self): from frappe.modules.export_file import delete_folder - if not frappe.flags.in_test and frappe.conf.developer_mode: - delete_folder(self.module, "Notification", self.name) + delete_folder(self.module, "Notification", self.name) def clear_notification_cache(): From 97e4e46ec4c6db8e67980a600e453bffd1fa834a Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 23 Feb 2026 12:52:47 +0530 Subject: [PATCH 035/108] fix: cy test case failing --- frappe/desk/desktop.py | 24 ++-- .../onboarding_step/onboarding_step.json | 19 ++- .../onboarding_step/onboarding_step.py | 3 +- frappe/public/js/desk.bundle.js | 2 +- .../public/js/frappe/ui/sidebar/sidebar.html | 6 +- frappe/public/js/frappe/ui/sidebar/sidebar.js | 43 ++++++- .../ui/user_onboarding/OnboardingPanel.vue | 73 ++++++++--- .../user_onboarding/user_onboarding.bundle.js | 120 +++++++++--------- frappe/public/scss/desk/driver.scss | 5 + 9 files changed, 195 insertions(+), 100 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index e4fdbe98e0..0b01a252fa 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -51,9 +51,13 @@ class Workspace: self.allowed_pages = get_allowed_pages(cache=True) self.allowed_reports = get_allowed_reports(cache=True) - self.onboarding_list = self.get_onboarding_list() if not minimal: + if self.doc.content: + self.onboarding_list = [ + x["data"]["onboarding_name"] for x in loads(self.doc.content) if x["type"] == "onboarding" + ] + self.table_counts = get_table_with_counts() self.restricted_doctypes = ( frappe.cache.get_value("domain_restricted_doctypes") or build_domain_restricted_doctype_cache() @@ -62,14 +66,6 @@ class Workspace: frappe.cache.get_value("domain_restricted_pages") or build_domain_restricted_page_cache() ) - def get_onboarding_list(self): - return frappe.get_all( - "Module Onboarding", - filters={"is_complete": 0, "module": self.page_name}, - pluck="name", - order_by="creation", - ) - def is_permitted(self): """Return true if `Has Role` is not set or the user is allowed.""" from frappe.utils import has_common @@ -160,6 +156,7 @@ class Workspace: self.cards = {"items": self.get_links()} self.charts = {"items": self.get_charts()} self.shortcuts = {"items": self.get_shortcuts()} + self.onboardings = {"items": []} self.quick_lists = {"items": self.get_quick_lists()} self.number_cards = {"items": self.get_number_cards()} self.custom_blocks = {"items": self.get_custom_blocks()} @@ -370,6 +367,7 @@ def get_desktop_page(page: str): "charts": workspace.charts, "shortcuts": workspace.shortcuts, "cards": workspace.cards, + "onboardings": workspace.onboardings, "quick_lists": workspace.quick_lists, "number_cards": workspace.number_cards, "custom_blocks": workspace.custom_blocks, @@ -650,7 +648,7 @@ def prepare_widget(config, doctype, parentfield): @frappe.whitelist() -def update_onboarding_step(name: str, field: str, value: any): +def update_onboarding_step(name: str | int, field: str, value: int | str): """Update status of onboaridng step Args: @@ -687,6 +685,12 @@ def get_onboarding_data(module: str): if onboarding_doc.is_complete: return [] + # Check if user is allowed + allowed_roles = set(onboarding_doc.get_allowed_roles()) + user_roles = set(frappe.get_roles()) + if not allowed_roles & user_roles: + return None + item = { "label": _(module), "title": _(onboarding_doc.title), diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.json b/frappe/desk/doctype/onboarding_step/onboarding_step.json index 45efd216ff..7037c334bf 100644 --- a/frappe/desk/doctype/onboarding_step/onboarding_step.json +++ b/frappe/desk/doctype/onboarding_step/onboarding_step.json @@ -32,7 +32,9 @@ "validate_action", "field", "value_to_validate", - "video_url" + "video_url", + "section_break_ajog", + "route_options" ], "fields": [ { @@ -61,7 +63,7 @@ "fieldname": "action", "fieldtype": "Select", "label": "Action", - "options": "Create Entry\nUpdate Settings\nShow Form Tour\nView Report\nGo to Page\nWatch Video", + "options": "Create Entry\nUpdate Settings\nShow Form Tour\nView Report\nGo to Page\nView Docs", "reqd": 1 }, { @@ -145,7 +147,7 @@ "label": "Is Single" }, { - "depends_on": "eval:doc.action == \"Go to Page\"", + "depends_on": "eval:doc.action == \"Go to Page\" || doc.action === \"View Docs\"", "description": "Example: #Tree/Account", "fieldname": "path", "fieldtype": "Data", @@ -214,10 +216,19 @@ "fieldtype": "Link", "label": "Form Tour", "options": "Form Tour" + }, + { + "fieldname": "section_break_ajog", + "fieldtype": "Section Break" + }, + { + "fieldname": "route_options", + "fieldtype": "Code", + "label": "Route Options" } ], "links": [], - "modified": "2026-02-21 08:37:30.532549", + "modified": "2026-02-23 21:03:51.131292", "modified_by": "Administrator", "module": "Desk", "name": "Onboarding Step", diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.py b/frappe/desk/doctype/onboarding_step/onboarding_step.py index e12e847244..6a6a8b9ea1 100644 --- a/frappe/desk/doctype/onboarding_step/onboarding_step.py +++ b/frappe/desk/doctype/onboarding_step/onboarding_step.py @@ -18,7 +18,7 @@ class OnboardingStep(Document): from frappe.types import DF action: DF.Literal[ - "Create Entry", "Update Settings", "Show Form Tour", "View Report", "Go to Page", "Watch Video" + "Create Entry", "Update Settings", "Show Form Tour", "View Report", "Go to Page", "View Docs" ] action_label: DF.Data | None callback_message: DF.SmallText | None @@ -36,6 +36,7 @@ class OnboardingStep(Document): report_description: DF.Data | None report_reference_doctype: DF.Data | None report_type: DF.Data | None + route_options: DF.Code | None show_form_tour: DF.Check show_full_form: DF.Check title: DF.Data diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index 945a4e5ee2..b5dad9619f 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -109,8 +109,8 @@ import "./frappe/utils/dashboard_utils.js"; import "./frappe/ui/chart.js"; import "./frappe/ui/datatable.js"; import "./frappe/ui/driver.js"; -import "./frappe/ui/user_onboarding/user_onboarding.bundle.js"; import "./frappe/scanner"; import "./frappe/ui/address_autocomplete/autocomplete_dialog.js"; import "./frappe/ui/desktop_icon.html"; +import "./frappe/ui/user_onboarding/user_onboarding.bundle.js"; diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.html b/frappe/public/js/frappe/ui/sidebar/sidebar.html index 7e0d700800..ef5e6d630a 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.html +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.html @@ -42,8 +42,8 @@

      - {%= frappe.utils.icon("getting-started" , "sm", "", "", "text-ink-gray-7 current-color", true)%} - {%= __("Continue Onboarding") %} + {%= frappe.utils.icon("user-check" , "sm", "", "", "text-ink-gray-7 current-color", true)%} + {%= __("Getting started") %}

      @@ -90,6 +90,6 @@
      -
      +
      diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.js b/frappe/public/js/frappe/ui/sidebar/sidebar.js index 281baa107f..84f4665ffd 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.js @@ -78,26 +78,49 @@ frappe.ui.Sidebar = class Sidebar { } } - setup_onboarding() { - let me = this; - this.$onboarding = this.wrapper.find(".user_onboarding"); + remove_onboarding_wrapper() { this.$onboarding.empty(); this.wrapper.find(".onboarding-sidebar").removeClass("hidden"); + } + + setup_onboarding() { + let me = this; + this.$onboarding = this.wrapper.find(".user-onboarding"); + + if (!this.sidebar_data || !this.sidebar_data.module_onboarding) { + this.remove_onboarding_wrapper(); + return; + } + + let module_name = this.sidebar_data.module_onboarding; + + if (this?.onboarding_widget[module_name]) { + return; + } + + this.remove_onboarding_wrapper(); + if (module_name) { + if ( + this?.onboarding_widget[module_name] && + this.onboarding_widget[module_name].hide_panel + ) { + return; + } - if (this.sidebar_data && this.sidebar_data.module_onboarding) { return frappe .call({ method: "frappe.desk.desktop.get_onboarding_data", args: { // send sorted min requirements to increase chance of cache hit - module: this.sidebar_data.module_onboarding, + module: module_name, }, type: "GET", }) .then((data) => { if (data.message?.length > 0) { let onboarding_data = data.message[0]; - me.onboarding_widget = new frappe.ui.UserOnboarding({ + me.onboarding_widget = {}; + me.onboarding_widget[module_name] = new frappe.ui.UserOnboarding({ title: onboarding_data.title, steps: onboarding_data.items, wrapper: me.$onboarding, @@ -133,6 +156,10 @@ frappe.ui.Sidebar = class Sidebar { this.workspace_sidebar_items = updated_items; } setup(workspace_title) { + if (!this.onboarding_widget) { + this.onboarding_widget = {}; + } + $(document).trigger("sidebar_setup", { sidebar: this }); this.sidebar_title = workspace_title; this.check_for_private_workspace(workspace_title); @@ -146,6 +173,10 @@ frappe.ui.Sidebar = class Sidebar { this.setup_onboarding(); this.wrapper.find(".onboarding-sidebar").click(() => { + if (this.sidebar_data?.module_onboarding) { + delete this.onboarding_widget[this.sidebar_data.module_onboarding]; + } + this.setup_onboarding(); }); } diff --git a/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue index 923a0d7f13..68150e9744 100644 --- a/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue +++ b/frappe/public/js/frappe/ui/user_onboarding/OnboardingPanel.vue @@ -45,6 +45,8 @@ const visible = computed({ set: (val) => emit("update:modelValue", val), }); +let skippAll = false; + const completedCount = computed( () => props.steps.filter((step) => step.is_complete || step.is_skipped).length ); @@ -68,10 +70,27 @@ function skipAll(skips) { markSkip(step); } }); + + skippAll = true; +} + +function resetAll(skips) { + skips.forEach((step) => { + if (!step.is_complete && step.is_skipped) { + markReset(step); + } + }); + + skippAll = false; } function handleAction(step) { if (step.is_complete) return; + if (step.is_skipped) return; + + if (step.route_options && typeof step.route_options === "string") { + frappe.route_options = JSON.parse(step.route_options); + } const actions = { "Create Entry": createEntry, @@ -79,6 +98,7 @@ function handleAction(step) { "Update Settings": updateSettings, "View Report": openReport, "Go to Page": goToPage, + "View Docs": viewDocs, }; if (step.action && actions[step.action]) { @@ -88,13 +108,22 @@ function handleAction(step) { } } +function viewDocs(step) { + window.open(step.path, "_blank"); + markComplete(step); +} + function goToPage(step) { + toggleCollapse(); + frappe.set_route(step.path).then(() => { markComplete(step); }); } function openReport(step) { + toggleCollapse(); + const route = frappe.utils.generate_route({ name: step.reference_report, type: "report", @@ -162,7 +191,6 @@ async function createEntry(step) { }; frappe.route_hooks.after_save = callback; - if (step.show_full_form) { frappe.set_route("Form", step.reference_document, "new"); } else { @@ -204,31 +232,42 @@ function markReset(step) {