vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #37973 from frappe/fix/misc-sidebar-editor

Browse source
This commit is contained in:
Soham Kulkarni 2026-03-25 13:51:51 +05:30 • committed by GitHub
commit 89fd385a60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
frappe/public/js/frappe/ui/sidebar/sidebar_editor.js
View file

@ -84,6 +84,9 @@ export class SidebarEditor {
}
prepare_data() {
this.new_sidebar_items.forEach((item) => {
if (item.parent) {
delete item.parent;
}
if (!item.nested_items) return;
item.nested_items.forEach((nested_item) => {
if (nested_item.parent) {
@ -138,15 +141,15 @@ export class SidebarEditor {
me.sorting = true;
},
onEnd: function (event) {
if (event.from !== event.to) return; // onAdd handles this case
if (me.new_sidebar_items.length == 0) {
me.new_sidebar_items = Array.from(me.workspace_sidebar_items);
}
let old_index = event.oldIndex;
let new_index = event.newIndex;
me.new_sidebar_items[old_index];
let b = me.new_sidebar_items[old_index];
me.new_sidebar_items[old_index] = me.new_sidebar_items[new_index];
me.new_sidebar_items[new_index] = b;
let [item] = me.new_sidebar_items.splice(old_index, 1);
me.new_sidebar_items.splice(new_index, 0, item);
},
});
@ -195,21 +198,16 @@ export class SidebarEditor {
);
},
onEnd: function (event) {
if (event.from !== event.to) return; // onAdd handles this case
let new_index = event.newIndex;
let old_index = event.oldIndex;
let item_label = $(event.item).data("id");
me.new_sidebar_items.forEach((item) => {
if (item.nested_items.length) {
let child = item.nested_items.find(
(child) => child.label === item_label
);
if (child) {
let b = item.nested_items[old_index];
item.nested_items[old_index] = item.nested_items[new_index];
item.nested_items[new_index] = b;
}
}
});
let section_name = $(event.to).parent().attr("item-name");
let section_data = me.get_item_data(section_name);
if (section_data && section_data.nested_items) {
let [item] = section_data.nested_items.splice(old_index, 1);
section_data.nested_items.splice(new_index, 0, item);
}
},
});
});
@ -271,7 +269,11 @@ export class SidebarEditor {
break;
}
if (d.get_value("type") == "Link" && d.get_value("link_type") !== "URL") {
if (
!d.get_value("link_to") &&
d.get_value("type") == "Link" &&
d.get_value("link_type") !== "URL"
) {
d.set_value("link_to", label);
}

2
frappe/public/js/frappe/ui/sidebar/sidebar_item.js
View file

@ -185,7 +185,7 @@ frappe.ui.sidebar_item.TypeSectionBreak = class SectionBreakSidebarItem extends
this.full_template = $(this.wrapper);
}
make() {
if (this.nested_items.length == 0) {
if (this.nested_items.length == 0 && !frappe.app.sidebar.editor.edit_mode) {
return;
}
super.make();

5
frappe/public/scss/desk/sidebar.scss
View file

@ -83,6 +83,7 @@
.standard-sidebar-item {
display: flex;
position: relative;
@include transition(all, 0.3s, cubic-bezier(0.4, 0, 0.2, 1));
margin-bottom: 1px;
@ -297,7 +298,6 @@
.standard-sidebar-item:hover {
& .sidebar-item-edit-controls {
visibility: visible;
width: auto;
}
}
.promotional-banners,
@ -308,9 +308,10 @@
}
.sidebar-item-edit-controls {
visibility: hidden;
position: absolute;
right: 0;
display: flex;
gap: 6px;
width: 0;
}
.standard-sidebar-item[data-name="add-sidebar-item"] {
margin-top: 5px;