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.

Admin: Simplify and unify handling admin layout (#12567)

Damian Legawiecc0596ed14062
diff --git a/admin/app/controllers/concerns/spree/admin/turbo_frame_layout_concern.rb b/admin/app/controllers/concerns/spree/admin/turbo_frame_layout_concern.rb
deleted file mode 100644
index 96efcf3052..0000000000
--- a/admin/app/controllers/concerns/spree/admin/turbo_frame_layout_concern.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module Spree
- module Admin
- module TurboFrameLayoutConcern
- extend ActiveSupport::Concern
-
- included do
- layout :choose_layout
- end
-
- def choose_layout
- return 'turbo_rails/frame' if turbo_frame_request?
-
- 'spree/admin'
- end
- end
- end
-end
diff --git a/admin/app/controllers/spree/admin/base_controller.rb b/admin/app/controllers/spree/admin/base_controller.rb
index 64f05ed231..5e73025ab2 100644
--- a/admin/app/controllers/spree/admin/base_controller.rb
+++ b/admin/app/controllers/spree/admin/base_controller.rb
@@ -1,7 +1,7 @@
module Spree
module Admin
class BaseController < Spree::BaseController
- layout 'spree/admin'
+ layout :choose_layout
helper 'spree/base'
helper 'spree/admin/navigation'
@@ -120,6 +120,12 @@ module Spree
end
end
end
+
+ def choose_layout
+ return 'turbo_rails/frame' if turbo_frame_request?
+
+ 'spree/admin'
+ end
end
end
end
diff --git a/admin/app/controllers/spree/admin/dashboard_controller.rb b/admin/app/controllers/spree/admin/dashboard_controller.rb
index 3c847a2279..8018a5b59c 100644
--- a/admin/app/controllers/spree/admin/dashboard_controller.rb
+++ b/admin/app/controllers/spree/admin/dashboard_controller.rb
@@ -7,8 +7,6 @@ module Spree
before_action :load_vendor
before_action :clear_return_to, only: %i[show]
- layout :choose_layout
-
def show; end
def getting_started; end
@@ -136,14 +134,6 @@ module Spree
device.nil? ? 'N/A' : device
end.map { |series| [series.first, (series.second.to_f / @visits_scope.count) * 100] }
end
-
- def choose_layout
- if action_name == 'analytics'
- 'turbo_rails/frame'
- else
- 'spree/admin'
- end
- end
end
end
end
diff --git a/admin/app/controllers/spree/admin/page_blocks_controller.rb b/admin/app/controllers/spree/admin/page_blocks_controller.rb
index 72c3278d3a..4309900b02 100644
--- a/admin/app/controllers/spree/admin/page_blocks_controller.rb
+++ b/admin/app/controllers/spree/admin/page_blocks_controller.rb
@@ -2,7 +2,6 @@ module Spree
module Admin
class PageBlocksController < Spree::Admin::ResourceController
include Spree::Admin::PageBuilderConcern
- include Spree::Admin::TurboFrameLayoutConcern
belongs_to 'spree/page_section', find_by: :id
diff --git a/admin/app/controllers/spree/admin/page_links_controller.rb b/admin/app/controllers/spree/admin/page_links_controller.rb
index 490bc284cb..2e1337b012 100644
--- a/admin/app/controllers/spree/admin/page_links_controller.rb
+++ b/admin/app/controllers/spree/admin/page_links_controller.rb
@@ -2,7 +2,6 @@ module Spree
module Admin
class PageLinksController < ResourceController
include Spree::Admin::PageBuilderConcern
- include Spree::Admin::TurboFrameLayoutConcern
before_action :load_parent
diff --git a/admin/app/controllers/spree/admin/page_sections_controller.rb b/admin/app/controllers/spree/admin/page_sections_controller.rb
index bb270dc7db..355174be60 100644
--- a/admin/app/controllers/spree/admin/page_sections_controller.rb
+++ b/admin/app/controllers/spree/admin/page_sections_controller.rb
@@ -2,7 +2,6 @@ module Spree
module Admin
class PageSectionsController < ResourceController
include Spree::Admin::PageBuilderConcern
- include Spree::Admin::TurboFrameLayoutConcern
before_action :load_pageable, only: %i[new create index]
diff --git a/admin/app/controllers/spree/admin/promotion_actions_controller.rb b/admin/app/controllers/spree/admin/promotion_actions_controller.rb
index 207df2473e..852c4e8a38 100644
--- a/admin/app/controllers/spree/admin/promotion_actions_controller.rb
+++ b/admin/app/controllers/spree/admin/promotion_actions_controller.rb
@@ -1,8 +1,6 @@
module Spree
module Admin
class PromotionActionsController < ResourceController
- include Spree::Admin::TurboFrameLayoutConcern
-
belongs_to 'spree/promotion', find_by: :id
helper_method :allowed_action_types
diff --git a/admin/app/controllers/spree/admin/promotion_rules_controller.rb b/admin/app/controllers/spree/admin/promotion_rules_controller.rb
index e25e364d38..f81aa62e07 100644
--- a/admin/app/controllers/spree/admin/promotion_rules_controller.rb
+++ b/admin/app/controllers/spree/admin/promotion_rules_controller.rb
@@ -1,8 +1,6 @@
module Spree
module Admin
class PromotionRulesController < ResourceController
- include Spree::Admin::TurboFrameLayoutConcern
-
belongs_to 'spree/promotion', find_by: :id
helper_method :allowed_rule_types
diff --git a/admin/app/controllers/spree/admin/promotions_controller.rb b/admin/app/controllers/spree/admin/promotions_controller.rb
index 17b0b05e81..94dcbe313e 100644
--- a/admin/app/controllers/spree/admin/promotions_controller.rb
+++ b/admin/app/controllers/spree/admin/promotions_controller.rb
@@ -1,8 +1,6 @@
module Spree
module Admin
class PromotionsController < ResourceController
- include Spree::Admin::TurboFrameLayoutConcern
-
before_action :load_form_data, except: :index
# POST /admin/promotions/:id/clone