From 6aec38501883588ad860bb4dab01a960fbc0ac90 Mon Sep 17 00:00:00 2001 From: Sumit Bhanushali Date: Wed, 25 Sep 2024 11:38:26 +0530 Subject: [PATCH] fix: show first workspace of current selected app on app switch --- frappe/public/js/frappe/router.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index a5f0b19212..01f8443081 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -470,7 +470,8 @@ frappe.router = { // 1. User's default workspace in user doctype // 2. Private home // 3. Public home - // 4. First workspace in list + // 4. First workspace in list of current app + // 5. First workspace in list let private_home = `home-${frappe.user.name.toLowerCase()}`; let default_workspace = frappe.router.slug(frappe.boot.user.default_workspace?.name || ""); @@ -478,6 +479,7 @@ frappe.router = { frappe.workspaces[default_workspace] || frappe.workspaces[private_home] || frappe.workspaces["home"] || + Object.values(frappe.workspace_map).find((w) => w.app === frappe.current_app) || Object.values(frappe.workspaces)[0]; if (workspace) {