From 04fd2317aeb8f1ca63d1e8735c025b2b70da9cf3 Mon Sep 17 00:00:00 2001 From: sokumon Date: Thu, 2 Jan 2025 15:31:14 +0530 Subject: [PATCH] fix: sidebar sorting only in edit mode --- frappe/public/js/frappe/ui/sidebar.js | 13 +++++++++---- frappe/public/js/frappe/views/breadcrumbs.js | 5 ++--- .../public/js/frappe/views/workspace/workspace.js | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/ui/sidebar.js b/frappe/public/js/frappe/ui/sidebar.js index 3f2ef8004b..9da924f922 100644 --- a/frappe/public/js/frappe/ui/sidebar.js +++ b/frappe/public/js/frappe/ui/sidebar.js @@ -347,14 +347,19 @@ frappe.ui.Sidebar = class Sidebar { $child_item_section.toggleClass("hidden"); }); } - + toggle_sorting() { + this.sorting_items.forEach((item) => { + var state = item.option("disabled"); + item.option("disabled", !state); + }); + } setup_sorting() { if (!this.has_access) return; - + this.sorting_items = []; for (let container of this.$sidebar.find(".nested-container")) { - Sortable.create(container, { + this.sorting_items[this.sorting_items.length] = Sortable.create(container, { group: "sidebar-items", - fitler: ".divider", + disabled: true, onEnd: () => { let sidebar_items = []; for (let container of this.$sidebar.find(".nested-container")) { diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js index e89a0a717b..4500c09180 100644 --- a/frappe/public/js/frappe/views/breadcrumbs.js +++ b/frappe/public/js/frappe/views/breadcrumbs.js @@ -79,9 +79,8 @@ frappe.breadcrumbs = { frappe.workspace_map[breadcrumbs.workspace]?.app && frappe.workspace_map[breadcrumbs.workspace]?.app != frappe.current_app ) { - frappe.app.sidebar.apps_switcher.set_current_app( - frappe.workspace_map[breadcrumbs.workspace].app - ); + let app = frappe.workspace_map[breadcrumbs.workspace].app; + frappe.app.sidebar.apps_switcher.set_current_app(app); } this.toggle(true); diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 14fc3b1e21..7b548b4d1e 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -95,6 +95,7 @@ frappe.views.Workspace = class Workspace { this.editor.isReady.then(() => { this.setup_customization_buttons(this._page); this.make_blocks_sortable(); + frappe.app.sidebar.toggle_sorting(); }); }); } @@ -342,6 +343,7 @@ frappe.views.Workspace = class Workspace { this.editor.readOnly.toggle(); this.is_read_only = true; }); + frappe.app.sidebar.toggle_sorting(); }, null, __("Saving")