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 some issues with page builder preferences, add specs for duplicating themes
Łukasz Adamczyk3cb8afe379ec
diff --git a/core/app/jobs/spree/themes/duplicate_components_job.rb b/core/app/jobs/spree/themes/duplicate_components_job.rbindex 514755fb31..f82c30cf49 100644--- a/core/app/jobs/spree/themes/duplicate_components_job.rb+++ b/core/app/jobs/spree/themes/duplicate_components_job.rb@@ -12,17 +12,15 @@ module Spreetheme = Spree::Theme.find(theme_id)duplicated_theme = Spree::Theme.find(duplicated_theme_id)- ActsAsTenant.with_tenant(duplicated_theme.project) do- ApplicationRecord.transaction do- duplicated_pages = duplicate_pages(theme, duplicated_theme)+ ApplicationRecord.transaction do+ duplicated_pages = duplicate_pages(theme, duplicated_theme)- # Duplicated links on pages and blocks have references to pages from the previous theme- # We need to look for a duplicated page and update the link with it- duplicate_layout_sections(theme, duplicated_theme)- adjust_page_links(theme, duplicated_theme, duplicated_pages)+ # Duplicated links on pages and blocks have references to pages from the previous theme+ # We need to look for a duplicated page and update the link with it+ duplicate_layout_sections(theme, duplicated_theme)+ adjust_page_links(theme, duplicated_theme, duplicated_pages)- duplicated_theme.update!(ready: true)- end+ duplicated_theme.update!(ready: true)endenddiff --git a/core/app/models/spree/page_sections/featured_taxon.rb b/core/app/models/spree/page_sections/featured_taxon.rbindex 26692eaa0f..a3686ecf55 100644--- a/core/app/models/spree/page_sections/featured_taxon.rb+++ b/core/app/models/spree/page_sections/featured_taxon.rb@@ -58,7 +58,7 @@ module Spreeproducts_finder = Spree::Dependencies.products_finder.constantizeproducts = products_finder.new(scope: store.products, params: finder_params).execute- GearedPagination::Recordset.new(products, per_page: max_products_to_show).page(1).records+ GearedPagination::Recordset.new(products, per_page: preferred_max_products_to_show).page(1).recordsendenddiff --git a/core/spec/jobs/spree/themes/duplicate_components_job_spec.rb b/core/spec/jobs/spree/themes/duplicate_components_job_spec.rbnew file mode 100644index 0000000000..87e1acb48c--- /dev/null+++ b/core/spec/jobs/spree/themes/duplicate_components_job_spec.rb@@ -0,0 +1,117 @@+require 'spec_helper'++RSpec.describe Spree::Themes::DuplicateComponentsJob do+ subject { described_class.perform_now(theme.id, duplicated_theme.id) }++ let(:ignored_file_attrs) { %w[id created_at updated_at theme_id preferences] }++ let!(:theme) { create(:theme, :blank, name: 'Marketplace Theme', default: true) }+ let!(:duplicated_theme) { create(:theme, name: 'Copy #1 of Marketplace Theme', duplicating: true, default: false, ready: false) }++ let!(:theme_section_1) do+ create(+ :page_section,+ :announcement_bar,+ pageable: theme,+ pageable_type: 'Spree::Theme',+ preferences: {+ background_color: '#FF0000',+ text_color: '#FFFFFF',+ border_color: '#000000',+ top_padding: 20,+ bottom_padding: 20,+ top_border_width: 2,+ bottom_border_width: 4+ }+ )+ end++ let!(:theme_section_2) do+ create(+ :page_section,+ :header,+ pageable: theme,+ pageable_type: 'Spree::Theme',+ preferences: {+ background_color: '#FF0000',+ text_color: '#FFFFFF',+ border_color: '#000000',+ layout: 'default',+ desktop_logo_height: 100,+ border_width: 1,+ top_padding: 15,+ bottom_padding: 15,+ top_border_width: 3,+ bottom_border_width: 3+ }+ )+ end++ let!(:theme_file_2_section_links) do+ [+ create(:page_link, parent: theme_section_2, linkable: page_2)+ ]+ end++ let!(:page_1) { create(:page, :homepage, pageable: theme) }+ let!(:page_1_section) { create(:page_section, :rich_text, pageable: page_1) }+ let!(:page_1_section_block) { create(:page_block, :heading, section: page_1_section) }+ let!(:page_1_section_block_link) { create(:page_link, parent: page_1_section_block, linkable: page_2) }++ let!(:page_2) { create(:page, :account, pageable: theme) }+ let!(:page_2_section) { create(:page_section, :header, pageable: page_2) }+ let!(:page_2_section_links) do+ [+ create(:page_link, parent: page_2_section, linkable: page_1, label: 'Homepage'),+ create(:page_link, parent: page_2_section, linkable: custom_page, label: 'Custom page')+ ]+ end++ let(:duplicated_section_1) { duplicated_theme.sections.find_by(name: theme_file_1_section.name) }+ let(:duplicated_section_2) { duplicated_theme.sections.find_by(name: theme_file_2_section.name) }++ let(:duplicated_page_1) { duplicated_theme.pages.find_by(type: page_1.type) }+ let(:duplicated_page_1_section) { duplicated_page_1.sections[0] }+ let(:duplicated_page_1_section_block) { duplicated_page_1.sections[0].blocks[0] }++ let(:duplicated_page_2) { duplicated_theme.pages.find_by(type: page_2.type) }+ let(:duplicated_page_2_section) { duplicated_page_2.sections.find_by!(name: 'Header') }+ let!(:custom_page) { create(:custom_page) }++ it 'duplicates sections and page links' do+ subject++ duplicated_theme_section_1 = duplicated_theme.sections.find_by(name: theme_section_1.name)+ duplicated_theme_section_2 = duplicated_theme.sections.find_by(name: theme_section_2.name)++ expect(duplicated_theme_section_1.pageable).to eq(duplicated_theme)+ expect(duplicated_theme_section_1.preferences).to eq(theme_section_1.preferences)+ expect(duplicated_theme_section_1.links).to be_empty++ expect(duplicated_theme_section_2.pageable).to eq(duplicated_theme)+ expect(duplicated_theme_section_2.preferences).to eq(theme_section_2.preferences)++ expect(duplicated_theme_section_2.links.count).to eq(1)+ expect(duplicated_theme_section_2.links.find_by!(label: 'Account').linkable).to eq(duplicated_page_2)+ end++ it 'duplicates the pages with sections and page links' do+ subject++ expect(duplicated_page_1.name).to eq('Homepage')+ expect(duplicated_page_1_section).to be_present+ expect(duplicated_page_1_section.type).to eq('Spree::PageSections::RichText')+ expect(duplicated_page_1_section_block).to be_present+ expect(duplicated_page_1_section_block.type).to eq('Spree::PageBlocks::Heading')+ expect(duplicated_page_1_section_block.links.count).to eq(1)+ expect(duplicated_page_1_section_block.links[0].label).to eq('Account')+ expect(duplicated_page_1_section_block.links[0].linkable).to eq(duplicated_page_2)++ expect(duplicated_page_2.name).to eq('Account')+ expect(duplicated_page_2_section).to be_present+ expect(duplicated_page_2_section.type).to eq('Spree::PageSections::Header')+ expect(duplicated_page_2_section.links.count).to eq(2)+ expect(duplicated_page_2_section.links.find_by!(label: 'Homepage').linkable).to eq(duplicated_page_1)+ expect(duplicated_page_2_section.links.find_by!(label: 'Custom page').linkable).to eq(custom_page)+ end+end