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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Move logic from views to helpers
Damian Legawiec224cbaf1b0cb
diff --git a/core/app/models/spree/property.rb b/core/app/models/spree/property.rbindex 57c9ada207..21501566fd 100644--- a/core/app/models/spree/property.rb+++ b/core/app/models/spree/property.rb@@ -20,7 +20,9 @@ module Spreeself.whitelisted_ransackable_attributes = ['presentation']def uniq_values- product_properties.pluck(:filter_param).compact.uniq+ Rails.cache.fetch("property-uniq-values/#{cache_key_with_version}") do+ product_properties.where.not(value: [nil, '']).pluck(:filter_param, :value).uniq+ endendprivatediff --git a/core/spec/models/spree/property_spec.rb b/core/spec/models/spree/property_spec.rbindex fc05db038b..d9028947ef 100644--- a/core/spec/models/spree/property_spec.rb+++ b/core/spec/models/spree/property_spec.rb@@ -6,4 +6,16 @@ describe Spree::Property, type: :model doit { expect { subject.save! }.to change(subject, :filter_param).from(nil).to('brand-name') }end++ describe '#uniq_values' do+ let(:property) { create(:property) }++ before do+ create(:product_property, property: property, value: 'Some Value')+ create(:product_property, property: property, value: 'Some Value')+ create(:product_property, property: property, value: 'Another 10% Value')+ end++ it { expect(property.uniq_values).to eq([['some-value', 'Some Value'], ['another-10-value', 'Another 10% Value']]) }+ endenddiff --git a/frontend/app/helpers/spree/products_filters_helper.rb b/frontend/app/helpers/spree/products_filters_helper.rbindex 32321ff79e..3d7d6939b7 100644--- a/frontend/app/helpers/spree/products_filters_helper.rb+++ b/frontend/app/helpers/spree/products_filters_helper.rb@@ -1,5 +1,8 @@module Spreemodule ProductsFiltersHelper+ FILTER_LINK_CSS_CLASSES = 'd-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item'.freeze+ ACTIVE_FILTER_LINK_CSS_CLASSES = 'plp-overlay-card-item--selected'.freeze+def price_filters@price_filters ||= [filters_less_than_price_range(50),@@ -42,8 +45,70 @@ module Spree)end+ def option_value_filter_link(option_value, permitted_params, opts = {})+ id = option_value.id+ ot_downcase_name = option_value.option_type.filter_param+ selected_option_values = params[ot_downcase_name]&.split(',')&.map(&:to_i) || []+ is_selected = selected_option_values.include?(id)+ option_value_param = (is_selected ? selected_option_values - [id] : selected_option_values + [id]).join(',')+ new_params = permitted_params.merge(ot_downcase_name => option_value_param, menu_open: 1)++ link_to new_params, data: { params: new_params, id: id, filter_name: ot_downcase_name, multiselect: true } do+ if color_option_type_name.present? && color_option_type_name.downcase == ot_downcase_name+ content_tag :span, class: 'd-inline-block mb-1' do+ render partial: 'spree/shared/color_select', locals: {+ color: option_value.presentation,+ selected: is_selected+ }+ end+ else+ content_tag :div, class: "#{FILTER_LINK_CSS_CLASSES} #{ACTIVE_FILTER_LINK_CSS_CLASSES if is_selected}" do+ option_value.name+ end+ end+ end+ end++ def property_value_filter_link(property, value, permitted_params, opts = {})+ id = value.first+ name = value.last++ selected_properties = params.dig(:properties, property.filter_param)&.split(',') || []+ is_selected = selected_properties.include?(id)+ property_values = (is_selected ? selected_properties - [id] : selected_properties + [id])+ url = permitted_params.merge(properties: { property.filter_param => property_values }, menu_open: 1)+ filter_name = "properties[#{property.filter_param}]"+ new_params = permitted_params.merge(filter_name => property_values, menu_open: 1)++ base_filter_link(url, name, opts.merge(params: new_params, is_selected: is_selected, filter_name: filter_name, id: id, multiselect: true))+ end++ def price_filter_link(price_range, permitted_params, opts = {})+ is_selected = params[:price] == price_range.to_param+ price_param = is_selected ? '' : price_range.to_param+ url = permitted_params.merge(price: price_param, menu_open: 1)++ opts[:is_selected] ||= is_selected++ content_tag :div do+ base_filter_link(url, price_range, opts.merge(is_selected: is_selected, filter_name: 'price', id: price_param))+ end+ end+private+ def base_filter_link(url, label, opts = {})+ opts[:css_class] ||= FILTER_LINK_CSS_CLASSES+ opts[:css_active_class] ||= ACTIVE_FILTER_LINK_CSS_CLASSES+ opts[:params] ||= url++ link_to url, data: { filter_name: opts[:filter_name], id: opts[:id], params: opts[:params], multiselect: opts[:multiselect] } do+ content_tag :div, class: "#{opts[:css_class]} #{opts[:css_active_class] if opts[:is_selected]}" do+ label.to_s+ end+ end+ end+def filters_price_range_from_paramFilters::PriceRange.from_param(params[:price].to_s, currency: current_currency)enddiff --git a/frontend/app/views/spree/products/_filters_desktop.html.erb b/frontend/app/views/spree/products/_filters_desktop.html.erbindex d555669147..d7259ac914 100644--- a/frontend/app/views/spree/products/_filters_desktop.html.erb+++ b/frontend/app/views/spree/products/_filters_desktop.html.erb@@ -76,12 +76,7 @@<div id="collapseFilterPrice" class="collapse <%= 'show' unless price_collapsed %>" aria-labelledby="filtersPrice"><div class="card-body px-0 pt-1"><% price_filters.each do |price_range| %>- <% price_param = params[:price] == price_range.to_param ? '' : price_range.to_param %>- <%= link_to permitted_params.merge(price: price_param), class: "d-block" do %>- <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-filters-card-item <%= 'plp-filters-card-item--selected' if params[:price] == price_range.to_param %>">- <%= price_range %>- </div>- <% end %>+ <%= price_filter_link(price_range, permitted_params) %><% end %><div id="filterPriceRangeDesktop" class="m-1">diff --git a/frontend/app/views/spree/products/_filters_mobile.html.erb b/frontend/app/views/spree/products/_filters_mobile.html.erbindex 362e2fcf93..4a2c927b6b 100644--- a/frontend/app/views/spree/products/_filters_mobile.html.erb+++ b/frontend/app/views/spree/products/_filters_mobile.html.erb@@ -67,12 +67,7 @@<div id="collapseFour" class="collapse <%= 'show' unless params[:price].blank? %>" aria-labelledby="headingFour" data-parent="#filters-accordion"><div class="card-body pt-1"><% price_filters.each do |price_range| %>- <% price_param = params[:price] == price_range.to_param ? '' : price_range.to_param %>- <%= link_to permitted_params.merge(price: price_param, menu_open: 1), data: { params: permitted_params.merge(price: price_param, menu_open: 1), filter_name: 'price' } do %>- <div class="d-inline-block py-1 px-2 m-1 text-uppercase plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if params[:price] == price_range.to_param %>">- <%= price_range %>- </div>- <% end %>+ <%= price_filter_link(price_range, permitted_params) %><% end %><div id="filterPriceRangeMobile" class="m-1">diff --git a/frontend/app/views/spree/shared/_option_values.html.erb b/frontend/app/views/spree/shared/_option_values.html.erbindex 6d4dde4974..e628b14960 100644--- a/frontend/app/views/spree/shared/_option_values.html.erb+++ b/frontend/app/views/spree/shared/_option_values.html.erb@@ -1,24 +1,5 @@<% cache base_cache_key + [ot_downcase_name, params_ot_downcase_name, filtering_params_cache_key, @taxon&.id] do %>- <% selected_option_values = params_ot_downcase_name&.split(',')&.map(&:to_i) || [] %><% option_type.option_values.each do |option_value| %>- <% id = option_value.id %>- <% name = option_value.name %>-- <% option_value_param = (selected_option_values.include?(id) ? selected_option_values - [id] : selected_option_values + [id]).join(',') %>- <%= link_to permitted_params.merge(ot_downcase_name => option_value_param, menu_open: 1), data: { params: permitted_params.merge(ot_downcase_name => option_value_param, menu_open: 1), id: id, filter_name: ot_downcase_name, multiselect: true } do %>- <% if color_option_type_name.present? && color_option_type_name.downcase == ot_downcase_name %>-- <span class="d-inline-block mb-1">- <%= render partial: 'spree/shared/color_select', locals: {- color: option_value.presentation,- selected: selected_option_values.include?(id)- } %>- </span>- <% else %>- <div class="d-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item <%= 'plp-overlay-card-item--selected' if selected_option_values.include?(id) %>">- <%= name %>- </div>- <% end %>- <% end %>+ <%= option_value_filter_link(option_value, permitted_params) %><% end %><% end %>diff --git a/frontend/app/views/spree/shared/_properties.html.erb b/frontend/app/views/spree/shared/_properties.html.erbindex 309809edb8..fc0314d083 100644--- a/frontend/app/views/spree/shared/_properties.html.erb+++ b/frontend/app/views/spree/shared/_properties.html.erb@@ -1,10 +1,4 @@<% selected_properties = params.dig(:properties, "#{property.filter_param}")&.split(',') || [] %>-<% param_key = "properties[#{property.filter_param}]" %><% property.uniq_values.each do |value| %>- <% property_values = (selected_properties.include?(value) ? selected_properties - [value] : selected_properties + [value]) %>- <%= link_to permitted_params.merge(properties: { property.filter_param => property_values }, menu_open: 1), data: { params: permitted_params.merge(param_key => property_values, menu_open: 1), id: value, 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) %>">- <%= value %>- </div>- <% end %>+ <%= property_value_filter_link(property, value, permitted_params) %><% end %>