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
Fix issues with page blocks and page sections controllers
Łukasz Adamczyk7babfca399e9
diff --git a/admin/app/controllers/spree/admin/page_blocks_controller.rb b/admin/app/controllers/spree/admin/page_blocks_controller.rbindex 9ed4db4e0c..4309900b02 100644--- a/admin/app/controllers/spree/admin/page_blocks_controller.rb+++ b/admin/app/controllers/spree/admin/page_blocks_controller.rb@@ -26,9 +26,14 @@ module Spreeenddef create- @page_block = params[:page_block][:type].constantize.new- @page_block.section = @page_section- @page_block.save!+ allowed_types = Rails.application.config.spree.page_blocks.map(&:to_s)+ page_block_type = params.dig(:page_block, :type)++ if allowed_types.include?(page_block_type) && page_block_type.safe_constantize.present?+ @page_block = page_block_type.constantize.new+ @page_block.section = @page_section+ @page_block.save!+ endendendenddiff --git a/admin/app/controllers/spree/admin/page_sections_controller.rb b/admin/app/controllers/spree/admin/page_sections_controller.rbindex 9b9aa0a64c..355174be60 100644--- a/admin/app/controllers/spree/admin/page_sections_controller.rb+++ b/admin/app/controllers/spree/admin/page_sections_controller.rb@@ -6,9 +6,14 @@ module Spreebefore_action :load_pageable, only: %i[new create index]def create- @page_section = params[:page_section][:type].constantize.new(permitted_resource_params)- @page_section.pageable = @pageable- @page_section.save!+ page_section_type = params.dig(:page_section, :type)+ allowed_types = Rails.application.config.spree.page_sections.map(&:to_s)++ if allowed_types.include?(page_section_type) && page_section_type.safe_constantize.present?+ @page_section = page_section_type.constantize.new(permitted_resource_params)+ @page_section.pageable = @pageable+ @page_section.save!+ endenddef destroydiff --git a/admin/app/views/spree/admin/page_sections/create.turbo_stream.erb b/admin/app/views/spree/admin/page_sections/create.turbo_stream.erbindex eec2b03ba3..048a7670a2 100644--- a/admin/app/views/spree/admin/page_sections/create.turbo_stream.erb+++ b/admin/app/views/spree/admin/page_sections/create.turbo_stream.erb@@ -1,5 +1,7 @@-<%= turbo_stream.replace :page_sidebar do %>- <%= render template: 'spree/admin/page_sections/edit' %>+<% if @page_section&.persisted? %>+ <%= turbo_stream.replace :page_sidebar do %>+ <%= render template: 'spree/admin/page_sections/edit' %>+ <% end %><% end %><%= turbo_stream.replace 'page_sidebar_toolbar' do %>diff --git a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rbindex 4b7efd37fd..2e02e91b28 100644--- a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb@@ -50,16 +50,22 @@ RSpec.describe Spree::Admin::PageBlocksController, type: :controller doenddescribe '#create' do+ subject { post :create, params: { page_block: { type: page_block_type }, page_section_id: page_section.id }, format: :turbo_stream }++ let(:page_block_type) { 'Spree::PageBlocks::Buttons' }let(:page_section) { create(:featured_taxon) }it 'creates page block of the given type' do- create_req = lambda {- post :create, params: { page_block: { type: 'Spree::PageBlocks::Buttons' }, page_section_id: page_section.id }, format: :turbo_stream- }+ expect { subject }.to change(Spree::PageBlock, :count).by(1)+ expect(page_section.page_blocks.last.type).to eq(page_block_type)+ end- expect(&create_req).to change(Spree::PageBlock, :count).by(1)+ context 'when the type is not allowed' do+ let(:page_block_type) { 'Spree::PageBlocks::Checkboxes' }- expect(page_section.page_blocks.last.type).to eq 'Spree::PageBlocks::Buttons'+ it 'does not create a page block' do+ expect { subject }.not_to change(Spree::PageBlock, :count)+ endendendenddiff --git a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rbindex 498fef14cc..57e92ca526 100644--- a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb@@ -15,25 +15,41 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller doenddescribe '#create' do+ subject { post :create, params: params, format: :turbo_stream }+context 'with page' do+ let(:params) { { page_section: { type: page_section_type }, page_id: page.id } }+ let(:page_section_type) { 'Spree::PageSections::FeaturedTaxon' }+it 'creates a page section inside the page' do- create_req = lambda {- post :create, params: { page_section: { type: 'Spree::PageSections::FeaturedTaxon' }, page_id: page.id }, format: :turbo_stream- }+ expect { subject }.to change(page.page_sections, :count).by(1)+ expect(page.page_sections.last.type).to eq(page_section_type)+ end++ context 'when the type is not allowed' do+ let(:page_section_type) { 'Spree::PageSections::Checkboxes' }- expect(&create_req).to change(page.page_sections, :count).by(1)- expect(page.page_sections.last.type).to eq 'Spree::PageSections::FeaturedTaxon'+ it 'does not create a page section' do+ expect { subject }.not_to change(page.page_sections, :count)+ endendendcontext 'with theme' do+ let(:params) { { page_section: { type: page_section_type }, theme_id: theme.id } }+ let(:page_section_type) { 'Spree::PageSections::FeaturedTaxon' }+it 'creates a page section inside the theme' do- create_req = lambda {- post :create, params: { page_section: { type: 'Spree::PageSections::FeaturedTaxon' }, theme_id: theme.id }, format: :turbo_stream- }+ expect { subject }.to change(theme.layout_sections, :count).by(1)+ expect(theme.layout_sections.last.type).to eq(page_section_type)+ end++ context 'when the type is not allowed' do+ let(:page_section_type) { 'Spree::PageSections::Checkboxes' }- expect(&create_req).to change(theme.layout_sections, :count).by(1)- expect(theme.layout_sections.last.type).to eq 'Spree::PageSections::FeaturedTaxon'+ it 'does not create a page section' do+ expect { subject }.not_to change(theme.layout_sections, :count)+ endendendenddiff --git a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rbindex 6568717a6e..88a6a593ef 100644--- a/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb+++ b/api/spec/requests/spree/api/v2/storefront/checkout_spec.rb@@ -60,7 +60,7 @@ describe 'API V2 Storefront Checkout Spec', type: :request doit 'cannot transition to address without a line item' doexpect(response.status).to eq(422)- expect(json_response['error']).to include(I18n.t('spree.there_are_no_items_for_this_order'))+ expect(json_response['error']).to include(Spree.t(:there_are_no_items_for_this_order))endenddiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 0e5254ab4a..41cca65943 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -1808,6 +1808,7 @@ en:test_mode: Test Modethis_menu_already_has_a_root_item: This Menu already has a root itemthank_you_for_your_order: Thank you for your business. Please print out a copy of this confirmation page for your records.+ there_are_no_items_for_this_order: There are no items for this orderthemes: Themestheme_copied: Theme has been successfully copied.theme_not_copied: "Theme could not be copied with errors: %{error}"