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.

Use polymorphic associations for linked_resources. Make sure Menu name is unique for indexing.

Matthew Kennedy8a1fc0c14462
diff --git a/backend/app/views/spree/admin/menu_items/_link_input.html.erb b/backend/app/views/spree/admin/menu_items/_link_input.html.erb
index d18a0e5cd8..b4c2c2729d 100644
--- a/backend/app/views/spree/admin/menu_items/_link_input.html.erb
+++ b/backend/app/views/spree/admin/menu_items/_link_input.html.erb
@@ -4,9 +4,9 @@
<%= render 'spree/admin/menu_items/link_inputs/url', f: f %>
<% when 'Home Page' %>
<%= render 'spree/admin/menu_items/link_inputs/home_page', f: f %>
- <% when 'Taxon' %>
+ <% when 'Spree::Taxon' %>
<%= render 'spree/admin/menu_items/link_inputs/taxon', linked_resource: linked_resource, f: f %>
- <% when 'Product' %>
+ <% when 'Spree::Product' %>
<%= render 'spree/admin/menu_items/link_inputs/product', linked_resource: linked_resource, f: f %>
<% end %>
</div>
diff --git a/backend/app/views/spree/admin/menus/_form.html.erb b/backend/app/views/spree/admin/menus/_form.html.erb
index 6ea5057105..70525d6c81 100644
--- a/backend/app/views/spree/admin/menus/_form.html.erb
+++ b/backend/app/views/spree/admin/menus/_form.html.erb
@@ -2,7 +2,7 @@
<div class="col-12 col-md-6">
<%= f.field_container :name, class: ['form-group'] do %>
<%= f.label :name, Spree.t(:name) %>
- <%= f.text_field :name, class: 'form-control' %>
+ <%= f.text_field :name, class: 'form-control', required: true %>
<%= f.error_message_on :name %>
<% end %>
</div>
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index b7b6c33d3c..4d5c921902 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -3,6 +3,6 @@ module Spree
has_many :menu_items, dependent: :destroy
has_and_belongs_to_many :stores
- validates :name, presence: true
+ validates :name, presence: true, uniqueness: true
end
end
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index e7fbe1bc56..1cfd6cb123 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -1,6 +1,7 @@
module Spree
class MenuItem < Spree::Base
belongs_to :menu
+ belongs_to :linked_resource, polymorphic: true
acts_as_nested_set dependent: :destroy
@@ -16,7 +17,7 @@ module Spree
LINKED_RESOURCE_TYPE = []
STATIC_RESOURCE_TYPE = ['URL', 'Home Page']
- DYNAMIC_RESOURCE_TYPE = ['Product', 'Taxon']
+ DYNAMIC_RESOURCE_TYPE = ['Spree::Product', 'Spree::Taxon']
LINKED_RESOURCE_TYPE.unshift(*STATIC_RESOURCE_TYPE)
LINKED_RESOURCE_TYPE.push(*DYNAMIC_RESOURCE_TYPE)
@@ -30,12 +31,10 @@ module Spree
return if linked_resource_id.nil?
case linked_resource_type
- when 'Taxon'
- permalink = Spree::Taxon.find(linked_resource_id).permalink
- Spree::Core::Engine.routes.url_helpers.nested_taxons_path(permalink)
- when 'Product'
- product = Spree::Product.find(linked_resource_id)
- Spree::Core::Engine.routes.url_helpers.product_path(product)
+ when 'Spree::Taxon'
+ Spree::Core::Engine.routes.url_helpers.nested_taxons_path(linked_resource.permalink)
+ when 'Spree::Product'
+ Spree::Core::Engine.routes.url_helpers.product_path(linked_resource)
end
else
case linked_resource_type
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 0c820701cc..0f6894d827 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -36,6 +36,8 @@ module Spree
has_many :product_properties, dependent: :destroy, inverse_of: :product
has_many :properties, through: :product_properties
+ has_many :menu_items, as: :linked_resource
+
has_many :classifications, dependent: :delete_all, inverse_of: :product
has_many :taxons, through: :classifications, before_remove: :remove_taxon
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
index aadcdacabc..9898ed2c25 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -13,6 +13,8 @@ module Spree
has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
has_many :products, through: :classifications
+ has_many :menu_items, as: :linked_resource
+
has_many :prototype_taxons, class_name: 'Spree::PrototypeTaxon', dependent: :destroy
has_many :prototypes, through: :prototype_taxons, class_name: 'Spree::Prototype'
diff --git a/core/db/migrate/20210407200948_create_spree_menus.rb b/core/db/migrate/20210407200948_create_spree_menus.rb
index 30c75603e6..36b2cbb88d 100644
--- a/core/db/migrate/20210407200948_create_spree_menus.rb
+++ b/core/db/migrate/20210407200948_create_spree_menus.rb
@@ -6,6 +6,6 @@ class CreateSpreeMenus < ActiveRecord::Migration[6.0]
t.timestamps
end
- add_index :spree_menus, :name
+ add_index :spree_menus, :name, unique: true
end
end
diff --git a/sample/db/samples/menu_items.rb b/sample/db/samples/menu_items.rb
index c20f923cc9..13293b0fa3 100644
--- a/sample/db/samples/menu_items.rb
+++ b/sample/db/samples/menu_items.rb
@@ -11,7 +11,7 @@ MENUS.each do |menu_id|
menu_root_women = Spree::MenuItem.where(
name: 'Women',
item_type: 'Link',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
menu_id: menu_id
).first_or_create!
menu_root_women.linked_resource_id = woman_taxon.id
@@ -21,7 +21,7 @@ MENUS.each do |menu_id|
menu_root_men = Spree::MenuItem.where(
name: 'Men',
item_type: 'Link',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
menu_id: menu_id
).first_or_create!
menu_root_men.linked_resource_id = men_taxon.id
@@ -31,7 +31,7 @@ MENUS.each do |menu_id|
menu_root_sw = Spree::MenuItem.where(
name: 'Sportsware',
item_type: 'Link',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
menu_id: menu_id
).first_or_create!
menu_root_sw.linked_resource_id = sw_taxon.id
@@ -96,7 +96,7 @@ MENUS.each do |menu_id|
summer_promo = Spree::MenuItem.where(
name: 'New Collection',
subtitle: "Summer #{Date.today.year}",
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Promotion',
menu_id: menu_id,
parent_id: promo
@@ -107,7 +107,7 @@ MENUS.each do |menu_id|
special_offer = Spree::MenuItem.where(
name: 'Special Offers',
subtitle: 'Get up to 30% OFF',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Promotion',
menu_id: menu_id,
parent_id: promo
@@ -122,7 +122,7 @@ MENUS.each do |menu_id|
women_skirts_t = Spree::Taxon.find_by!(permalink: 'women/skirts')
women_skirts = Spree::MenuItem.where(
name: 'Skirts',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_women
@@ -133,7 +133,7 @@ MENUS.each do |menu_id|
women_dresses_t = Spree::Taxon.find_by!(permalink: 'women/dresses')
women_dresses = Spree::MenuItem.where(
name: 'Dresses',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_women
@@ -144,7 +144,7 @@ MENUS.each do |menu_id|
women_s_b_t = Spree::Taxon.find_by!(permalink: 'women/shirts-and-blouses')
women_s_b = Spree::MenuItem.where(
name: 'Shirts And Blouses',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_women
@@ -155,7 +155,7 @@ MENUS.each do |menu_id|
women_sweaters_t = Spree::Taxon.find_by!(permalink: 'women/sweaters')
women_sweaters = Spree::MenuItem.where(
name: 'Sweaters',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_women
@@ -166,7 +166,7 @@ MENUS.each do |menu_id|
women_tops_tees_t = Spree::Taxon.find_by!(permalink: 'women/tops-and-t-shirts')
women_tops_tees = Spree::MenuItem.where(
name: 'Tops and T-Shirts',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_women
@@ -177,7 +177,7 @@ MENUS.each do |menu_id|
women_j_c_t = Spree::Taxon.find_by!(permalink: 'women/jackets-and-coats')
women_j_c = Spree::MenuItem.where(
name: 'Jackets and Coats',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_women
@@ -191,7 +191,7 @@ MENUS.each do |menu_id|
men_shirts_t = Spree::Taxon.find_by!(permalink: 'men/shirts')
men_shirts = Spree::MenuItem.where(
name: 'Shirts',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_men
@@ -202,7 +202,7 @@ MENUS.each do |menu_id|
men_t_shirts_t = Spree::Taxon.find_by!(permalink: 'men/t-shirts')
men_t_shirts = Spree::MenuItem.where(
name: 'T-Shirts',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_men
@@ -213,7 +213,7 @@ MENUS.each do |menu_id|
men_sweaters_t = Spree::Taxon.find_by!(permalink: 'men/sweaters')
men_sweaters = Spree::MenuItem.where(
name: 'Sweaters',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_men
@@ -224,7 +224,7 @@ MENUS.each do |menu_id|
men_j_c_t = Spree::Taxon.find_by!(permalink: 'men/jackets-and-coats')
men_j_c = Spree::MenuItem.where(
name: 'Jackets and Coats',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_men
@@ -238,7 +238,7 @@ MENUS.each do |menu_id|
sw_tops_t = Spree::Taxon.find_by!(permalink: 'sportswear/tops')
sw_tops = Spree::MenuItem.where(
name: 'Tops',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_sw
@@ -249,7 +249,7 @@ MENUS.each do |menu_id|
sw_sweatshirts_t = Spree::Taxon.find_by!(permalink: 'sportswear/sweatshirts')
sw_sweatshirts = Spree::MenuItem.where(
name: 'Sweatshirts',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_sw
@@ -260,7 +260,7 @@ MENUS.each do |menu_id|
sw_pants_t = Spree::Taxon.find_by!(permalink: 'sportswear/pants')
sw_pants = Spree::MenuItem.where(
name: 'Pants',
- linked_resource_type: 'Taxon',
+ linked_resource_type: 'Spree::Taxon',
item_type: 'Link',
menu_id: menu_id,
parent_id: menu_cat_sw