From 2c16ad2bfb3115797fcf19582515e6eb62ea9ae1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 15 Mar 2023 13:41:46 +0530 Subject: [PATCH 1/2] fix: sidebar becomes unhidden while removing skeleton --- frappe/public/js/frappe/views/workspace/workspace.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index beb799124c..65d0b583ea 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -1445,15 +1445,15 @@ frappe.views.Workspace = class Workspace { } create_sidebar_skeleton() { - if (this.sidebar.find(".workspace-sidebar-skeleton").length) return; + if ($(".workspace-sidebar-skeleton").length) return; - this.sidebar.prepend(frappe.render_template("workspace_sidebar_loading_skeleton")); - this.sidebar.find(".standard-sidebar-section").addClass("hidden"); + $(frappe.render_template("workspace_sidebar_loading_skeleton")).insertBefore(this.sidebar); + this.sidebar.addClass("hidden"); } remove_sidebar_skeleton() { - this.sidebar.find(".standard-sidebar-section").removeClass("hidden"); - this.sidebar.find(".workspace-sidebar-skeleton").remove(); + this.sidebar.removeClass("hidden"); + $(".workspace-sidebar-skeleton").remove(); } register_awesomebar_shortcut() { From 20eebe7340d733a815df03994ae1c30b4c0d4982 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 15 Mar 2023 13:43:16 +0530 Subject: [PATCH 2/2] fix: hide My Workspace sidebar section if empty in edit mode --- frappe/public/js/frappe/views/workspace/workspace.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 65d0b583ea..af02629038 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -157,7 +157,10 @@ frappe.views.Workspace = class Workspace { sidebar_section.addClass("hidden"); } - if (sidebar_section.find("> [item-is-hidden='0']").length == 0) { + if ( + sidebar_section.find("sidebar-item-container").length && + sidebar_section.find("> [item-is-hidden='0']").length == 0 + ) { sidebar_section.addClass("hidden show-in-edit-mode"); } }