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
Add default locale fallbacks for permalinks
Rafal Cymerys6a2e44537556
diff --git a/api/app/controllers/spree/api/v2/storefront/products_controller.rb b/api/app/controllers/spree/api/v2/storefront/products_controller.rbindex 6e911dacf6..6b33a14089 100644--- a/api/app/controllers/spree/api/v2/storefront/products_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/products_controller.rb@@ -16,7 +16,7 @@ module Spreeenddef resource- @resource ||= scope.find_by(slug: params[:id]) || scope.find(params[:id])+ @resource ||= find_with_fallback_default_locale { scope.find_by(slug: params[:id]) } || scope.find(params[:id])enddef collection_sorterdiff --git a/api/app/controllers/spree/api/v2/storefront/taxons_controller.rb b/api/app/controllers/spree/api/v2/storefront/taxons_controller.rbindex 81e4d369a2..400c0ef5f4 100644--- a/api/app/controllers/spree/api/v2/storefront/taxons_controller.rb+++ b/api/app/controllers/spree/api/v2/storefront/taxons_controller.rb@@ -22,7 +22,7 @@ module Spreeenddef resource- @resource ||= scope.find_by(permalink: params[:id]) || scope.find(params[:id])+ @resource ||= find_with_fallback_default_locale { scope.find_by(permalink: params[:id]) } || scope.find(params[:id])enddef model_classdiff --git a/api/spec/requests/spree/api/v2/storefront/products_spec.rb b/api/spec/requests/spree/api/v2/storefront/products_spec.rbindex 1e60077f58..c2531d86a9 100644--- a/api/spec/requests/spree/api/v2/storefront/products_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/products_spec.rb@@ -1018,6 +1018,38 @@ describe 'API V2 Storefront Products Spec', type: :request doendend+ context 'with slug fallback to default locale' do+ let(:store2) { create(:store, default_locale: 'en', supported_locales: 'en,pl,es') }+ let!(:product_with_slug) { create(:product, stores: [store2], slug: default_locale_slug) }+ let(:default_locale_slug) { 'test_slug_en' }++ before do+ allow_any_instance_of(Spree::Api::V2::Storefront::ProductsController).to receive(:current_store).and_return(store2)+ get "/api/v2/storefront/products/#{default_locale_slug}?locale=pl"+ end++ it 'finds the product' do+ expect(json_response['data']['id']).to eq(product_with_slug.id.to_s)+ end+ end++ context 'with slug in translated locale' do+ let(:store2) { create(:store, default_locale: 'en', supported_locales: 'en,pl,es') }+ let(:product_with_slug) { create(:product, stores: [store2], slug: default_locale_slug) }+ let!(:translation2) { product_with_slug.translations.create(slug: translated_slug, locale: 'es') }+ let(:default_locale_slug) { 'test_slug_en' }+ let(:translated_slug) { 'test_slug_es' }++ before do+ allow_any_instance_of(Spree::Api::V2::Storefront::ProductsController).to receive(:current_store).and_return(store2)+ get "/api/v2/storefront/products/#{translated_slug}?locale=es"+ end++ it 'finds the product' do+ expect(json_response['data']['id']).to eq(product_with_slug.id.to_s)+ end+ end+context 'with product image data' doshared_examples 'returns product image data' doit 'returns product image data' dodiff --git a/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb b/api/spec/requests/spree/api/v2/storefront/taxons_spec.rbindex f01420fbac..2281e184c6 100644--- a/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/taxons_spec.rb@@ -222,7 +222,7 @@ describe 'Taxons Spec', type: :request dolet(:store2) { create(:store, default_locale: 'en', supported_locales: 'en,pl,es') }let(:taxonomy) { create(:taxonomy, name: 'categories', store: store2) }let!(:taxon_with_slug) { create(:taxon, taxonomy: taxonomy, permalink: 'test_slug_en') }- let!(:translations) { taxon_with_slug.translations.create([{ permalink: 'test_slug_pl', locale: 'pl' }, { slug: 'test_slug_es', locale: 'es' } ])}+ let!(:translations) { taxon_with_slug.translations.create([{ permalink: 'test_slug_pl', locale: 'pl' }, { permalink: 'test_slug_es', locale: 'es' } ])}let(:expected_slugs) do{@@ -242,6 +242,40 @@ describe 'Taxons Spec', type: :request doendend+ context 'with fallback to default locale' do+ let(:store2) { create(:store, default_locale: 'en', supported_locales: 'en,pl,es') }+ let(:taxonomy) { create(:taxonomy, name: 'categories', store: store2) }+ let!(:taxon_with_slug) { create(:taxon, taxonomy: taxonomy, name: 'test slug en', permalink: default_locale_slug) }+ let(:default_locale_slug) { 'test_slug_en' }++ before do+ allow_any_instance_of(Spree::Api::V2::Storefront::TaxonsController).to receive(:current_store).and_return(store2)+ get "/api/v2/storefront/taxons/categories/#{default_locale_slug}?locale=es"+ end++ it 'finds the taxon' do+ expect(json_response['data']['id']).to eq(taxon_with_slug.id.to_s)+ end+ end++ context 'with slug in translated locale' do+ let(:store2) { create(:store, default_locale: 'en', supported_locales: 'en,pl,es') }+ let(:taxonomy) { create(:taxonomy, name: 'categories', store: store2) }+ let!(:taxon_with_slug) { create(:taxon, taxonomy: taxonomy, permalink: default_locale_slug) }+ let!(:translations) { taxon_with_slug.translations.create([ { name: 'test slug en', permalink: translated_slug, locale: 'es' } ]) }+ let(:default_locale_slug) { 'test_slug_en' }+ let(:translated_slug) { 'test_slug_es' }++ before do+ allow_any_instance_of(Spree::Api::V2::Storefront::TaxonsController).to receive(:current_store).and_return(store2)+ get "/api/v2/storefront/taxons/categories/#{translated_slug}?locale=es"+ end++ it 'finds the taxon' do+ expect(json_response['data']['id']).to eq(taxon_with_slug.id.to_s)+ end+ end+context 'with taxon image data' doshared_examples 'returns taxon image data' doit 'returns taxon image data' dodiff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rbindex dd232593d8..d63688afc7 100644--- a/api/spec/spec_helper.rb+++ b/api/spec/spec_helper.rb@@ -82,6 +82,10 @@ RSpec.configure do |config|country = create(:country, name: 'United States of America', iso_name: 'UNITED STATES', iso: 'US', iso3: 'USA', states_required: true)create(:store, default: true, default_country: country, default_currency: 'USD')++ # Request specs to paths with ?locale=xx don't reset the locale afterwards+ # Some tests assume that the current locale is :en, so we ensure it here+ I18n.locale = :enendconfig.order = :randomdiff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rbindex 5273a303a2..841ee391db 100644--- a/core/lib/spree/core/controller_helpers/locale.rb+++ b/core/lib/spree/core/controller_helpers/locale.rb@@ -68,6 +68,16 @@ module SpreeI18n.locale.to_send++ def find_with_fallback_default_locale(&block)+ result = begin+ block.call+ rescue ActiveRecord::RecordNotFound => _e+ nil+ end++ result || Mobility.with_locale(current_store.default_locale) { block.call }+ endendendend