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
Fixed updating page block / section link attributes (#12777)
Damian Legawiecfb30dc39a5b8
diff --git a/admin/app/controllers/spree/admin/page_blocks_controller.rb b/admin/app/controllers/spree/admin/page_blocks_controller.rbindex 40bbe06e32..c2a22fa713 100644--- a/admin/app/controllers/spree/admin/page_blocks_controller.rb+++ b/admin/app/controllers/spree/admin/page_blocks_controller.rb@@ -47,7 +47,9 @@ module Spreedef permitted_resource_paramsparams.require(:page_block).permit(- permitted_page_block_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" }+ permitted_page_block_attributes ++ [link_attributes: permitted_page_link_attributes + [:id]] ++ @object.preferences.keys.map { |key| "preferred_#{key}" })endenddiff --git a/admin/app/controllers/spree/admin/page_sections_controller.rb b/admin/app/controllers/spree/admin/page_sections_controller.rbindex ab8b984a3b..4ae907ef15 100644--- a/admin/app/controllers/spree/admin/page_sections_controller.rb+++ b/admin/app/controllers/spree/admin/page_sections_controller.rb@@ -71,7 +71,11 @@ module Spreeenddef permitted_resource_params- params.require(:page_section).permit(permitted_page_section_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" })+ params.require(:page_section).permit(+ permitted_page_section_attributes ++ [link_attributes: permitted_page_link_attributes + [:id]] ++ @object.preferences.keys.map { |key| "preferred_#{key}" }+ )endendenddiff --git a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rbindex 7aa4c73342..468218546a 100644--- a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb@@ -83,14 +83,28 @@ RSpec.describe Spree::Admin::PageBlocksController, type: :controller doenddescribe '#update' do- subject { put :update, params: { id: page_block.id, page_section_id: page_section.id, page_block: { preferred_button_text_color: '#000000' } }, format: :turbo_stream }+ subject { put :update, params: { id: page_block.id, page_section_id: page_section.id, page_block: page_block_params }, format: :turbo_stream }let(:page_block) { create(:buttons_block, section: page_section) }let(:page_section) { create(:featured_taxon_page_section) }+ let(:page_block_params) { { preferred_button_text_color: '#000000' } }it 'updates the page block' doexpect { subject }.to change { page_block.reload.preferred_button_text_color }.to('#000000')end++ context 'with link' do+ let!(:page_block) { create(:buttons_block, section: page_section) }++ let(:page_block_params) { { link_attributes: { id: page_block.link.id, label: 'New Label', open_in_new_tab: true } } }++ it 'updates the page block' do+ subject++ expect(page_block.reload.link.label).to eq('New Label')+ expect(page_block.reload.link.open_in_new_tab).to be_truthy+ end+ endenddescribe '#allowed_types' dodiff --git a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rbindex bc1dbddf91..ecde519e76 100644--- a/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/page_sections_controller_spec.rb@@ -95,6 +95,17 @@ RSpec.describe Spree::Admin::PageSectionsController, type: :controller doexpect(page_section.reload.position).to eq(2)endend++ context 'with link' do+ let(:page_section) { create(:image_with_text_page_section, pageable: page) }++ it 'updates the page section link' do+ put :update, params: { id: page_section.id, page_section: { link_attributes: { id: page_section.link.id, label: 'New Label', open_in_new_tab: true } } }, format: :turbo_stream++ expect(page_section.reload.link.label).to eq('New Label')+ expect(page_section.reload.link.open_in_new_tab).to be_truthy+ end+ endenddescribe '#destroy' dodiff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex 9af2760bbc..801770d96c 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -129,7 +129,7 @@ module Spree@@page_block_attributes = [:type, :name, :text, :position]- @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url]+ @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url, :open_in_new_tab]@@page_section_attributes = [:type, :name, :position, :asset, :text, :description]diff --git a/core/lib/spree/testing_support/factories/page_section_factory.rb b/core/lib/spree/testing_support/factories/page_section_factory.rbindex 694fd7901e..640f268bde 100644--- a/core/lib/spree/testing_support/factories/page_section_factory.rb+++ b/core/lib/spree/testing_support/factories/page_section_factory.rb@@ -20,5 +20,7 @@ FactoryBot.define dofactory :newsletter_page_section, class: Spree::PageSections::Newsletterfactory :video_page_section, class: Spree::PageSections::Video++ factory :image_with_text_page_section, class: Spree::PageSections::ImageWithTextendend