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.

Add guard clauses for page urls so it doesn't break if the url doesn't exist

Łukasz Adamczyk170995fd290e
diff --git a/admin/app/helpers/spree/admin/page_builder_helper.rb b/admin/app/helpers/spree/admin/page_builder_helper.rb
index 6b5be82436..4bc636bd73 100644
--- a/admin/app/helpers/spree/admin/page_builder_helper.rb
+++ b/admin/app/helpers/spree/admin/page_builder_helper.rb
@@ -118,6 +118,13 @@ module Spree
end
end
end
+
+ def page_preview_url
+ preview_url = @page.preview_url(@theme_preview, @page_preview)
+ return if preview_url.blank?
+
+ "#{preview_url}&page_builder=true"
+ end
end
end
end
diff --git a/admin/app/views/layouts/spree/page_builder.html.erb b/admin/app/views/layouts/spree/page_builder.html.erb
index 35a4dd7e21..5497f1a56c 100644
--- a/admin/app/views/layouts/spree/page_builder.html.erb
+++ b/admin/app/views/layouts/spree/page_builder.html.erb
@@ -7,7 +7,7 @@
<body class="admin bg-light theme_editor page-builder"
id="page-builder"
data-controller="spree page-builder"
- data-page-builder-preview-url-value="<%= @page.preview_url(@theme_preview, @page_preview) + '&page_builder=true' %>"
+ data-page-builder-preview-url-value="<%= page_preview_url %>"
>
<%= render 'spree/admin/shared/alerts' %>
diff --git a/core/app/models/spree/page.rb b/core/app/models/spree/page.rb
index 9d24880ee5..191ac257da 100644
--- a/core/app/models/spree/page.rb
+++ b/core/app/models/spree/page.rb
@@ -108,6 +108,8 @@ module Spree
end
def preview_url(theme_preview = nil, page_preview = nil)
+ return if url.blank?
+
"#{url}?#{url_query_params(theme_preview, page_preview).to_query}"
end
@@ -174,5 +176,9 @@ module Spree
def should_generate_new_friendly_id?
name_changed? && custom?
end
+
+ def url_exists?(path)
+ Spree::Core::Engine.routes.url_helpers.respond_to?(path)
+ end
end
end
diff --git a/core/app/models/spree/pages/account.rb b/core/app/models/spree/pages/account.rb
index 987e15452a..9824926fb2 100644
--- a/core/app/models/spree/pages/account.rb
+++ b/core/app/models/spree/pages/account.rb
@@ -2,6 +2,8 @@ module Spree
module Pages
class Account < Spree::Page
def url
+ return unless url_exists?(:account_path)
+
Spree::Core::Engine.routes.url_helpers.account_path(locale: I18n.locale)
end
diff --git a/core/app/models/spree/pages/custom.rb b/core/app/models/spree/pages/custom.rb
index 3dc2748032..97d3575f03 100644
--- a/core/app/models/spree/pages/custom.rb
+++ b/core/app/models/spree/pages/custom.rb
@@ -6,6 +6,8 @@ module Spree
end
def url
+ return unless url_exists?(:page_path)
+
Spree::Core::Engine.routes.url_helpers.page_path(self, locale: I18n.locale)
end
diff --git a/core/app/models/spree/pages/homepage.rb b/core/app/models/spree/pages/homepage.rb
index 1dbb0f0185..e6b3fc042f 100644
--- a/core/app/models/spree/pages/homepage.rb
+++ b/core/app/models/spree/pages/homepage.rb
@@ -2,6 +2,8 @@ module Spree
module Pages
class Homepage < Spree::Page
def url
+ return unless url_exists?(:root_path)
+
Spree::Core::Engine.routes.url_helpers.root_path(locale: I18n.locale)
end
diff --git a/core/app/models/spree/pages/login.rb b/core/app/models/spree/pages/login.rb
index c8a32f6bd1..002a528953 100644
--- a/core/app/models/spree/pages/login.rb
+++ b/core/app/models/spree/pages/login.rb
@@ -6,6 +6,8 @@ module Spree
end
def url
+ return unless url_exists?(:login_path)
+
Spree::Core::Engine.routes.url_helpers.login_path(locale: I18n.locale)
end
end
diff --git a/core/app/models/spree/pages/password.rb b/core/app/models/spree/pages/password.rb
index 1b15613370..bc380c69b9 100644
--- a/core/app/models/spree/pages/password.rb
+++ b/core/app/models/spree/pages/password.rb
@@ -6,8 +6,13 @@ module Spree
end
def preview_url(theme_preview = nil, page_preview = nil)
- Spree::Core::Engine.routes.url_helpers.password_path(theme_id: theme.id, page_preview_id: page_preview&.id,
- theme_preview_id: theme_preview&.id)
+ return unless url_exists?(:password_path)
+
+ Spree::Core::Engine.routes.url_helpers.password_path(
+ theme_id: theme.id,
+ page_preview_id: page_preview&.id,
+ theme_preview_id: theme_preview&.id
+ )
end
def icon_name
diff --git a/core/app/models/spree/pages/post.rb b/core/app/models/spree/pages/post.rb
index fd5ab531a0..017c8552a9 100644
--- a/core/app/models/spree/pages/post.rb
+++ b/core/app/models/spree/pages/post.rb
@@ -2,8 +2,10 @@ module Spree
module Pages
class Post < Spree::Page
def url
- post = store.posts.published.last || store.posts.last
+ return unless url_exists?(:post_path)
+ post = store.posts.published.last || store.posts.last
+ return if post.nil?
Spree::Core::Engine.routes.url_helpers.post_path(post, locale: I18n.locale)
end
diff --git a/core/app/models/spree/pages/post_list.rb b/core/app/models/spree/pages/post_list.rb
index 52ffd705e5..417fb1a4e4 100644
--- a/core/app/models/spree/pages/post_list.rb
+++ b/core/app/models/spree/pages/post_list.rb
@@ -4,6 +4,8 @@ module Spree
DISPLAY_NAME = Spree.t(:blog).freeze
def url
+ return unless url_exists?(:posts_path)
+
Spree::Core::Engine.routes.url_helpers.posts_path(locale: I18n.locale)
end
diff --git a/core/app/models/spree/pages/product_details.rb b/core/app/models/spree/pages/product_details.rb
index e88977e13e..9040c2f6f1 100644
--- a/core/app/models/spree/pages/product_details.rb
+++ b/core/app/models/spree/pages/product_details.rb
@@ -2,7 +2,10 @@ module Spree
module Pages
class ProductDetails < Spree::Page
def url
+ return unless url_exists?(:product_path)
+
product = store.products.active.first || store.products.first
+ return if product.nil?
Spree::Core::Engine.routes.url_helpers.product_path(product, locale: I18n.locale)
end
diff --git a/core/app/models/spree/pages/search_results.rb b/core/app/models/spree/pages/search_results.rb
index 8445a816c0..e9f86084af 100644
--- a/core/app/models/spree/pages/search_results.rb
+++ b/core/app/models/spree/pages/search_results.rb
@@ -6,9 +6,10 @@ module Spree
end
def url
- query = 'test'
+ return unless url_exists?(:search_path)
+
Spree::Core::Engine.routes.url_helpers.search_path(
- q: query,
+ q: 'test',
theme_id: theme.id,
page_preview_id: page_preview&.id,
theme_preview_id: theme_preview&.id,
@@ -17,8 +18,14 @@ module Spree
end
def preview_url(theme_preview = nil, page_preview = nil)
- query = 'test'
- Spree::Core::Engine.routes.url_helpers.search_path(q: query, theme_id: theme.id, page_preview_id: page_preview&.id, theme_preview_id: theme_preview&.id)
+ return unless url_exists?(:search_path)
+
+ Spree::Core::Engine.routes.url_helpers.search_path(
+ q: 'test',
+ theme_id: theme.id,
+ page_preview_id: page_preview&.id,
+ theme_preview_id: theme_preview&.id
+ )
end
def default_sections
diff --git a/core/app/models/spree/pages/shop_all.rb b/core/app/models/spree/pages/shop_all.rb
index a2b32cb213..d726551323 100644
--- a/core/app/models/spree/pages/shop_all.rb
+++ b/core/app/models/spree/pages/shop_all.rb
@@ -6,10 +6,14 @@ module Spree
end
def url
+ return unless url_exists?(:products_path)
+
Spree::Core::Engine.routes.url_helpers.products_path(locale: I18n.locale)
end
def preview_url(theme_preview = nil, page_preview = nil)
+ return unless url_exists?(:products_path)
+
Spree::Core::Engine.routes.url_helpers.products_path(
theme_id: theme.id,
page_preview_id: page_preview&.id,
diff --git a/core/app/models/spree/pages/taxon.rb b/core/app/models/spree/pages/taxon.rb
index 1c115bc69d..511c5a2693 100644
--- a/core/app/models/spree/pages/taxon.rb
+++ b/core/app/models/spree/pages/taxon.rb
@@ -6,9 +6,12 @@ module Spree
end
def url
- category = Spree::Taxon.first
+ return unless url_exists?(:nested_taxons_path)
- Spree::Core::Engine.routes.url_helpers.nested_taxons_path(category, locale: I18n.locale)
+ taxon = Spree::Taxon.first
+ return if taxon.nil?
+
+ Spree::Core::Engine.routes.url_helpers.nested_taxons_path(taxon, locale: I18n.locale)
end
def default_sections
diff --git a/core/app/models/spree/pages/taxon_list.rb b/core/app/models/spree/pages/taxon_list.rb
index 09a59b07fa..376f6e4200 100644
--- a/core/app/models/spree/pages/taxon_list.rb
+++ b/core/app/models/spree/pages/taxon_list.rb
@@ -4,6 +4,8 @@ module Spree
DISPLAY_NAME = Spree.t(:taxonomy_brands_name).freeze
def url
+ return unless url_exists?(:taxonomy_path)
+
Spree::Core::Engine.routes.url_helpers.taxonomy_path(taxonomy.id, locale: I18n.locale)
end
diff --git a/core/app/models/spree/pages/wishlist.rb b/core/app/models/spree/pages/wishlist.rb
index acc8a68fb4..1657f7a24d 100644
--- a/core/app/models/spree/pages/wishlist.rb
+++ b/core/app/models/spree/pages/wishlist.rb
@@ -2,6 +2,8 @@ module Spree
module Pages
class Wishlist < Spree::Page
def url
+ return unless url_exists?(:account_wishlist_path)
+
Spree::Core::Engine.routes.url_helpers.account_wishlist_path(locale: I18n.locale)
end
end