From 575b76888743f3b78fcf032ed53c6d5108d33232 Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 20 Jan 2026 12:06:47 +0530 Subject: [PATCH 1/2] fix: explicity show the sidebar for the desktop icon --- frappe/desk/page/desktop/desktop.js | 18 +++--------------- frappe/public/js/frappe/ui/sidebar/sidebar.js | 6 +++++- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/frappe/desk/page/desktop/desktop.js b/frappe/desk/page/desktop/desktop.js index c06e9cc85f..8fa8aa8c79 100644 --- a/frappe/desk/page/desktop/desktop.js +++ b/frappe/desk/page/desktop/desktop.js @@ -91,6 +91,9 @@ function get_route(desktop_icon) { type: first_link.link_type, name: first_link.link_to, tab: first_link.tab, + route_options: { + sidebar: desktop_icon.label, + }, }); } } @@ -998,21 +1001,6 @@ class DesktopIcon { } this.icon.attr("href", this.icon_route); } - if (this.icon_data.sidebar) { - const me = this; - this.icon.on("click", function () { - if (me.icon_data.sidebar == "My Workspaces") { - let sidebar_name = me.icon_data.sidebar.toLowerCase(); - if (frappe.boot.workspace_sidebar_item[sidebar_name].items.length == 0) { - frappe.toast("No Private Workspaces for user"); - } else { - let workspace_name = - frappe.boot.workspace_sidebar_item[sidebar_name].items[0]["link_to"]; - frappe.set_route("Workspaces", "private", workspace_name); - } - } - }); - } } render_folder_thumbnail() { diff --git a/frappe/public/js/frappe/ui/sidebar/sidebar.js b/frappe/public/js/frappe/ui/sidebar/sidebar.js index 205f0766ef..98b501ad02 100644 --- a/frappe/public/js/frappe/ui/sidebar/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar/sidebar.js @@ -113,7 +113,11 @@ frappe.ui.Sidebar = class Sidebar { setup_events() { const me = this; frappe.router.on("change", function (router) { - frappe.app.sidebar.set_workspace_sidebar(router); + if (frappe.route_options.sidebar) { + frappe.app.sidebar.setup(frappe.route_options.sidebar); + } else { + frappe.app.sidebar.set_workspace_sidebar(router); + } }); $(document).on("page-change", function () { frappe.app.sidebar.toggle(); From 44a5621dfa73375e9d9aa024f4adfb2c84ada66d Mon Sep 17 00:00:00 2001 From: sokumon Date: Tue, 20 Jan 2026 12:20:46 +0530 Subject: [PATCH 2/2] fix: show the correct result in awesomebar --- frappe/public/js/frappe/ui/toolbar/awesome_bar.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js index c5850990f7..be85e825e6 100644 --- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js @@ -110,6 +110,9 @@ frappe.search.AwesomeBar = class AwesomeBar { if (d.type == "Desktop Icon") { target = frappe.utils.get_route_for_icon(d.icon_data); d.route = target; + d.route_options = { + sidebar: d.icon_data.label, + }; } let html = `${__(d.label || d.value)}`;