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.

Speedup rednering of Promotions UI (modals, inline edits,etc) (#12512)

Damian Legawiec767a37009376
diff --git a/admin/app/controllers/concerns/spree/admin/page_builder_concern.rb b/admin/app/controllers/concerns/spree/admin/page_builder_concern.rb
index a9f5e61dee..442d88d268 100644
--- a/admin/app/controllers/concerns/spree/admin/page_builder_concern.rb
+++ b/admin/app/controllers/concerns/spree/admin/page_builder_concern.rb
@@ -5,13 +5,6 @@ module Spree
included do
before_action :set_variables
- layout :choose_layout
- end
-
- def choose_layout
- return 'turbo_rails/frame' if turbo_frame_request?
-
- 'spree/page_builder'
end
def set_variables
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
new file mode 100644
index 0000000000..96efcf3052
--- /dev/null
+++ b/admin/app/controllers/concerns/spree/admin/turbo_frame_layout_concern.rb
@@ -0,0 +1,17 @@
+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/page_blocks_controller.rb b/admin/app/controllers/spree/admin/page_blocks_controller.rb
index 4309900b02..72c3278d3a 100644
--- a/admin/app/controllers/spree/admin/page_blocks_controller.rb
+++ b/admin/app/controllers/spree/admin/page_blocks_controller.rb
@@ -2,6 +2,7 @@ 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 2e1337b012..490bc284cb 100644
--- a/admin/app/controllers/spree/admin/page_links_controller.rb
+++ b/admin/app/controllers/spree/admin/page_links_controller.rb
@@ -2,6 +2,7 @@ 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 355174be60..bb270dc7db 100644
--- a/admin/app/controllers/spree/admin/page_sections_controller.rb
+++ b/admin/app/controllers/spree/admin/page_sections_controller.rb
@@ -2,6 +2,7 @@ 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 852c4e8a38..207df2473e 100644
--- a/admin/app/controllers/spree/admin/promotion_actions_controller.rb
+++ b/admin/app/controllers/spree/admin/promotion_actions_controller.rb
@@ -1,6 +1,8 @@
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 f81aa62e07..e25e364d38 100644
--- a/admin/app/controllers/spree/admin/promotion_rules_controller.rb
+++ b/admin/app/controllers/spree/admin/promotion_rules_controller.rb
@@ -1,6 +1,8 @@
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 94dcbe313e..17b0b05e81 100644
--- a/admin/app/controllers/spree/admin/promotions_controller.rb
+++ b/admin/app/controllers/spree/admin/promotions_controller.rb
@@ -1,6 +1,8 @@
module Spree
module Admin
class PromotionsController < ResourceController
+ include Spree::Admin::TurboFrameLayoutConcern
+
before_action :load_form_data, except: :index
# POST /admin/promotions/:id/clone
diff --git a/admin/app/views/spree/admin/promotion_actions/new.html.erb b/admin/app/views/spree/admin/promotion_actions/new.html.erb
index 4119940184..d35debbb5b 100644
--- a/admin/app/views/spree/admin/promotion_actions/new.html.erb
+++ b/admin/app/views/spree/admin/promotion_actions/new.html.erb
@@ -14,6 +14,7 @@
<div class="modal-body">
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %>
<% if @promotion_action.type.nil? %>
+ <%= render 'spree/admin/shared/spinner' %>
<ul class="list-group">
<% options_for_promotion_action_types(@promotion).each do |action_type| %>
<% key = action_type.to_s.demodulize.underscore %>
diff --git a/admin/app/views/spree/admin/promotion_rules/new.html.erb b/admin/app/views/spree/admin/promotion_rules/new.html.erb
index 8ceee9bb7f..d2c66d0cb2 100644
--- a/admin/app/views/spree/admin/promotion_rules/new.html.erb
+++ b/admin/app/views/spree/admin/promotion_rules/new.html.erb
@@ -14,6 +14,7 @@
<div class="modal-body">
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %>
<% if @promotion_rule.type.nil? %>
+ <%= render 'spree/admin/shared/spinner' %>
<ul class="list-group">
<% options_for_promotion_rule_types(@promotion).each do |rule_type| %>
<% key = rule_type.demodulize.underscore %>
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index 1b54260f3f..6c1c2ed9fa 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -42,8 +42,8 @@ en:
copy_payment_link: Copy Payment Link
copy_to_clipboard: Copy to clipboard
coupon_codes:
- used: Used
unused: Unused
+ used: Used
created_at: Created At
dashboard:
getting_started: