From 49714e916fd4ed790287294718abf8df91974b5d Mon Sep 17 00:00:00 2001 From: sokumon Date: Sun, 9 Nov 2025 13:47:07 +0530 Subject: [PATCH] chore: rename from app to desk --- frappe/apps.py | 2 +- frappe/auth.py | 2 +- frappe/core/doctype/user/test_user.py | 2 +- frappe/core/doctype/user/user.py | 2 +- frappe/custom/doctype/client_script/ui_test_client_script.js | 2 +- frappe/desk/page/setup_wizard/setup_wizard.js | 4 ++-- frappe/integrations/google_oauth.py | 2 +- frappe/public/js/frappe/ui/dialog.js | 2 +- frappe/public/js/frappe/ui/toolbar/navbar.html | 2 +- frappe/public/js/frappe/views/breadcrumbs.js | 2 +- frappe/public/js/frappe/views/pageview.js | 2 +- frappe/templates/includes/navbar/navbar_login.html | 2 +- frappe/templates/pages/integrations/gcalendar-success.html | 2 +- frappe/tests/test_perf.py | 2 +- frappe/website/page_renderers/not_permitted_page.py | 2 +- frappe/www/apps.py | 2 +- frappe/www/login.py | 4 ++-- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/frappe/apps.py b/frappe/apps.py index 08a68ba3de..69da6b3783 100644 --- a/frappe/apps.py +++ b/frappe/apps.py @@ -81,7 +81,7 @@ def get_default_path(): if len(_apps) == 1: return _apps[0].get("route") or "/apps" elif is_desk_apps(_apps): - return "/app" + return "/desk" return "/apps" diff --git a/frappe/auth.py b/frappe/auth.py index e631fa0c27..b88f2ff88f 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -201,7 +201,7 @@ class LoginManager: frappe.local.cookie_manager.set_cookie("system_user", "yes", deduplicate=True) if not resume: frappe.local.response["message"] = "Logged In" - frappe.local.response["home_page"] = get_default_path() or "/app" + frappe.local.response["home_page"] = get_default_path() or "/desk" if not resume: frappe.response["full_name"] = self.full_name diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py index 0c4704a7d1..77c31d9b09 100644 --- a/frappe/core/doctype/user/test_user.py +++ b/frappe/core/doctype/user/test_user.py @@ -375,7 +375,7 @@ class TestUser(IntegrationTestCase): frappe.set_user("testpassword@example.com") test_user = frappe.get_doc("User", "testpassword@example.com") key = self.reset_password(test_user) - self.assertEqual(update_password(new_password, key=key), "/app") + self.assertEqual(update_password(new_password, key=key), "/desk") self.assertEqual( update_password(new_password, key="wrong_key"), "The reset password link has either been used before or is invalid", diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 63e0eb96e2..9396ddbec3 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -951,7 +951,7 @@ def update_password( frappe.db.set_value("User", user, "reset_password_key", "") if user_doc.user_type == "System User": - return get_default_path() or "/app" + return get_default_path() or "/desk" else: return redirect_url or get_default_path() or get_home_page() diff --git a/frappe/custom/doctype/client_script/ui_test_client_script.js b/frappe/custom/doctype/client_script/ui_test_client_script.js index 0d202d697c..39f73d8487 100644 --- a/frappe/custom/doctype/client_script/ui_test_client_script.js +++ b/frappe/custom/doctype/client_script/ui_test_client_script.js @@ -1,7 +1,7 @@ context("Client Script", () => { before(() => { cy.login(); - cy.visit("/app"); + cy.visit("/desk"); }); it("should run form script in doctype form", () => { diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index 5f9a6a5283..05515f78dd 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -32,7 +32,7 @@ frappe.setup = { frappe.pages["setup-wizard"].on_page_load = function (wrapper) { if (frappe.boot.setup_complete) { - window.location.href = frappe.boot.apps_data.default_path || "/app"; + window.location.href = frappe.boot.apps_data.default_path || "/desk"; } let requires = frappe.boot.setup_wizard_requires || []; frappe.require(requires, function () { @@ -219,7 +219,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { localStorage.current_route = ""; localStorage.current_app = ""; - window.location.href = current_route || frappe.boot.apps_data.default_path || "/app"; + window.location.href = current_route || frappe.boot.apps_data.default_path || "/desk"; }, 2000); } diff --git a/frappe/integrations/google_oauth.py b/frappe/integrations/google_oauth.py index 448de20d03..5aab40ce0c 100644 --- a/frappe/integrations/google_oauth.py +++ b/frappe/integrations/google_oauth.py @@ -173,7 +173,7 @@ def callback(state: str, code: str | None = None, error: str | None = None) -> N along with committing and redirecting us back to frappe site.""" state = json.loads(state) - redirect = state.pop("redirect", "/app") + redirect = state.pop("redirect", "/desk") success_query_param = state.pop("success_query_param", "") failure_query_param = state.pop("failure_query_param", "") diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js index d40385bb85..714edade37 100644 --- a/frappe/public/js/frappe/ui/dialog.js +++ b/frappe/public/js/frappe/ui/dialog.js @@ -249,7 +249,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup { show() { // show it - if (window.location.pathname.startsWith("/app")) { + if (window.location.pathname.startsWith("/desk")) { this.handle_focus(); } diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index bff2900341..9e1ba1c7f7 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -1,7 +1,7 @@
', { diff --git a/frappe/templates/includes/navbar/navbar_login.html b/frappe/templates/includes/navbar/navbar_login.html index 097aca2598..568afeada6 100644 --- a/frappe/templates/includes/navbar/navbar_login.html +++ b/frappe/templates/includes/navbar/navbar_login.html @@ -14,7 +14,7 @@ {%- endif -%} {%- endfor -%} - + diff --git a/frappe/templates/pages/integrations/gcalendar-success.html b/frappe/templates/pages/integrations/gcalendar-success.html index 4138644c17..1ce9ba5bf3 100644 --- a/frappe/templates/pages/integrations/gcalendar-success.html +++ b/frappe/templates/pages/integrations/gcalendar-success.html @@ -9,7 +9,7 @@ {{ _("Success") }}

{{ _("Your connection request to Google Calendar was successfully accepted") }}

-
+
{{ _("Back to Desk") }}