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.

Fixed caching for filters sidebar

Damian Legawiec9b8a96c27e79
diff --git a/frontend/app/helpers/spree/frontend_helper.rb b/frontend/app/helpers/spree/frontend_helper.rb
index 78c41b92f8..0c779d6646 100644
--- a/frontend/app/helpers/spree/frontend_helper.rb
+++ b/frontend/app/helpers/spree/frontend_helper.rb
@@ -250,7 +250,38 @@ module Spree
end
def filtering_params_cache_key
- @filtering_params_cache_key ||= params.permit(*filtering_params)&.reject { |_, v| v.blank? }&.to_param
+ @filtering_params_cache_key ||= begin
+ cache_key_parts = []
+
+ permitted_products_params.each do |key, value|
+ next if value.blank?
+
+ if value.is_a?(String)
+ cache_key_parts << [key, value].join('-')
+ else
+ value.each do |part_key, part_value|
+ next if part_value.blank?
+
+ cache_key_parts << [part_key, part_value].join('-')
+ end
+ end
+ end
+
+ cache_key_parts.join('-').parameterize
+ end
+ end
+
+ def filters_cache_key(kind)
+ base_cache_key + [
+ kind,
+ available_option_types_cache_key,
+ available_properties_cache_key,
+ filtering_params_cache_key,
+ @taxon&.id,
+ params[:menu_open]
+ ].flatten
+ end
+
def permitted_products_params
@permitted_products_params ||= begin
params.permit(*filtering_params, properties: available_properties.map(&:id).map(&:to_s))
diff --git a/frontend/app/views/spree/products/_filters_desktop.html.erb b/frontend/app/views/spree/products/_filters_desktop.html.erb
index d43eee8d99..41cebd9dd1 100644
--- a/frontend/app/views/spree/products/_filters_desktop.html.erb
+++ b/frontend/app/views/spree/products/_filters_desktop.html.erb
@@ -1,4 +1,4 @@
-<% cache base_cache_key + [available_option_types_cache_key, filtering_params_cache_key, @taxon&.id] do %>
+<% cache filters_cache_key('desktop') do %>
<div id="plp-filters-accordion" class="d-none d-lg-block col-lg-3 pr-5 position-sticky h-100 plp-filters" data-hook="taxon_sidebar_navigation">
<div class="plp-filters-scroller">
<% @available_option_types.each do |option_type| %>
diff --git a/frontend/app/views/spree/products/_filters_mobile.html.erb b/frontend/app/views/spree/products/_filters_mobile.html.erb
index 1959349f5a..ff4ebb34a8 100644
--- a/frontend/app/views/spree/products/_filters_mobile.html.erb
+++ b/frontend/app/views/spree/products/_filters_mobile.html.erb
@@ -1,7 +1,7 @@
<% is_visible = params[:menu_open] ? 'block' : 'none' %>
<div id="filter-by-overlay" class="d-lg-none plp-overlay" style="display: <%= is_visible %>;">
- <% cache base_cache_key + [available_option_types_cache_key, filtering_params_cache_key, @taxon&.id] do %>
+ <% cache filters_cache_key('mobile') do %>
<div class="plp-scroll">
<div class="container">
<div class="plp-overlay-header">
diff --git a/frontend/app/views/spree/shared/_properties.html.erb b/frontend/app/views/spree/shared/_properties.html.erb
index 535462f7cd..1bf188591f 100644
--- a/frontend/app/views/spree/shared/_properties.html.erb
+++ b/frontend/app/views/spree/shared/_properties.html.erb
@@ -1,13 +1,11 @@
-<% cache base_cache_key + [filtering_params_cache_key, @taxon&.id] do %>
- <% selected_properties = params.dig(:properties, "#{property.id}")&.split(',')&.map(&:to_i) || [] %>
- <% param_key = "properties[#{property.id}]" %>
- <% property.uniq_values.each do |value| %>
- <% value_id = property.first_with_value(value).id %>
- <% property_values = (selected_properties.include?(value_id) ? selected_properties - [value_id] : selected_properties + [value_id]) %>
- <%= link_to permitted_params.merge(properties: { property.id => property_values }, menu_open: 1), data: { params: permitted_params.merge(param_key => property_values, menu_open: 1), id: value_id, filter_name: param_key, multiselect: true } do %>
- <div class="d-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if selected_properties.include?(value_id) %>">
- <%= value %>
- </div>
- <% end %>
+<% selected_properties = params.dig(:properties, "#{property.id}")&.split(',')&.map(&:to_i) || [] %>
+<% param_key = "properties[#{property.id}]" %>
+<% property.uniq_values.each do |value| %>
+ <% value_id = property.first_with_value(value).id %>
+ <% property_values = (selected_properties.include?(value_id) ? selected_properties - [value_id] : selected_properties + [value_id]) %>
+ <%= link_to permitted_params.merge(properties: { property.id => property_values }, menu_open: 1), data: { params: permitted_params.merge(param_key => property_values, menu_open: 1), id: value_id, filter_name: param_key, multiselect: true } do %>
+ <div class="d-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if selected_properties.include?(value_id) %>">
+ <%= value %>
+ </div>
<% end %>
<% end %>