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.

Remove page builder leftovers (#13683)

Damian Legawiec509a2314503c
diff --git a/server/config/initializers/spree.rb b/server/config/initializers/spree.rb
index 4312348294..7ccc1b6aa7 100644
--- a/server/config/initializers/spree.rb
+++ b/server/config/initializers/spree.rb
@@ -40,9 +40,6 @@ end
# Spree.public_storage_service_name = :amazon_private # private assets, such as invoices, etc
# end
-# Enable theme preview screenshots in admin dashboard
-# Spree.screenshot_api_token = <Your Screenshot API token obtained from https://screenshotapi.net/>
-
# Configure Spree Dependencies
#
# Note: If a dependency is set here it will NOT be stored within the cache & database upon initialization.
diff --git a/spree/core/app/models/concerns/spree/has_one_link.rb b/spree/core/app/models/concerns/spree/has_one_link.rb
deleted file mode 100644
index 1923aa9c65..0000000000
--- a/spree/core/app/models/concerns/spree/has_one_link.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-module Spree
- module HasOneLink
- extend ActiveSupport::Concern
-
- included do
- has_one :link, ->(ps) { ps.links }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent
- accepts_nested_attributes_for :link
-
- def allowed_linkable_types
- [
- [Spree.t(:page), 'Spree::Page'],
- [Spree.t(:product), 'Spree::Product'],
- [Spree.t(:post), 'Spree::Post'],
- [Spree.t(:taxon), 'Spree::Taxon'],
- [Spree.t(:policy), 'Spree::Policy'],
- [Spree.t(:url), nil]
- ]
- end
-
- def default_linkable_type
- 'Spree::Page'
- end
-
- def default_linkable_resource
- @default_linkable_resource ||= theme_or_parent.pages.find_by(type: 'Spree::Pages::Homepage')
- end
-
- def default_links
- @default_links.presence || [
- Spree::PageLink.new(
- label: Spree.t(:shop_all),
- linkable: theme_or_parent.pages.find_by(type: 'Spree::Pages::ShopAll')
- )
- ]
- end
-
- def theme_or_parent
- theme.preview? ? theme.parent : theme
- end
- end
- end
-end
diff --git a/spree/core/app/models/concerns/spree/linkable.rb b/spree/core/app/models/concerns/spree/linkable.rb
deleted file mode 100644
index 0f2f1d9d30..0000000000
--- a/spree/core/app/models/concerns/spree/linkable.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Spree
- module Linkable
- extend ActiveSupport::Concern
-
- included do
- has_many :page_links, as: :linkable, class_name: 'Spree::PageLink', dependent: :destroy
- end
- end
-end
diff --git a/spree/core/app/models/concerns/spree/previewable.rb b/spree/core/app/models/concerns/spree/previewable.rb
deleted file mode 100644
index c12cfca5eb..0000000000
--- a/spree/core/app/models/concerns/spree/previewable.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Spree
- module Previewable
- extend ActiveSupport::Concern
-
- included do |base|
- belongs_to :parent, class_name: base.name, optional: true, foreign_key: :parent_id
- has_many :previews, class_name: base.name, dependent: :destroy_async, foreign_key: :parent_id
-
- scope :without_previews, -> { where(parent_id: nil) }
- scope :only_previews, -> { where.not(parent_id: nil) }
- end
-
- def preview?
- parent.present?
- end
- end
-end
diff --git a/spree/core/app/models/spree/ability.rb b/spree/core/app/models/spree/ability.rb
index b5ec0f943b..51235a66d7 100644
--- a/spree/core/app/models/spree/ability.rb
+++ b/spree/core/app/models/spree/ability.rb
@@ -184,9 +184,8 @@ module Spree
digital_link.token == token
end
can :read, ::Spree::Policy
- can :read, ::Spree::Page if defined?(Spree::Page)
- can :read, ::Spree::Post if defined?(Spree::Post)
- can :read, ::Spree::PostCategory if defined?(Spree::PostCategory)
+ can :read, ::Spree::Post
+ can :read, ::Spree::PostCategory
end
def protect_admin_role
diff --git a/spree/core/app/models/spree/permission_sets/default_customer.rb b/spree/core/app/models/spree/permission_sets/default_customer.rb
index 507b72d585..c824c9e27f 100644
--- a/spree/core/app/models/spree/permission_sets/default_customer.rb
+++ b/spree/core/app/models/spree/permission_sets/default_customer.rb
@@ -26,9 +26,8 @@ module Spree
# Content pages
can :read, Spree::Policy
- can :read, Spree::Page if defined?(Spree::Page)
- can :read, Spree::Post if defined?(Spree::Post)
- can :read, Spree::PostCategory if defined?(Spree::PostCategory)
+ can :read, Spree::Post
+ can :read, Spree::PostCategory
# Order management for the user's own orders
can :create, Spree::Order
diff --git a/spree/core/lib/spree/core.rb b/spree/core/lib/spree/core.rb
index ee8974aa18..8b5365d5d2 100644
--- a/spree/core/lib/spree/core.rb
+++ b/spree/core/lib/spree/core.rb
@@ -41,7 +41,7 @@ module Spree
mattr_accessor :base_class, :user_class, :admin_user_class,
:private_storage_service_name, :public_storage_service_name,
:cdn_host, :root_domain, :searcher_class, :events_adapter_class, :queues,
- :google_places_api_key, :screenshot_api_token
+ :google_places_api_key
def self.base_class(constantize: true)
@@base_class ||= 'Spree::Base'
@@ -144,10 +144,6 @@ module Spree
@@google_places_api_key
end
- def self.screenshot_api_token
- @@screenshot_api_token
- end
-
def self.always_use_translations?
Spree::Config.always_use_translations
end
diff --git a/spree/lib/generators/spree/install/templates/config/initializers/spree.rb b/spree/lib/generators/spree/install/templates/config/initializers/spree.rb
index c735927d19..0ff227b3d4 100644
--- a/spree/lib/generators/spree/install/templates/config/initializers/spree.rb
+++ b/spree/lib/generators/spree/install/templates/config/initializers/spree.rb
@@ -41,9 +41,6 @@ end
# Spree.public_storage_service_name = :amazon_private # private assets, such as invoices, etc
# end
-# Enable theme preview screenshots in admin dashboard
-# Spree.screenshot_api_token = <Your Screenshot API token obtained from https://screenshotapi.net/>
-
# Configure Spree Dependencies
#
# Note: If a dependency is set here it will NOT be stored within the cache & database upon initialization.