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.

Move available/default page builder models to Spree configuration

Łukasz Adamczyk3a4d8aa577bd
diff --git a/core/app/models/spree/page_blocks/products/brand.rb b/core/app/models/spree/page_blocks/products/brand.rb
deleted file mode 100644
index 75cde8b5e3..0000000000
--- a/core/app/models/spree/page_blocks/products/brand.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Spree
- module PageBlocks
- module Products
- class Brand < Spree::PageBlocks::Text
-
- def display_name
- section.vendor_name.presence || 'Brand'
- end
- end
- end
- end
-end
diff --git a/core/app/models/spree/theme.rb b/core/app/models/spree/theme.rb
index f5e3d37e1f..bdbcf6554d 100644
--- a/core/app/models/spree/theme.rb
+++ b/core/app/models/spree/theme.rb
@@ -58,16 +58,7 @@ module Spree
#
# @return [Array<Spree::Theme>]
def self.available_themes
- @available_themes ||= begin
- # we need to load Page subclasses (not loaded in dev environment!)
- Dir.open(Spree::Core::Engine.root.join('app', 'models', 'spree', 'themes')).each do |file|
- next if ['.', '..'].include?(file)
-
- require_dependency Spree::Core::Engine.root.join('app', 'models', 'spree', 'themes', file).to_s
- end
-
- Spree::Theme.descendants.sort_by(&:display_name)
- end
+ @available_themes ||= Rails.application.config.spree.themes.sort_by(&:display_name)
end
def self.metadata
@@ -109,14 +100,7 @@ module Spree
end
def create_default_pages
- # we need to load Page subclasses (not loaded in dev environment!)
- Dir.open(Spree::Core::Engine.root.join('app', 'models', 'spree', 'pages')).each do |file|
- next if ['.', '..'].include?(file)
-
- require_dependency Spree::Core::Engine.root.join('app', 'models', 'spree', 'pages', file).to_s
- end
-
- Spree::Page.descendants.each do |page_class|
+ Rails.application.config.spree.pages.each do |page_class|
next if page_class == Spree::Pages::Custom
page_class.where(pageable: self).first_or_create!
@@ -169,24 +153,13 @@ module Spree
end
def available_layout_sections
- [
- Spree::PageSections::AnnouncementBar,
- Spree::PageSections::Header,
- Spree::PageSections::Newsletter,
- Spree::PageSections::Footer
- ]
+ Rails.application.config.spree.theme_layout_sections
end
def available_page_sections
return @available_page_sections if @available_page_sections
- Dir.open(Rails.root.join('app', 'models', 'spree', 'page_sections')).each do |file|
- next if ['.', '..'].include?(file)
-
- require_dependency Rails.root.join('app', 'models', 'spree', 'page_sections', file).to_s
- end
-
- @available_page_sections ||= Spree::PageSection.descendants.find_all do |section_class|
+ @available_page_sections ||= Rails.application.config.spree.page_sections.find_all do |section_class|
section_class.role == 'content'
end.sort_by(&:name)
end
diff --git a/core/lib/spree/core/engine.rb b/core/lib/spree/core/engine.rb
index 5f3c4866f3..0dfd50ac0b 100644
--- a/core/lib/spree/core/engine.rb
+++ b/core/lib/spree/core/engine.rb
@@ -14,7 +14,12 @@ module Spree
:line_item_comparison_hooks,
:data_feed_types,
:export_types,
- :taxon_rules)
+ :taxon_rules,
+ :themes,
+ :theme_layout_sections,
+ :pages,
+ :page_sections,
+ :page_blocks)
SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
PromoEnvironment = Struct.new(:rules, :actions)
isolate_namespace Spree
@@ -143,6 +148,83 @@ module Spree
Spree::TaxonRules::AvailableOn,
Spree::TaxonRules::Sale,
]
+
+ Rails.application.config.spree.themes = [
+ Spree::Themes::Default,
+ Spree::Themes::B2B
+ ]
+
+ Rails.application.config.spree.theme_layout_sections = [
+ Spree::PageSections::AnnouncementBar,
+ Spree::PageSections::Header,
+ Spree::PageSections::Newsletter,
+ Spree::PageSections::Footer
+ ]
+
+ Rails.application.config.spree.pages = [
+ Spree::Pages::Cart,
+ Spree::Pages::Post,
+ Spree::Pages::TaxonList,
+ Spree::Pages::Custom,
+ Spree::Pages::ProductDetails,
+ Spree::Pages::ShopAll,
+ Spree::Pages::Taxon,
+ Spree::Pages::Wishlist,
+ Spree::Pages::SearchResults,
+ Spree::Pages::Checkout,
+ Spree::Pages::Password,
+ Spree::Pages::Homepage,
+ Spree::Pages::Login,
+ Spree::Pages::PostList,
+ Spree::Pages::Account
+ ]
+
+ Rails.application.config.spree.page_sections = [
+ Spree::PageSections::FeaturedPosts,
+ Spree::PageSections::TaxonGrid,
+ Spree::PageSections::ImageWithText,
+ Spree::PageSections::FeaturedTaxon,
+ Spree::PageSections::CollectionBanner,
+ Spree::PageSections::ProductDetails,
+ Spree::PageSections::MainPasswordFooter,
+ Spree::PageSections::BrandStory,
+ Spree::PageSections::RelatedProducts,
+ Spree::PageSections::CustomCode,
+ Spree::PageSections::TaxonBanner,
+ Spree::PageSections::FeaturedProduct,
+ Spree::PageSections::ProductGrid,
+ Spree::PageSections::ImageBanner,
+ Spree::PageSections::PageTitle,
+ Spree::PageSections::MainPasswordHeader,
+ Spree::PageSections::PostDetails,
+ Spree::PageSections::PostGrid,
+ Spree::PageSections::FeaturedTaxons,
+ Spree::PageSections::RichText,
+ Spree::PageSections::Video,
+ Spree::PageSections::Footer,
+ Spree::PageSections::Newsletter,
+ Spree::PageSections::Header,
+ Spree::PageSections::AnnouncementBar
+ ]
+
+ Rails.application.config.spree.page_blocks = [
+ Spree::PageBlocks::Link,
+ Spree::PageBlocks::MegaNav,
+ Spree::PageBlocks::MegaNavWithSubcategories,
+ Spree::PageBlocks::Subheading,
+ Spree::PageBlocks::Heading,
+ Spree::PageBlocks::Nav,
+ Spree::PageBlocks::Buttons,
+ Spree::PageBlocks::Text,
+ Spree::PageBlocks::NewsletterForm,
+ Spree::PageBlocks::Image,
+ Spree::PageBlocks::Products::Title,
+ Spree::PageBlocks::Products::Share,
+ Spree::PageBlocks::Products::Price,
+ Spree::PageBlocks::Products::QuantitySelector,
+ Spree::PageBlocks::Products::VariantPicker,
+ Spree::PageBlocks::Products::BuyButtons
+ ]
end
initializer 'spree.promo.register.promotions.actions' do |app|