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.

Improve code as per the code reviews.

Matthew Kennedy4a7827048176
diff --git a/api/app/controllers/spree/api/v2/platform/menu_items_controller.rb b/api/app/controllers/spree/api/v2/platform/menu_items_controller.rb
index 28e00dbd91..6442c560aa 100644
--- a/api/app/controllers/spree/api/v2/platform/menu_items_controller.rb
+++ b/api/app/controllers/spree/api/v2/platform/menu_items_controller.rb
@@ -3,7 +3,11 @@ module Spree
module V2
module Platform
class MenuItemsController < ResourceController
+ before_action -> { doorkeeper_authorize! :write, :admin }, only: WRITE_ACTIONS << :reposition
+
def reposition
+ spree_authorize! :update, @moved_item
+
@moved_item = scope.find(params[:moved_item_id])
@new_parent = scope.find(params[:new_parent_id])
new_index = params[:new_position_idx].to_i
diff --git a/api/app/serializers/spree/v2/storefront/menu_item_serializer.rb b/api/app/serializers/spree/v2/storefront/menu_item_serializer.rb
index da20b2b467..80ee63a6a9 100644
--- a/api/app/serializers/spree/v2/storefront/menu_item_serializer.rb
+++ b/api/app/serializers/spree/v2/storefront/menu_item_serializer.rb
@@ -4,7 +4,7 @@ module Spree
class MenuItemSerializer < BaseSerializer
set_type :menu_item
- attributes :item_type, :code, :name, :subtitle, :destination, :new_window, :parent_id, :lft, :rgt, :depth
+ attributes :item_type, :code, :name, :subtitle, :destination, :new_window, :lft, :rgt, :depth
attribute :is_root do |menu_item|
menu_item.root?
@@ -25,6 +25,7 @@ module Spree
serializer: :image
belongs_to :menu
+ belongs_to :parent, record_type: :menu_item, serializer: :menu_item
end
end
end
diff --git a/backend/app/controllers/spree/admin/base_controller.rb b/backend/app/controllers/spree/admin/base_controller.rb
index 80798e1947..78d783163d 100644
--- a/backend/app/controllers/spree/admin/base_controller.rb
+++ b/backend/app/controllers/spree/admin/base_controller.rb
@@ -8,7 +8,7 @@ module Spree
before_action :authorize_admin
before_action :generate_admin_api_key
- before_action :load_data
+ before_action :load_stores
helper_method :admin_oauth_token
@@ -50,8 +50,8 @@ module Spree
Spree::Backend::Config[:locale]
end
- def load_data
- @stores = Spree::Store.accessible_by(current_ability, :show)
+ def load_stores
+ @stores = Spree::Store.accessible_by(current_ability, :show).order(default: :desc)
end
def can_not_transition_without_customer_info
diff --git a/core/app/models/spree/app_configuration.rb b/core/app/models/spree/app_configuration.rb
index c66682d52b..1029b3cf7f 100644
--- a/core/app/models/spree/app_configuration.rb
+++ b/core/app/models/spree/app_configuration.rb
@@ -77,8 +77,8 @@ module Spree
end
# These paths are used if Spree::Frontend is not being used.
- preference :api_product_path, :string, default: 'products'
- preference :api_taxon_path, :string, default: 't'
+ preference :storefront_product_path, :string, default: 'products'
+ preference :storefront_taxon_path, :string, default: 't'
attr_writer :searcher_class
end
diff --git a/core/app/models/spree/menu_item.rb b/core/app/models/spree/menu_item.rb
index bbf6de600e..d987740b61 100644
--- a/core/app/models/spree/menu_item.rb
+++ b/core/app/models/spree/menu_item.rb
@@ -17,7 +17,7 @@ module Spree
LINKED_RESOURCE_TYPE.push(*DYNAMIC_RESOURCE_TYPE)
validates :name, presence: true
- validates :menu_id, presence: true, numericality: { only_integer: true }
+ validates :menu, presence: true
validates :item_type, inclusion: { in: ITEM_TYPE }
validates :linked_resource_type, inclusion: { in: LINKED_RESOURCE_TYPE }
validate :check_for_root, on: :create
@@ -39,7 +39,7 @@ module Spree
self.destination = if frontend_available?
Spree::Core::Engine.routes.url_helpers.nested_taxons_path(linked_resource.permalink)
else
- "/#{Spree::Config[:api_taxon_path]}/#{linked_resource.permalink}"
+ "/#{Spree::Config[:storefront_taxon_path]}/#{linked_resource.permalink}"
end
when 'Spree::Product'
return if linked_resource.nil?
@@ -47,7 +47,7 @@ module Spree
self.destination = if frontend_available?
Spree::Core::Engine.routes.url_helpers.product_path(linked_resource)
else
- "/#{Spree::Config[:api_product_path]}/#{linked_resource.slug}"
+ "/#{Spree::Config[:storefront_product_path]}/#{linked_resource.slug}"
end
when 'Home Page'
@@ -76,9 +76,9 @@ module Spree
end
def paremeterize_code
- if code
- self.code = code.parameterize
- end
+ return if code.blank?
+
+ self.code = code.parameterize
end
end
end
diff --git a/core/app/models/spree/menu_item_image.rb b/core/app/models/spree/menu_item_image.rb
index e817571363..ebe961501f 100644
--- a/core/app/models/spree/menu_item_image.rb
+++ b/core/app/models/spree/menu_item_image.rb
@@ -4,6 +4,8 @@ module Spree
class MenuItemImage < Spree::Asset
has_one_attached :attachment
- validates :attachment, attached: true, content_type: %i[png jpg jpeg gif svg]
+ MENU_ITEM_IMAGE_TYPES = %i[png jpg jpeg gif svg]
+
+ validates :attachment, attached: true, content_type: MENU_ITEM_IMAGE_TYPES
end
end
diff --git a/core/app/models/spree/product.rb b/core/app/models/spree/product.rb
index 796b25d898..6383333ed8 100644
--- a/core/app/models/spree/product.rb
+++ b/core/app/models/spree/product.rb
@@ -96,7 +96,8 @@ module Spree
after_save :reset_memoized_data
after_commit :reset_memoized_data
- around_update :sync_menu_item_paths
+ after_save :sync_menu_item_paths
+ after_commit :sync_menu_item_paths
before_validation :normalize_slug, on: :update
before_validation :validate_master
@@ -328,13 +329,7 @@ module Spree
private
def sync_menu_item_paths
- slug_updated = true if slug_changed?
-
- yield
-
- if slug_updated
- Spree::MenuItem.refresh_paths(self)
- end
+ Spree::MenuItem.refresh_paths(self)
end
def add_associations_from_prototype
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
index 4b29562fb5..bb99127303 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -35,7 +35,8 @@ module Spree
after_save :touch_ancestors_and_taxonomy
after_touch :touch_ancestors_and_taxonomy
- around_update :sync_menu_item_paths
+ after_save :sync_menu_item_paths
+ after_commit :sync_menu_item_paths
has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonImage'
@@ -97,13 +98,7 @@ module Spree
private
def sync_menu_item_paths
- permalink_updated = true if permalink_changed?
-
- yield
-
- if permalink_updated
- Spree::MenuItem.refresh_paths(self)
- end
+ Spree::MenuItem.refresh_paths(self)
end
def touch_ancestors_and_taxonomy
diff --git a/frontend/app/assets/images/meganav/promo_banner_left-first-category.jpg b/frontend/app/assets/images/meganav/promo_banner_left-first-category.jpg
deleted file mode 100644
index a497c6ebe0..0000000000
Binary files a/frontend/app/assets/images/meganav/promo_banner_left-first-category.jpg and /dev/null differ
diff --git a/frontend/app/assets/images/meganav/promo_banner_left-second-category.jpg b/frontend/app/assets/images/meganav/promo_banner_left-second-category.jpg
deleted file mode 100644
index a497c6ebe0..0000000000
Binary files a/frontend/app/assets/images/meganav/promo_banner_left-second-category.jpg and /dev/null differ
diff --git a/frontend/app/assets/images/meganav/promo_banner_left-third-category.jpg b/frontend/app/assets/images/meganav/promo_banner_left-third-category.jpg
deleted file mode 100644
index a497c6ebe0..0000000000
Binary files a/frontend/app/assets/images/meganav/promo_banner_left-third-category.jpg and /dev/null differ
diff --git a/frontend/app/assets/images/meganav/promo_banner_right-first-category.jpg b/frontend/app/assets/images/meganav/promo_banner_right-first-category.jpg
deleted file mode 100644
index a497c6ebe0..0000000000
Binary files a/frontend/app/assets/images/meganav/promo_banner_right-first-category.jpg and /dev/null differ
diff --git a/frontend/app/assets/images/meganav/promo_banner_right-second-category.jpg b/frontend/app/assets/images/meganav/promo_banner_right-second-category.jpg
deleted file mode 100644
index a497c6ebe0..0000000000
Binary files a/frontend/app/assets/images/meganav/promo_banner_right-second-category.jpg and /dev/null differ
diff --git a/frontend/app/assets/images/meganav/promo_banner_right-third-category.jpg b/frontend/app/assets/images/meganav/promo_banner_right-third-category.jpg
deleted file mode 100644
index a497c6ebe0..0000000000
Binary files a/frontend/app/assets/images/meganav/promo_banner_right-third-category.jpg and /dev/null differ
diff --git a/frontend/app/helpers/spree/navigation_helper.rb b/frontend/app/helpers/spree/navigation_helper.rb
index 0adaf6364c..d5044e3d21 100644
--- a/frontend/app/helpers/spree/navigation_helper.rb
+++ b/frontend/app/helpers/spree/navigation_helper.rb
@@ -2,9 +2,17 @@ require 'digest'
module Spree
module NavigationHelper
+ def spree_navigation_data
+ @spree_navigation_data ||= SpreeStorefrontConfig.dig(I18n.locale, :navigation) || SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
+ # safeguard for older Spree installs that don't have spree_navigation initializer
+ # or spree.yml file present
+ rescue
+ []
+ end
+
def spree_nav_cache_key(section = 'header')
@spree_nav_cache_key = begin
- keys = base_cache_key + [current_store, Spree::Config[:logo], stores&.cache_key, section]
+ keys = base_cache_key + [current_store, spree_navigation_data_cache_key, Spree::Config[:logo], stores&.cache_key, section]
Digest::MD5.hexdigest(keys.join('-'))
end
end
@@ -59,8 +67,7 @@ module Spree
private
def spree_navigation_data_cache_key
- # TODO: Fix cache key for new menus
- # @spree_navigation_data_cache_key ||= root_item_for_menu('spree-all-main').self_and_descendants
+ @spree_navigation_data_cache_key ||= Digest::MD5.hexdigest(spree_navigation_data.to_s)
end
end
end
diff --git a/frontend/spec/helpers/navigation_helper_spec.rb b/frontend/spec/helpers/navigation_helper_spec.rb
index 76905a1122..cc13cdde50 100644
--- a/frontend/spec/helpers/navigation_helper_spec.rb
+++ b/frontend/spec/helpers/navigation_helper_spec.rb
@@ -5,6 +5,28 @@ module Spree
include Spree::CurrencyHelper
include Spree::LocaleHelper
+ describe '#spree_navigation_data' do
+ let!(:current_store) { create(:store) }
+
+ context 'fetch via locale' do
+ before { I18n.locale = :fr }
+
+ after { I18n.locale = :en }
+
+ it { expect(spree_navigation_data.first[:title]).to eq('Femmes') }
+ end
+
+ context 'fetch via store code' do
+ before { current_store.update(code: 'fr') }
+
+ it { expect(spree_navigation_data.first[:title]).to eq('Femmes') }
+ end
+
+ context 'fallback to default' do
+ it { expect(spree_navigation_data.first[:title]).to eq('Women') }
+ end
+ end
+
describe '#should_render_internationalization_dropdown?' do
context 'store with multiple currencies' do
let(:current_store) { create(:store, supported_currencies: 'EUR,USD') }