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
[SD-1405] - As a Admin on Edit Page I always see live preview, even without the Frontend installed (#11222)
Matthew Kennedyb7547cf39704
diff --git a/backend/app/helpers/spree/admin/cms_helper.rb b/backend/app/helpers/spree/admin/cms_helper.rbindex 2cd77d649b..a35735de84 100644--- a/backend/app/helpers/spree/admin/cms_helper.rb+++ b/backend/app/helpers/spree/admin/cms_helper.rb@@ -1,29 +1,14 @@module Spreemodule Adminmodule CmsHelper- def page_preview_link(page)- return unless frontend_available?-- url = if page.homepage?- spree.root_url + page.locale- else- spree.page_url(page.locale, page.slug)- end-- button_link_to(Spree.t('admin.cms.preview_page'), url, class: 'btn-outline-secondary',- icon: 'view.svg',- id: 'admin_preview_product',- target: :blank)- end-- def preview_url(page)- return unless frontend_available?-- if page.homepage?- spree.root_path + page.locale + "?no_cache=#{rand(1...10000)}"- else- "/#{page.locale + spree.page_path(page.slug)}?no_cache=#{rand(1...10000)}"- end+ def cms_page_preview_url(page)+ page_localization = if page.locale == current_store.default_locale+ nil+ else+ page.locale+ end++ spree_storefront_resource_url(page, locale: page_localization)endendenddiff --git a/backend/app/views/spree/admin/cms_pages/_live_preview_area.html.erb b/backend/app/views/spree/admin/cms_pages/_live_preview_area.html.erbindex cb2d9cc94e..b6e5ae3e2a 100644--- a/backend/app/views/spree/admin/cms_pages/_live_preview_area.html.erb+++ b/backend/app/views/spree/admin/cms_pages/_live_preview_area.html.erb@@ -49,7 +49,7 @@<div class="embed-responsive embed-responsive-4by3"><iframe class="embed-responsive-item"id="pageLivePreview"- src="<%= preview_url(@cms_page) %>"+ src="<%= cms_page_preview_url(@cms_page) + "?no_cache=#{rand(1...10000)}" %>"sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals"></iframe></div>diff --git a/backend/app/views/spree/admin/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erbindex 88b58bc5ee..b284f87d97 100644--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb@@ -3,7 +3,12 @@<% end %><% content_for :page_actions do %>- <%= page_preview_link(@cms_page) %>+ <%= button_link_to(Spree.t('admin.cms.preview_page'),+ cms_page_preview_url(@cms_page),+ class: 'btn-outline-secondary',+ icon: 'view.svg',+ id: 'admin_preview_product',+ target: :blank) %><% end %><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>diff --git a/backend/spec/helpers/spree/admin/cms_helper_spec.rb b/backend/spec/helpers/spree/admin/cms_helper_spec.rbnew file mode 100644index 0000000000..3c69621b75--- /dev/null+++ b/backend/spec/helpers/spree/admin/cms_helper_spec.rb@@ -0,0 +1,66 @@+require 'spec_helper'++describe Spree::Admin::CmsHelper, type: :helper do+ include Spree::BaseHelper++ let!(:current_store) { create(:store) }+ let!(:standard_page) { create(:cms_standard_page) }+ let!(:feature_page) { create(:cms_feature_page) }+ let!(:home_page) { create(:cms_homepage) }++ describe '#cms_page_preview_url' do+ before do+ @standard_page = Spree::CmsPage.find(standard_page.id)+ @feature_page = Spree::CmsPage.find(feature_page.id)+ @home_page = Spree::CmsPage.find(home_page.id)+ end++ context 'standard_page' do+ it "returns the correct URL when page language matches the current store default language" do+ expect(cms_page_preview_url(@standard_page)).to eq("http://www.example.com/pages/#{@standard_page.slug}")+ end++ it "returns the language denomination in the URL when page language does not match the current store default language" do+ @standard_page.update!(locale: :fr)+ @standard_page.reload++ expect(cms_page_preview_url(@standard_page)).to eq("http://www.example.com/fr/pages/#{@standard_page.slug}")++ @standard_page.update!(locale: :en)+ @standard_page.reload+ end+ end++ context 'feature_page' do+ it "returns the correct URL when page language matches the current store default language" do+ expect(cms_page_preview_url(@feature_page)).to eq("http://www.example.com/pages/#{@feature_page.slug}")+ end++ it "returns the language denomination in the URL when page language does not match the current store default language" do+ @feature_page.update!(locale: :fr)+ @feature_page.reload++ expect(cms_page_preview_url(@feature_page)).to eq("http://www.example.com/fr/pages/#{@feature_page.slug}")++ @feature_page.update!(locale: :en)+ @feature_page.reload+ end+ end++ context 'home_page' do+ it "returns the correct URL when page language matches the current store default language" do+ expect(cms_page_preview_url(@home_page)).to eq("http://www.example.com")+ end++ it "returns the language denomination in the URL when page language does not match the current store default language" do+ @home_page.update!(locale: :fr)+ @home_page.reload++ expect(cms_page_preview_url(@home_page)).to eq("http://www.example.com/fr")++ @home_page.update!(locale: :en)+ @home_page.reload+ end+ end+ end+enddiff --git a/core/app/helpers/spree/base_helper.rb b/core/app/helpers/spree/base_helper.rbindex 0c2cda17a6..b5856ed6c8 100644--- a/core/app/helpers/spree/base_helper.rb+++ b/core/app/helpers/spree/base_helper.rb@@ -187,9 +187,15 @@ module Spreeendif resource.instance_of?(Spree::Product)- "#{current_store.formatted_url}#{localize}/#{Spree::Config[:storefront_products_path]}/#{resource.slug}"+ "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_products_path]}/#{resource.slug}"elsif resource.instance_of?(Spree::Taxon)- "#{current_store.formatted_url}#{localize}/#{Spree::Config[:storefront_taxons_path]}/#{resource.permalink}"+ "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_taxons_path]}/#{resource.permalink}"+ elsif resource.instance_of?(Spree::Cms::Pages::FeaturePage) || resource.instance_of?(Spree::Cms::Pages::StandardPage)+ "#{current_store.formatted_url + localize}/#{Spree::Config[:storefront_pages_path]}/#{resource.slug}"+ elsif localize.blank?+ current_store.formatted_url+ else+ current_store.formatted_url + localizeendend