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.

Fix test by using dedicated root item, improve code.

Matthew Kennedyddd4944d7885
diff --git a/backend/app/controllers/spree/admin/menus_controller.rb b/backend/app/controllers/spree/admin/menus_controller.rb
index 0ebf0e2250..394e545199 100644
--- a/backend/app/controllers/spree/admin/menus_controller.rb
+++ b/backend/app/controllers/spree/admin/menus_controller.rb
@@ -1,8 +1,6 @@
module Spree
module Admin
class MenusController < ResourceController
- before_action :load_menu_items_ordered, only: [:edit, :update]
-
def index; end
private
@@ -10,10 +8,6 @@ module Spree
def location_after_save
spree.edit_admin_menu_path(@menu)
end
-
- def load_menu_items_ordered
- @menu_items = @menu.menu_items.roots.order(:lft)
- end
end
end
end
diff --git a/backend/app/views/spree/admin/menus/edit.html.erb b/backend/app/views/spree/admin/menus/edit.html.erb
index d771c2c088..9ef96ac090 100644
--- a/backend/app/views/spree/admin/menus/edit.html.erb
+++ b/backend/app/views/spree/admin/menus/edit.html.erb
@@ -36,17 +36,20 @@
</div>
</div>
- <% if @menu_items.root.present? %>
- <% @menu_items.roots.each do |item| %>
- <div class="card-body p-0 bg-light">
- <div id="primaryMenuContainer" class="menu-container" data-parent-id="<%= item.id %>">
-
- <% item.children.each do |c| %>
- <%= build_menu_item(@menu, c) %>
+ <% if @menu.root.present? %>
+ <div class="card-body p-0 bg-light">
+ <div id="primaryMenuContainer" class="menu-container" data-parent-id="<%= @menu.root.id %>">
+ <% if @menu.root.children.present? %>
+ <% @menu.root.children.each do |root_children| %>
+ <%= build_menu_item(@menu, root_children) %>
<% end %>
+ <% else %>
+ <div class="alert alert-info no-objects-found m-5">
+ <%= raw Spree.t('admin.navigation.no_menu_items', menu: @menu.name) %>
+ </div>
+ <% end %>
</div>
</div>
- <% end %>
<% end %>
</div>
</div>
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index 5af6a7cfb1..5cf8079457 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -24,6 +24,7 @@ module Spree
validates :menu_id, presence: true, numericality: { only_integer: true }
validates :item_type, inclusion: { in: ITEM_TYPE }
validates :linked_resource_type, inclusion: { in: LINKED_RESOURCE_TYPE }
+ validate :check_for_root, on: :create
def self.refresh_paths(resorce)
where(linked_resource_type: resorce.class.name, linked_resource_id: resorce.id).each(&:save!)
@@ -79,5 +80,11 @@ module Spree
def frontend_available?
Spree::Core::Engine.frontend_available?
end
+
+ def check_for_root
+ if menu.try(:root).present? && parent_id.nil?
+ errors.add(:root_conflict, 'This Menu already has a root item')
+ end
+ end
end
end
diff --git a/frontend/spec/features/locale_spec.rb b/frontend/spec/features/locale_spec.rb
index 737a0f6117..1795213956 100644
--- a/frontend/spec/features/locale_spec.rb
+++ b/frontend/spec/features/locale_spec.rb
@@ -6,10 +6,10 @@ describe 'setting locale', type: :feature, js: true do
let!(:main_menu) { create(:menu, name: 'Main Menu', unique_code: 'spree-all-main', store_ids: [store.id]) }
- let!(:mi_root) { create(:menu_item, name: 'URL', menu_id: main_menu.id, destination: 'https://spree.com') }
- let!(:mi_home) { create(:menu_item, name: 'Home', menu_id: main_menu.id, linked_resource_type: 'Home Page') }
- let!(:mi_ta) { create(:menu_item, name: 'Taxon', menu_id: main_menu.id, linked_resource_type: 'Spree::Taxon') }
- let!(:mi_pro) { create(:menu_item, name: 'Product', menu_id: main_menu.id, linked_resource_type: 'Spree::Product') }
+ let!(:mi_root) { create(:menu_item, name: 'URL', menu_id: main_menu.id, parent_id: main_menu.root.id, destination: 'https://spree.com') }
+ let!(:mi_home) { create(:menu_item, name: 'Home', menu_id: main_menu.id, parent_id: main_menu.root.id, linked_resource_type: 'Home Page') }
+ let!(:mi_ta) { create(:menu_item, name: 'Taxon', menu_id: main_menu.id, parent_id: main_menu.root.id, linked_resource_type: 'Spree::Taxon') }
+ let!(:mi_pro) { create(:menu_item, name: 'Product', menu_id: main_menu.id, parent_id: main_menu.root.id, linked_resource_type: 'Spree::Product') }
let!(:tax_x) { create(:taxon) }
let!(:pr_x) { create(:product_in_stock, taxons: [tax_x]) }