From 6561aa37ae0b277d98965a6d4b13c9baf2d2ce1f Mon Sep 17 00:00:00 2001
From: sokumon <sohamkulkarns9@gmail.com>
Date: Thu, 16 Jan 2025 19:02:23 +0530
Subject: [PATCH] fix: apps switcher menu is consistent across pages

---
 frappe/public/js/frappe/ui/apps_switcher.js          | 8 ++++----
 frappe/public/js/frappe/ui/sidebar.js                | 1 +
 frappe/public/js/frappe/views/workspace/workspace.js | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/ui/apps_switcher.js b/frappe/public/js/frappe/ui/apps_switcher.js
index d51c4e817a..96e3144b47 100644
--- a/frappe/public/js/frappe/ui/apps_switcher.js
+++ b/frappe/public/js/frappe/ui/apps_switcher.js
@@ -28,8 +28,8 @@ frappe.ui.AppsSwitcher = class AppsSwitcher {
 			}
 		}
 	}
-	populate_apps_menu() {
-		this.add_private_app();
+	populate_apps_menu(sidebar) {
+		this.add_private_app(sidebar);
 
 		this.add_website_select();
 		this.add_settings_select();
@@ -52,8 +52,8 @@ frappe.ui.AppsSwitcher = class AppsSwitcher {
 		</div>`).appendTo(this.app_switcher_menu);
 	}
 
-	add_private_app() {
-		let private_pages = frappe.app.sidebar.all_pages.filter((p) => p.public === 0);
+	add_private_app(sidebar) {
+		let private_pages = sidebar.all_pages.filter((p) => p.public === 0);
 		if (private_pages.length === 0) return;
 
 		const app = {
diff --git a/frappe/public/js/frappe/ui/sidebar.js b/frappe/public/js/frappe/ui/sidebar.js
index 3b52ac1633..39e3b2cc44 100644
--- a/frappe/public/js/frappe/ui/sidebar.js
+++ b/frappe/public/js/frappe/ui/sidebar.js
@@ -30,6 +30,7 @@ frappe.ui.Sidebar = class Sidebar {
 		];
 
 		this.setup_pages();
+		this.apps_switcher.populate_apps_menu(this);
 	}
 
 	make_dom() {
diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js
index 7b548b4d1e..1e3b4a0297 100644
--- a/frappe/public/js/frappe/views/workspace/workspace.js
+++ b/frappe/public/js/frappe/views/workspace/workspace.js
@@ -48,7 +48,6 @@ frappe.views.Workspace = class Workspace {
 		this.sidebar = frappe.app.sidebar;
 		this.app_switcher_menu = frappe.app.app_switcher_menu;
 		this.sidebar.setup_pages();
-		this.sidebar.apps_switcher.populate_apps_menu();
 		this.cached_pages = $.extend(true, {}, frappe.boot.sidebar_pages);
 		this.has_access = frappe.boot.sidebar_pages.has_access;
 		this.has_create_access = frappe.boot.sidebar_pages.has_create_access;