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: added caching and used `pluck` to improve performance of promo… (#12518)

Damian Legawiec4b4f504ef553
diff --git a/admin/app/helpers/spree/admin/promotion_actions_helper.rb b/admin/app/helpers/spree/admin/promotion_actions_helper.rb
index 5e18cba0dc..43e0f9475f 100644
--- a/admin/app/helpers/spree/admin/promotion_actions_helper.rb
+++ b/admin/app/helpers/spree/admin/promotion_actions_helper.rb
@@ -2,7 +2,7 @@ module Spree
module Admin
module PromotionActionsHelper
def options_for_promotion_action_types(promotion)
- existing = promotion.actions.map { |action| action.class.name }
+ existing = promotion.actions.pluck(:type)
Rails.application.config.spree.promotions.actions.map(&:name).reject { |r| existing.include? r }
end
end
diff --git a/admin/app/helpers/spree/admin/promotion_rules_helper.rb b/admin/app/helpers/spree/admin/promotion_rules_helper.rb
index 6076f5ba5b..58372e05e1 100644
--- a/admin/app/helpers/spree/admin/promotion_rules_helper.rb
+++ b/admin/app/helpers/spree/admin/promotion_rules_helper.rb
@@ -2,7 +2,7 @@ module Spree
module Admin
module PromotionRulesHelper
def options_for_promotion_rule_types(promotion)
- existing = promotion.rules.map { |rule| rule.class.name }
+ existing = promotion.rules.pluck(:type)
Rails.application.config.spree.promotions.rules.map(&:name).reject { |r| existing.include? r }
end
diff --git a/admin/app/views/spree/admin/promotions/_actions.html.erb b/admin/app/views/spree/admin/promotions/_actions.html.erb
index de99b549d5..8591de8f38 100644
--- a/admin/app/views/spree/admin/promotions/_actions.html.erb
+++ b/admin/app/views/spree/admin/promotions/_actions.html.erb
@@ -17,7 +17,10 @@
</span>
</div>
<% else %>
- <%= render collection: @promotion.promotion_actions, partial: 'spree/admin/promotion_actions/promotion_action', as: :promotion_action %>
+ <%= render collection: @promotion.promotion_actions,
+ partial: 'spree/admin/promotion_actions/promotion_action',
+ as: :promotion_action,
+ cached: spree_base_cache_scope %>
<% end %>
</div>
</div>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/promotions/_rules.html.erb b/admin/app/views/spree/admin/promotions/_rules.html.erb
index e37a7686a7..ac6f18491f 100644
--- a/admin/app/views/spree/admin/promotions/_rules.html.erb
+++ b/admin/app/views/spree/admin/promotions/_rules.html.erb
@@ -31,7 +31,10 @@
</span>
</div>
<% else %>
- <%= render collection: @promotion.promotion_rules, partial: 'spree/admin/promotion_rules/promotion_rule', as: :promotion_rule %>
+ <%= render collection: @promotion.promotion_rules,
+ partial: 'spree/admin/promotion_rules/promotion_rule',
+ as: :promotion_rule,
+ cached: spree_base_cache_scope %>
<% end %>
</div>
</div>