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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Resolve an issue with menus when the Spree::Frontend is not defined.
Matthew Kennedydbaafbba70c1
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.erbindex b4c2c2729d..3570c18bdf 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@@ -1,12 +1,16 @@<div id="linkResourcePanel" data-panel-type="<%= linked_resource %>">- <% case linked_resource %>- <% when 'URL' %>+ <% if defined?(Spree::Frontend) %>+ <% case linked_resource %>+ <% when 'URL' %>+ <%= 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 'Spree::Taxon' %>+ <%= render 'spree/admin/menu_items/link_inputs/taxon', linked_resource: linked_resource, f: f %>+ <% when 'Spree::Product' %>+ <%= render 'spree/admin/menu_items/link_inputs/product', linked_resource: linked_resource, f: f %>+ <% end %>+ <% else %><%= 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 'Spree::Taxon' %>- <%= render 'spree/admin/menu_items/link_inputs/taxon', linked_resource: linked_resource, f: f %>- <% 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/menu_items/link_inputs/_home_page.html.erb b/backend/app/views/spree/admin/menu_items/link_inputs/_home_page.html.erbindex f46237002e..9437dd56e8 100644--- a/backend/app/views/spree/admin/menu_items/link_inputs/_home_page.html.erb+++ b/backend/app/views/spree/admin/menu_items/link_inputs/_home_page.html.erb@@ -1,11 +1,3 @@<div class="alert alert-info mt-3"><%= Spree.t('admin.navigation.this_link_takes_you_to_your_stores_home_page') %></div>--<!-- Spec Tests fail if this is used- even using something as simple as <%#= spree.root_path %>- fails the tests with undefinded method.-- Not sure why.--<span class="d-none">Links to: <%#= @menu_item.destination %></span> -->diff --git a/backend/app/views/spree/admin/menu_items/link_inputs/_product.html.erb b/backend/app/views/spree/admin/menu_items/link_inputs/_product.html.erbindex 844ab81b24..ea9056ac9e 100644--- a/backend/app/views/spree/admin/menu_items/link_inputs/_product.html.erb+++ b/backend/app/views/spree/admin/menu_items/link_inputs/_product.html.erb@@ -2,5 +2,5 @@<%= f.label :linked_resource_id, Spree.t('product') %><%= f.select :linked_resource_id, options_from_collection_for_select(@products, :id, :name, @menu_item.linked_resource_id), {include_blank: true}, multiple: false, class: 'select2-clear' %><%= f.error_message_on :linked_resource_id %>- <small class="form-text text-muted d-none"><%#= @menu_item.destination %></small>+ <small class="form-text text-muted"><%= menu_item_link_to(@menu_item) %></small><% end %>diff --git a/backend/app/views/spree/admin/menu_items/link_inputs/_taxon.html.erb b/backend/app/views/spree/admin/menu_items/link_inputs/_taxon.html.erbindex 2eb8f3a6db..53e76eca8f 100644--- a/backend/app/views/spree/admin/menu_items/link_inputs/_taxon.html.erb+++ b/backend/app/views/spree/admin/menu_items/link_inputs/_taxon.html.erb@@ -2,5 +2,5 @@<%= f.label :linked_resource_id, Spree.t('taxon') %><%= f.select :linked_resource_id, options_from_collection_for_select(@taxons, :id, :pretty_name, @menu_item.linked_resource_id), {include_blank: true}, multiple: false, class: 'select2-clear' %><%= f.error_message_on :linked_resource_id %>- <small class="form-text text-muted d-none"><%#= @menu_item.destination %></small>+ <small class="form-text text-muted"><%= menu_item_link_to(@menu_item) %></small><% end %>diff --git a/backend/app/views/spree/admin/menu_items/link_inputs/_url.html.erb b/backend/app/views/spree/admin/menu_items/link_inputs/_url.html.erbindex 160f8476fb..88e2602f9e 100644--- a/backend/app/views/spree/admin/menu_items/link_inputs/_url.html.erb+++ b/backend/app/views/spree/admin/menu_items/link_inputs/_url.html.erb@@ -2,7 +2,6 @@<%= f.field_container :url, class: ['form-group'] do %><%= f.label :url, Spree.t(:url) %><%= f.text_field :url, class: 'form-control' %>- <small class="form-text text-muted"><%= @menu_item.destination %></small><%= f.error_message_on :url %><% end %>diff --git a/core/app/helpers/spree/base_helper.rb b/core/app/helpers/spree/base_helper.rbindex 7bfad08180..43c0cde028 100644--- a/core/app/helpers/spree/base_helper.rb+++ b/core/app/helpers/spree/base_helper.rb@@ -25,6 +25,28 @@ module Spreeto_htmlend+ def menu_item_link_to(item)+ if Spree::MenuItem::DYNAMIC_RESOURCE_TYPE.include? item.linked_resource_type+ return if item.linked_resource.nil?++ case item.linked_resource_type+ when 'Spree::Product'+ spree.product_path(item.linked_resource)+ when 'Spree::Taxon'+ spree.nested_taxons_path(item.linked_resource.permalink)+ end+ else+ case item.linked_resource_type+ when 'URL'+ url+ when 'Home Page'+ spree.root_path+ else+ '#'+ end+ end+ end+def display_compare_at_price(product_or_variant)product_or_variant.price_in(current_currency).diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rbindex ad5bfa9217..36f9b8f7eb 100644--- a/core/app/models/spree/menu_item.rb+++ b/core/app/models/spree/menu_item.rb@@ -16,38 +16,20 @@ module SpreeITEM_TYPE = %w[Link Promotion Container]- LINKED_RESOURCE_TYPE = []- STATIC_RESOURCE_TYPE = ['URL', 'Home Page']+ LINKED_RESOURCE_TYPE = ['URL']+ STATIC_RESOURCE_TYPE = ['Home Page']DYNAMIC_RESOURCE_TYPE = ['Spree::Product', 'Spree::Taxon']- LINKED_RESOURCE_TYPE.unshift(*STATIC_RESOURCE_TYPE)- LINKED_RESOURCE_TYPE.push(*DYNAMIC_RESOURCE_TYPE)+ if defined?(Spree::Frontend)+ LINKED_RESOURCE_TYPE.unshift(*STATIC_RESOURCE_TYPE)+ LINKED_RESOURCE_TYPE.push(*DYNAMIC_RESOURCE_TYPE)+ endvalidates :name, presence: truevalidates :menu_id, presence: true, numericality: { only_integer: true }validates :item_type, inclusion: { in: ITEM_TYPE }validates :linked_resource_type, inclusion: { in: LINKED_RESOURCE_TYPE }- def destination- if DYNAMIC_RESOURCE_TYPE.include? linked_resource_type- return if linked_resource.nil?-- case linked_resource_type- when 'Spree::Taxon'- nested_taxons_path(linked_resource.permalink)- when 'Spree::Product'- product_path(linked_resource)- end- else- case linked_resource_type- when 'URL'- url- when 'Home Page'- root_path- end- end- end-privatedef reset_link_attributesdiff --git a/core/spec/models/spree/menu_item_spec.rb b/core/spec/models/spree/menu_item_spec.rbindex 4889046498..92385324df 100644--- a/core/spec/models/spree/menu_item_spec.rb+++ b/core/spec/models/spree/menu_item_spec.rb@@ -40,23 +40,4 @@ describe Spree::MenuItem, type: :model doexpect(described_class.new(name: 'Main Menu', menu_id: menu.id, item_type: 'Link', linked_resource_type: 'Purple')).not_to be_validendend-- describe '.destination' do- let!(:taxon) { create(:taxon) }- let!(:product) { create(:product) }- let!(:menu) { create(:menu, name: 'Main Menu') }-- let!(:menu_item_url) { create(:menu_item, menu_id: menu.id, linked_resource_type: 'URL', url: 'https://test.the.link.com') }- let!(:menu_item_home_page) { create(:menu_item, menu_id: menu.id, linked_resource_type: 'Home Page') }- let!(:menu_item_product) { create(:menu_item, menu_id: menu.id, linked_resource_type: 'Spree::Product', linked_resource_id: product.id) }- let!(:menu_item_taxon) { create(:menu_item, menu_id: menu.id, linked_resource_type: 'Spree::Taxon', linked_resource_id: taxon.id) }-- it 'returns url when type is URL' do- expect(menu_item_url.destination).to eq(menu_item_url.url)- end-- # it 'returns product path when type is Spree::Product' do- # expect(menu_item_product.destination).to eq()- # end- endenddiff --git a/frontend/app/helpers/spree/menu_helper.rb b/frontend/app/helpers/spree/menu_helper.rbdeleted file mode 100644index 0d823fc910..0000000000--- a/frontend/app/helpers/spree/menu_helper.rb+++ /dev/null@@ -1,4 +0,0 @@-module Spree- module MenuHelper- end-enddiff --git a/frontend/app/views/spree/shared/_main_nav_bar.html.erb b/frontend/app/views/spree/shared/_main_nav_bar.html.erbindex 7b3089e792..624419bcdd 100644--- a/frontend/app/views/spree/shared/_main_nav_bar.html.erb+++ b/frontend/app/views/spree/shared/_main_nav_bar.html.erb@@ -10,7 +10,7 @@<% dropdown_toggle_class = has_dropdown ? "dropdown-toggle" : "" %><% data_attr = has_dropdown ? { toggle: "dropdown" } : {} %><% aria_attr = has_dropdown ? { haspopup: true, expanded: false } : {} %>- <%= link_to(item.name, item.destination, class: "nav-link main-nav-bar-item main-nav-bar-category-button #{dropdown_toggle_class}", data: data_attr, aria: aria_attr) %>+ <%= link_to(item.name, menu_item_link_to(item), class: "nav-link main-nav-bar-item main-nav-bar-category-button #{dropdown_toggle_class}", data: data_attr, aria: aria_attr) %><% if has_dropdown %><div class="dropdown-menu w-100 shadow main-nav-bar-category-dropdown"><div class="container p-0 d-flex justify-content-xl-around mx-auto">@@ -27,7 +27,7 @@<ul class="pl-0"><% child.children.each do |category_link| %><li>- <%= link_to category_link.name, category_link.destination, class: "text-uppercase main-nav-bar-category-links dropdown-item" %>+ <%= link_to category_link.name, menu_item_link_to(category_link), class: "text-uppercase main-nav-bar-category-links dropdown-item" %></li><% end %></ul>@@ -39,10 +39,10 @@<% if child.name == 'Promos' && child.item_type == 'Container' %><% if child.children.present? %><% child.children.each do |promo_banner| %>- <%= link_to promo_banner.destination, class: "dropdown-item" do %>+ <%= link_to menu_item_link_to(promo_banner), class: "dropdown-item" do %><div class="category-image text-center mx-3"><% if promo_banner.image_asset.attached? && promo_banner.image_asset.image? %>- <%= image_tag main_app.url_for(promo_banner.image_asset), title: promo_banner.subtitle %>+ <%= image_tag main_app.url_for(promo_banner.image_asset), title: promo_banner.subtitle %><% end %><div class="category-box"><div class="category-box-small-text">