Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Update menu leveling.

Matthew Kennedyc9e20fcd8655
diff --git a/backend/app/assets/javascripts/spree/backend/admin.js b/backend/app/assets/javascripts/spree/backend/admin.js
index 8748ff6386..9a9e871fdc 100644
--- a/backend/app/assets/javascripts/spree/backend/admin.js
+++ b/backend/app/assets/javascripts/spree/backend/admin.js
@@ -65,6 +65,9 @@ $(document).ready(function() {
el.parents('tr').fadeOut('hide', function() {
$(this).remove()
})
+ el.parents('div.menu-item').fadeOut('hide', function() {
+ $(this).remove()
+ })
}
}).fail(function(response) {
show_flash('error', response.responseText)
diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss b/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
index 921d4fda57..cefc9065b1 100644
--- a/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
+++ b/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
@@ -1,11 +1,13 @@
$item-padding: 0;
+$main-items-border-color: rgba(0, 0, 0, 0.125);
$nestable-background-color: rgb(214, 214, 214);
#menuArea {
.space-buttons a {
margin: 2px;
}
- .menu-item {
+
+ .standard-item-row {
background-color: white;
padding: $item-padding;
border: 1px solid $border-color;
@@ -14,20 +16,21 @@ $nestable-background-color: rgb(214, 214, 214);
border-right: none;
}
- .container-info-row {
+ .container-item-row {
border: 1px solid $nestable-background-color;
border-right: none;
padding: $item-padding;
background-color:$nestable-background-color;
}
- .menu-container {
- margin-left: 50px;
- background-color: var(--light);
- }
-
.menu-container-item {
padding: 0;
+ background-color: var(--light);
+
+ .menu-container {
+ margin-left: 50px;
+ background-color: var(--light);
+ }
}
#primaryMenuContainer {
@@ -36,16 +39,16 @@ $nestable-background-color: rgb(214, 214, 214);
margin-left: 0;
}
- #primaryMenuContainer > div.menu-item {
+ #primaryMenuContainer > div.standard-item-row {
border-left: 1px solid transparent;
}
- #primaryMenuContainer > div.menu-item:first-child {
+ #primaryMenuContainer > div.standard-item-row:first-child {
border-top: 1px solid transparent;
border-left: 1px solid transparent;
}
- .menu-item.menu-item-dragged {
+ .standard-item-row.menu-item-dragged {
border: 1px solid $border-color;
}
}
diff --git a/backend/app/helpers/spree/admin/menu_helper.rb b/backend/app/helpers/spree/admin/menu_helper.rb
index 3b3cb88dfa..4371a1337d 100644
--- a/backend/app/helpers/spree/admin/menu_helper.rb
+++ b/backend/app/helpers/spree/admin/menu_helper.rb
@@ -4,31 +4,40 @@ module Spree
def build_menu_item(menu, item)
if item.container
dragable = nil
- klazz = 'container-info-row'
+ klazz = 'container-item-row'
menu_item_that_accepts_nested_items(menu, item, klazz, dragable)
else
dragable = 'dragable'
- klazz = 'menu-item'
+ klazz = 'standard-item-row'
standard_menu_item(menu, item, klazz, dragable)
end
end
def standard_menu_item(menu, item, klazz, dragable)
- edit_button = link_to_edit(item, no_text: true, class: 'btn btn-outline-secondary btn-sm', url: spree.edit_admin_menu_menu_item_path(menu, item))
+ edit_button = link_to_edit(item, no_text: true, url: spree.edit_admin_menu_menu_item_path(menu, item))
delete_button = link_to_delete(item, no_text: true, url: spree.admin_menu_menu_item_path(menu, item)) if can?(:destroy, item)
move_handle = content_tag(:div, svg_icon(name: 'sort.svg', width: '20', height: '20'), class: 'move-handle d-flex align-items-center p-3')
description_area = content_tag(:div, item.name, class: 'd-flex align-items-center w-100')
buttons_area = content_tag(:div, edit_button + delete_button, class: 'd-flex align-items-center space-buttons px-2')
- content_tag(:div, move_handle + description_area + buttons_area, class: "#{klazz} #{dragable} d-flex flex-nowrap")
+ content_tag(:div, move_handle + description_area + buttons_area, class: "#{klazz} #{dragable} d-flex flex-nowrap #{'menu-item' if !item.container}", data: {item_id: item.id, parent_id: item.parent_id})
end
def menu_item_that_accepts_nested_items(menu, item, klazz, dragable)
info_row = standard_menu_item(menu, item, klazz, dragable)
sub_menu_container = content_tag(:div, nil, class: 'menu-container')
- content_tag(:div, info_row + sub_menu_container, class: 'menu-container-item dragable')
+ content_tag(:div, info_row + sub_menu_container, class: 'menu-item menu-container-item dragable', data: {item_id: item.id})
+ end
+
+
+
+
+ def child_check(objp)
+ nested_set_options(objp) do |child_item|
+ child_item.name
+ end
end
# this is not used at the moment
diff --git a/backend/app/views/spree/admin/menus/edit.html.erb b/backend/app/views/spree/admin/menus/edit.html.erb
index 6cefa2ad90..cd1d02be4d 100644
--- a/backend/app/views/spree/admin/menus/edit.html.erb
+++ b/backend/app/views/spree/admin/menus/edit.html.erb
@@ -35,14 +35,15 @@
</div>
</div>
</div>
+
<div class="card-body" style="padding: 0;">
<div id="primaryMenuContainer" class="menu-container">
- <% @menu.menu_items.each do |menu_item| %>
- <%= build_menu_item(@menu, menu_item) %>
+ <% @menu.menu_items.each_with_level(@menu.menu_items.root.self_and_descendants) do |item, level| %>
+ <%= build_menu_item(@menu, item) %>
<% end %>
</div>
</div>
- </div>
+ </div>
</div>
</div>
</div>
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index 23b7dfa284..6f86ecd71a 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -4,6 +4,9 @@ module Spree
acts_as_nested_set
+ after_save :touch_ancestors
+ after_touch :touch_ancestors
+
has_one_attached :image_asset
# Not frozen so they can be added to
@@ -18,5 +21,11 @@ module Spree
validates :name, presence: true
validates :item_type, inclusion: { in: ITEM_TYPE }
validates :linked_resource_type, inclusion: { in: LINKED_RESOURCE_TYPE }
+
+
+ def touch_ancestors
+ # Touches all ancestors at once to avoid recursive taxonomy touch, and reduce queries.
+ ancestors.update_all(updated_at: Time.current)
+ end
end
end