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.

Renamed `currency` to `money`, use spree helpers (for images, dates)

Damian Legawiec33ccb44e1344
diff --git a/admin/app/helpers/spree/admin/table_helper.rb b/admin/app/helpers/spree/admin/table_helper.rb
index 9d1aae2618..65f86b1e53 100644
--- a/admin/app/helpers/spree/admin/table_helper.rb
+++ b/admin/app/helpers/spree/admin/table_helper.rb
@@ -32,13 +32,6 @@ module Spree
keys.split(',').map(&:to_sym)
end
- # Save selected columns to session
- # @param table_key [Symbol] table key
- # @param column_keys [Array<Symbol>] selected column keys
- def save_selected_columns(table_key, column_keys)
- session["table_columns_#{table_key}"] = column_keys.join(',')
- end
-
# Render a single column value based on its type
# @param record [Object] the record
# @param column [Spree::Admin::Table::Column] the column definition
@@ -47,37 +40,37 @@ module Spree
def render_column_value(record, column, table)
value = column.resolve_value(record, self)
- case column.type
- when :currency
- render_currency_column(value, column)
- when :date
+ case column.type.to_s
+ when 'money'
+ render_money_column(value, column)
+ when 'date'
render_date_column(value, column)
- when :datetime
+ when 'datetime'
render_datetime_column(value, column)
- when :status
+ when 'status'
render_status_column(value, column)
- when :boolean
+ when 'boolean'
render_boolean_column(value, column)
- when :link
+ when 'link'
render_link_column(record, value, column, table)
- when :image
+ when 'image'
render_image_column(record, value, column)
- when :custom
+ when 'custom'
extra_locals = column.partial_locals.is_a?(Proc) ? column.partial_locals.call(record) : column.partial_locals
locals = { record: record, column: column, value: value }.merge(extra_locals)
render partial: column.partial, locals: locals
- when :association
+ when 'association'
render_association_column(value, column)
else
render_string_column(value, column)
end
end
- # Render currency column
- # @param value [Object] the value
+ # Render money column
+ # @param value [Object] the value (Spree::Money or numeric)
# @param column [Spree::Admin::Table::Column] column definition
# @return [String]
- def render_currency_column(value, column)
+ def render_money_column(value, column)
return content_tag(:span, '-', class: 'text-gray-400') if value.blank?
if value.respond_to?(:display_amount)
@@ -97,7 +90,7 @@ module Spree
if column.format.present? && respond_to?(column.format)
send(column.format, value)
else
- l(value.to_date, format: :short)
+ spree_date(value)
end
end
@@ -111,7 +104,7 @@ module Spree
if column.format.present? && respond_to?(column.format)
send(column.format, value)
else
- local_time_ago(value)
+ spree_time_ago(value)
end
end
@@ -169,14 +162,14 @@ module Spree
# Render image column
# @param record [Object] the record
- # @param value [Object] the value
+ # @param value [Object] the value (ActiveStorage attachment or URL string)
# @param column [Spree::Admin::Table::Column] column definition
# @return [String]
def render_image_column(record, value, column)
return content_tag(:span, '-', class: 'text-gray-400') if value.blank?
if value.respond_to?(:attached?) && value.attached?
- image_tag url_for(value.variant(resize_to_limit: [50, 50])), class: 'rounded', loading: 'lazy'
+ spree_image_tag(value, width: 50, height: 50, class: 'rounded', loading: 'lazy')
elsif value.is_a?(String) && value.present?
image_tag value, class: 'rounded', style: 'max-width: 50px; max-height: 50px;', loading: 'lazy'
else
@@ -304,7 +297,7 @@ module Spree
# @return [String]
def column_header_class(column)
classes = []
- classes << "text-#{column.align}" if column.align != :left
+ classes << "text-#{column.align}" if column.align.to_s != 'left'
classes << "w-#{column.width}" if column.width.present?
classes.join(' ')
end
@@ -314,7 +307,7 @@ module Spree
# @return [String]
def column_cell_class(column)
classes = []
- classes << "text-#{column.align}" if column.align != :left
+ classes << "text-#{column.align}" if column.align.to_s != 'left'
classes.join(' ')
end
diff --git a/admin/app/models/spree/admin/table/column.rb b/admin/app/models/spree/admin/table/column.rb
index 32e9db5c4c..8882cdcc10 100644
--- a/admin/app/models/spree/admin/table/column.rb
+++ b/admin/app/models/spree/admin/table/column.rb
@@ -5,8 +5,8 @@ module Spree
include ActiveModel::Model
include ActiveModel::Attributes
- TYPES = %w[string number date datetime currency status link boolean image custom association].freeze
- FILTER_TYPES = %w[string number date datetime currency status boolean autocomplete select].freeze
+ TYPES = %w[string number date datetime money status link boolean image custom association].freeze
+ FILTER_TYPES = %w[string number date datetime money status boolean autocomplete select].freeze
attribute :key, :string
attribute :label
@@ -114,7 +114,7 @@ module Spree
case filter_type
when 'string'
%i[eq not_eq cont not_cont start end in not_in null not_null]
- when 'number', 'currency'
+ when 'number', 'money'
%i[eq not_eq gt gteq lt lteq in not_in null not_null]
when 'date', 'datetime'
%i[eq not_eq gt gteq lt lteq null not_null]
diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rb
index ed9b0c9176..cbf981f16a 100644
--- a/admin/config/initializers/spree_admin_tables.rb
+++ b/admin/config/initializers/spree_admin_tables.rb
@@ -62,7 +62,7 @@ Rails.application.config.after_initialize do
Spree.admin.tables.products.add :price,
label: :price,
- type: :currency,
+ type: :money,
sortable: true,
filterable: true,
default: true,
@@ -260,7 +260,7 @@ Rails.application.config.after_initialize do
Spree.admin.tables.orders.add :total,
label: :total,
- type: :currency,
+ type: :money,
sortable: true,
filterable: true,
default: true,
@@ -391,7 +391,7 @@ Rails.application.config.after_initialize do
Spree.admin.tables.checkouts.add :total,
label: :total,
- type: :currency,
+ type: :money,
sortable: true,
filterable: true,
default: true,
@@ -459,7 +459,7 @@ Rails.application.config.after_initialize do
# Amount spent
Spree.admin.tables.users.add :amount_spent,
label: 'admin.amount_spent',
- type: :currency,
+ type: :money,
sortable: false,
filterable: false,
default: true,
@@ -641,7 +641,7 @@ Rails.application.config.after_initialize do
Spree.admin.tables.customer_returns.add :pre_tax_total,
label: :pre_tax_total,
- type: :currency,
+ type: :money,
sortable: false,
filterable: false,
default: true,
@@ -916,7 +916,7 @@ Rails.application.config.after_initialize do
Spree.admin.tables.gift_cards.add :amount,
label: :amount,
- type: :currency,
+ type: :money,
sortable: true,
filterable: true,
default: true,
@@ -925,7 +925,7 @@ Rails.application.config.after_initialize do
Spree.admin.tables.gift_cards.add :used,
label: :used,
- type: :currency,
+ type: :money,
sortable: false,
filterable: false,
default: true,
diff --git a/admin/spec/helpers/spree/admin/table_helper_spec.rb b/admin/spec/helpers/spree/admin/table_helper_spec.rb
new file mode 100644
index 0000000000..50472eefa4
--- /dev/null
+++ b/admin/spec/helpers/spree/admin/table_helper_spec.rb
@@ -0,0 +1,725 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::TableHelper, type: :helper do
+ let(:table) { Spree::Admin::Table.new(:products, model_class: Spree::Product) }
+ let(:product) { create(:product, name: 'Test Product', price: 19.99) }
+
+ before do
+ table.add(:name, label: :name, type: 'string', default: true, position: 10)
+ table.add(:price, label: :price, type: 'money', default: true, position: 20)
+ table.add(:status, label: :status, type: 'status', default: true, position: 30)
+ table.add(:created_at, label: :created_at, type: 'datetime', default: true, position: 40)
+ end
+
+ describe '#session_selected_columns' do
+ it 'returns nil when no columns in session' do
+ expect(helper.session_selected_columns(:products)).to be_nil
+ end
+
+ it 'returns array of symbols when columns are in session' do
+ session['table_columns_products'] = 'name,price,status'
+
+ result = helper.session_selected_columns(:products)
+
+ expect(result).to eq([:name, :price, :status])
+ end
+
+ it 'returns nil for empty string' do
+ session['table_columns_products'] = ''
+
+ expect(helper.session_selected_columns(:products)).to be_nil
+ end
+ end
+
+ describe '#render_column_value' do
+ describe 'with string type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'name', label: :name, type: 'string') }
+
+ it 'renders string value' do
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('Test Product')
+ end
+
+ it 'renders dash for blank value' do
+ product.name = nil
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ expect(result).to include('text-gray-400')
+ end
+
+ it 'truncates long strings' do
+ product.name = 'A' * 150
+ result = helper.render_column_value(product, column, table)
+
+ expect(result.length).to be < 150
+ expect(result).to include('...')
+ end
+ end
+
+ describe 'with money type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'price', label: :price, type: 'money') }
+
+ before do
+ allow(helper).to receive(:current_currency).and_return('USD')
+ end
+
+ it 'renders money value with symbol' do
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('$')
+ expect(result).to include('19.99')
+ end
+
+ it 'renders dash for blank value' do
+ column = Spree::Admin::Table::Column.new(key: 'cost_price', label: :cost_price, type: 'money', method: :cost_price)
+ allow(product).to receive(:cost_price).and_return(nil)
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ end
+
+ it 'uses display_amount if available' do
+ money_object = double('Money', display_amount: '$25.00')
+ column = Spree::Admin::Table::Column.new(key: 'total', label: :total, type: 'money', method: ->(r) { money_object })
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to eq('$25.00')
+ end
+ end
+
+ describe 'with date type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'available_on', label: :available_on, type: 'date', method: :available_on) }
+
+ it 'renders formatted date using spree_date' do
+ product.available_on = Date.new(2025, 6, 15)
+ allow(helper).to receive(:spree_date).and_return('Jun 15, 2025')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(helper).to have_received(:spree_date)
+ expect(result).to eq('Jun 15, 2025')
+ end
+
+ it 'renders dash for blank value' do
+ product.available_on = nil
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ end
+ end
+
+ describe 'with datetime type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'created_at', label: :created_at, type: 'datetime') }
+
+ before do
+ allow(helper).to receive(:spree_time_ago).and_return('2 hours ago')
+ end
+
+ it 'renders datetime using spree_time_ago' do
+ result = helper.render_column_value(product, column, table)
+
+ expect(helper).to have_received(:spree_time_ago)
+ expect(result).to eq('2 hours ago')
+ end
+
+ it 'renders dash for blank value' do
+ column = Spree::Admin::Table::Column.new(key: 'deleted_at', label: :deleted_at, type: 'datetime', method: :deleted_at)
+ allow(product).to receive(:deleted_at).and_return(nil)
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ end
+ end
+
+ describe 'with status type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'status', label: :status, type: 'status') }
+
+ it 'renders active status with badge-active class' do
+ allow(product).to receive(:status).and_return('active')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('badge')
+ expect(result).to include('badge-active')
+ end
+
+ it 'renders draft status with badge-warning class' do
+ allow(product).to receive(:status).and_return('draft')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('badge-warning')
+ end
+
+ it 'renders archived status with badge-inactive class' do
+ allow(product).to receive(:status).and_return('archived')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('badge-inactive')
+ end
+
+ it 'renders unknown status with badge-secondary class' do
+ allow(product).to receive(:status).and_return('custom_status')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('badge-secondary')
+ end
+
+ it 'renders dash for blank value' do
+ allow(product).to receive(:status).and_return(nil)
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ end
+ end
+
+ describe 'with boolean type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'available', label: :available, type: 'boolean', method: :available?) }
+
+ before do
+ allow(helper).to receive(:active_badge).and_call_original
+ end
+
+ it 'renders boolean value using active_badge' do
+ allow(product).to receive(:available?).and_return(true)
+ allow(helper).to receive(:active_badge).with(true).and_return('<span>Yes</span>'.html_safe)
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(helper).to have_received(:active_badge).with(true)
+ end
+ end
+
+ describe 'with link type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'name', label: :name, type: 'link') }
+
+ it 'renders link with value' do
+ allow(helper).to receive(:edit_object_url).with(product).and_return('/admin/products/1/edit')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('Test Product')
+ expect(result).to include('href="/admin/products/1/edit"')
+ end
+
+ it 'renders plain text when no URL available' do
+ allow(helper).to receive(:respond_to?).with(:object_url).and_return(false)
+ allow(helper).to receive(:respond_to?).with(:edit_object_url).and_return(false)
+ allow(helper).to receive(:respond_to?).with(anything).and_call_original
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('Test Product')
+ expect(result).not_to include('href')
+ end
+
+ it 'renders dash for blank value' do
+ product.name = nil
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ end
+ end
+
+ describe 'with image type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'image', label: :image, type: 'image', method: :gallery_image_url) }
+
+ it 'renders image tag for string URL' do
+ allow(product).to receive(:gallery_image_url).and_return('https://example.com/image.jpg')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('<img')
+ expect(result).to include('https://example.com/image.jpg')
+ expect(result).to include('loading="lazy"')
+ end
+
+ it 'renders dash for blank value' do
+ allow(product).to receive(:gallery_image_url).and_return(nil)
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ end
+ end
+
+ describe 'with custom type' do
+ let(:column) do
+ Spree::Admin::Table::Column.new(
+ key: 'custom_field',
+ label: :custom,
+ type: 'custom',
+ partial: 'spree/admin/tables/columns/custom_test'
+ )
+ end
+
+ it 'renders custom partial with locals' do
+ allow(helper).to receive(:render).with(
+ partial: 'spree/admin/tables/columns/custom_test',
+ locals: hash_including(record: product, column: column)
+ ).and_return('custom content')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to eq('custom content')
+ end
+
+ it 'supports partial_locals as hash' do
+ column = Spree::Admin::Table::Column.new(
+ key: 'custom_field',
+ label: :custom,
+ type: 'custom',
+ partial: 'spree/admin/tables/columns/custom_test',
+ partial_locals: { extra: 'data' }
+ )
+
+ allow(helper).to receive(:render).with(
+ partial: 'spree/admin/tables/columns/custom_test',
+ locals: hash_including(extra: 'data')
+ ).and_return('custom content')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to eq('custom content')
+ end
+
+ it 'supports partial_locals as proc' do
+ column = Spree::Admin::Table::Column.new(
+ key: 'custom_field',
+ label: :custom,
+ type: 'custom',
+ partial: 'spree/admin/tables/columns/custom_test',
+ partial_locals: ->(record) { { product_name: record.name } }
+ )
+
+ allow(helper).to receive(:render).with(
+ partial: 'spree/admin/tables/columns/custom_test',
+ locals: hash_including(product_name: 'Test Product')
+ ).and_return('custom content')
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to eq('custom content')
+ end
+ end
+
+ describe 'with association type' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'taxons', label: :taxons, type: 'association', method: ->(p) { 'Category 1, Category 2' }) }
+
+ it 'renders association value' do
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('Category 1, Category 2')
+ end
+
+ it 'renders dash for blank value' do
+ column = Spree::Admin::Table::Column.new(key: 'taxons', label: :taxons, type: 'association', method: ->(p) { nil })
+
+ result = helper.render_column_value(product, column, table)
+
+ expect(result).to include('-')
+ end
+ end
+ end
+
+ describe '#render_money_column' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'price', label: :price, type: 'money') }
+
+ before do
+ allow(helper).to receive(:current_currency).and_return('USD')
+ end
+
+ it 'renders Spree::Money for numeric value' do
+ result = helper.render_money_column(19.99, column)
+
+ expect(result).to include('$')
+ expect(result).to include('19.99')
+ end
+
+ it 'calls display_amount on objects that respond to it' do
+ money = double('Money', display_amount: '$25.00')
+
+ result = helper.render_money_column(money, column)
+
+ expect(result).to eq('$25.00')
+ end
+ end
+
+ describe '#render_date_column' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'date', label: :date, type: 'date') }
+
+ it 'uses spree_date helper' do
+ date = Date.new(2025, 12, 25)
+ allow(helper).to receive(:spree_date).with(date).and_return('Dec 25, 2025')
+
+ result = helper.render_date_column(date, column)
+
+ expect(result).to eq('Dec 25, 2025')
+ end
+
+ it 'uses custom format method if specified' do
+ column = Spree::Admin::Table::Column.new(key: 'date', label: :date, type: 'date', format: 'custom_date_format')
+ allow(helper).to receive(:respond_to?).with('custom_date_format').and_return(true)
+ allow(helper).to receive(:respond_to?).with(anything).and_call_original
+ allow(helper).to receive(:custom_date_format).and_return('formatted date')
+
+ result = helper.render_date_column(Date.today, column)
+
+ expect(result).to eq('formatted date')
+ end
+ end
+
+ describe '#render_datetime_column' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'datetime', label: :datetime, type: 'datetime') }
+
+ it 'uses spree_time_ago helper' do
+ time = Time.current
+ allow(helper).to receive(:spree_time_ago).with(time).and_return('5 minutes ago')
+
+ result = helper.render_datetime_column(time, column)
+
+ expect(result).to eq('5 minutes ago')
+ end
+ end
+
+ describe '#render_status_column' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'status', label: :status, type: 'status') }
+
+ it 'applies correct CSS class for active statuses' do
+ %w[active complete completed paid shipped available].each do |status|
+ result = helper.render_status_column(status, column)
+ expect(result).to include('badge-active'), "Expected badge-active for #{status}"
+ end
+ end
+
+ it 'applies correct CSS class for warning statuses' do
+ %w[draft pending processing ready].each do |status|
+ result = helper.render_status_column(status, column)
+ expect(result).to include('badge-warning'), "Expected badge-warning for #{status}"
+ end
+ end
+
+ it 'applies correct CSS class for inactive statuses' do
+ %w[archived canceled cancelled failed void inactive].each do |status|
+ result = helper.render_status_column(status, column)
+ expect(result).to include('badge-inactive'), "Expected badge-inactive for #{status}"
+ end
+ end
+
+ it 'applies secondary class for unknown statuses' do
+ result = helper.render_status_column('custom', column)
+ expect(result).to include('badge-secondary')
+ end
+ end
+
+ describe '#render_string_column' do
+ let(:column) { Spree::Admin::Table::Column.new(key: 'name', label: :name, type: 'string') }
+
+ it 'escapes HTML in value' do
+ result = helper.render_string_column('<script>alert("xss")</script>', column)
+
+ expect(result).not_to include('<script>')
+ expect(result).to include('&lt;script&gt;')
+ end
+
+ it 'truncates to 100 characters' do
+ long_string = 'A' * 150
+ result = helper.render_string_column(long_string, column)
+
+ expect(result.length).to be < 150
+ end
+ end
+
+ describe '#column_header_class' do
+ it 'returns empty string for left-aligned column (default)' do
+ column = Spree::Admin::Table::Column.new(key: 'name', label: :name, align: 'left')
+
+ result = helper.column_header_class(column)
+
+ expect(result).to eq('')
+ end
+
+ it 'returns text alignment class for right alignment' do
+ column = Spree::Admin::Table::Column.new(key: 'price', label: :price, align: 'right')
+
+ result = helper.column_header_class(column)
+
+ expect(result).to include('text-right')
+ end
+
+ it 'includes width class when specified' do
+ column = Spree::Admin::Table::Column.new(key: 'status', label: :status, width: '100')
+
+ result = helper.column_header_class(column)
+
+ expect(result).to include('w-100')
+ end
+ end
+
+ describe '#column_cell_class' do
+ it 'returns empty string for left-aligned column (default)' do
+ column = Spree::Admin::Table::Column.new(key: 'name', label: :name, align: 'left')
+
+ result = helper.column_cell_class(column)
+
+ expect(result).to eq('')
+ end
+
+ it 'returns text alignment class for right alignment' do
+ column = Spree::Admin::Table::Column.new(key: 'price', label: :price, align: 'right')
+
+ result = helper.column_cell_class(column)
+
+ expect(result).to include('text-right')
+ end
+ end
+
+ describe '#count_applied_filters' do
+ it 'returns 0 for blank query state' do
+ expect(helper.count_applied_filters(nil)).to eq(0)
+ expect(helper.count_applied_filters('')).to eq(0)
+ expect(helper.count_applied_filters('{}')).to eq(0)
+ end
+
+ it 'counts filters at top level' do
+ query_state = {
+ 'filters' => [
+ { 'field' => 'name', 'operator' => 'cont', 'value' => 'test' },
+ { 'field' => 'status', 'operator' => 'eq', 'value' => 'active' }
+ ]
+ }.to_json
+
+ expect(helper.count_applied_filters(query_state)).to eq(2)
+ end
+
+ it 'does not count filters without field' do
+ query_state = {
+ 'filters' => [
+ { 'field' => 'name', 'operator' => 'cont', 'value' => 'test' },
+ { 'field' => '', 'operator' => '', 'value' => '' }
+ ]
+ }.to_json
+
+ expect(helper.count_applied_filters(query_state)).to eq(1)
+ end
+
+ it 'counts filters in nested groups' do
+ query_state = {
+ 'filters' => [
+ { 'field' => 'name', 'operator' => 'cont', 'value' => 'test' }
+ ],
+ 'groups' => [
+ {
+ 'filters' => [
+ { 'field' => 'status', 'operator' => 'eq', 'value' => 'active' },
+ { 'field' => 'price', 'operator' => 'gt', 'value' => '10' }
+ ]
+ }
+ ]
+ }.to_json
+
+ expect(helper.count_applied_filters(query_state)).to eq(3)
+ end
+
+ it 'returns 0 for invalid JSON' do
+ expect(helper.count_applied_filters('invalid json')).to eq(0)
+ end
+ end
+
+ describe '#query_builder_fields_json' do
+ it 'returns JSON string of available fields' do
+ result = helper.query_builder_fields_json(table)
+
+ parsed = JSON.parse(result)
+ expect(parsed).to be_an(Array)
+ end
+ end
+
+ describe '#query_builder_operators_json' do
+ it 'returns JSON string of available operators' do
+ result = helper.query_builder_operators_json
+
+ parsed = JSON.parse(result)
+ expect(parsed).to be_an(Array)
+ expect(parsed.first).to have_key('value')
+ expect(parsed.first).to have_key('label')
+ end
+ end
+
+ describe '#render_bulk_action' do
+ let(:action) do
+ Spree::Admin::Table::BulkAction.new(
+ key: :delete,
+ label: 'Delete',
+ icon: 'trash',
+ modal_path: '/admin/bulk/delete',
+ action_path: '/admin/products/bulk_delete'
+ )
+ end
+
+ before do
+ allow(helper).to receive(:icon).and_return('<svg></svg>'.html_safe)
+ end
+
+ it 'renders link with action data attributes' do
+ result = helper.render_bulk_action(action)
+
+ expect(result).to include('Delete')
+ expect(result).to include('href="/admin/bulk/delete"')
+ expect(result).to include('data-action')
+ expect(result).to include('bulk-operation#setBulkAction')
+ end
+
+ it 'includes icon when present' do
+ result = helper.render_bulk_action(action)
+
+ expect(helper).to have_received(:icon).with('trash')
+ end
+
+ it 'returns nil when action is not visible' do
+ action = Spree::Admin::Table::BulkAction.new(
+ key: :delete,
+ label: 'Delete',
+ condition: false
+ )
+
+ result = helper.render_bulk_action(action)
+
+ expect(result).to be_nil
+ end
+
+ it 'includes confirm data attribute when present' do
+ action = Spree::Admin::Table::BulkAction.new(
+ key: :delete,
+ label: 'Delete',
+ modal_path: '/admin/bulk/delete',
+ confirm: 'Are you sure?'
+ )
+
+ result = helper.render_bulk_action(action)
+
+ expect(result).to include('data-confirm="Are you sure?"')
+ end
+ end
+
+ describe '#render_bulk_actions_panel' do
+ before do
+ allow(helper).to receive(:bulk_operations_counter).and_return('<span>0 selected</span>'.html_safe)
+ allow(helper).to receive(:bulk_operations_close_button).and_return('<button>Close</button>'.html_safe)
+ allow(helper).to receive(:icon).and_return('<svg></svg>'.html_safe)
+ end
+
+ it 'returns nil when no bulk actions' do
+ result = helper.render_bulk_actions_panel(table)
+
+ expect(result).to be_nil
+ end
+
+ it 'renders panel with bulk actions' do
+ table.add_bulk_action(:delete, label: 'Delete', modal_path: '/delete')
+
+ result = helper.render_bulk_actions_panel(table)
+
+ expect(result).to include('bulk-panel')
+ expect(result).to include('Delete')
+ end
+
+ it 'renders first 2 actions as primary' do
+ table.add_bulk_action(:delete, label: 'Delete', modal_path: '/delete', position: 10)
+ table.add_bulk_action(:export, label: 'Export', modal_path: '/export', position: 20)
+
+ result = helper.render_bulk_actions_panel(table)
+
+ expect(result).to include('Delete')
+ expect(result).to include('Export')
+ end
+ end
+
+ describe 'private methods' do
+ describe '#parse_current_sort' do
+ it 'returns [nil, nil] for blank sort' do
+ result = helper.send(:parse_current_sort, nil)
+ expect(result).to eq([nil, nil])
+
+ result = helper.send(:parse_current_sort, '')
+ expect(result).to eq([nil, nil])
+ end
+
+ it 'parses field and direction' do
+ result = helper.send(:parse_current_sort, 'name asc')
+ expect(result).to eq(['name', 'asc'])
+
+ result = helper.send(:parse_current_sort, 'created_at desc')
+ expect(result).to eq(['created_at', 'desc'])
+ end
+ end
+
+ describe '#find_sort_label' do
+ it 'returns default label for blank sort' do
+ sortable = table.sortable_columns
+
+ result = helper.send(:find_sort_label, sortable, nil)
+
+ expect(result).to eq(Spree.t('admin.tables.sort_by'))
+ end
+
+ it 'returns column label when found' do
+ sortable = table.sortable_columns
+
+ result = helper.send(:find_sort_label, sortable, 'name asc')
+
+ expect(result).to eq(Spree.t(:name))
+ end
+
+ it 'returns default label when column not found' do
+ sortable = table.sortable_columns
+
+ result = helper.send(:find_sort_label, sortable, 'unknown asc')
+
+ expect(result).to eq(Spree.t('admin.tables.sort_by'))
+ end
+ end
+
+ describe '#count_filters_in_state' do
+ it 'returns 0 for non-hash state' do
+ expect(helper.send(:count_filters_in_state, nil)).to eq(0)
+ expect(helper.send(:count_filters_in_state, 'string')).to eq(0)
+ expect(helper.send(:count_filters_in_state, [])).to eq(0)
+ end
+
+ it 'counts filters with field present' do
+ state = {
+ 'filters' => [
+ { 'field' => 'name' },
+ { 'field' => '' },
+ { 'field' => 'status' }
+ ]
+ }
+
+ expect(helper.send(:count_filters_in_state, state)).to eq(2)
+ end
+
+ it 'recursively counts in nested groups' do
+ state = {
+ 'filters' => [{ 'field' => 'name' }],
+ 'groups' => [
+ { 'filters' => [{ 'field' => 'status' }] },
+ { 'filters' => [{ 'field' => 'price' }], 'groups' => [{ 'filters' => [{ 'field' => 'quantity' }] }] }
+ ]
+ }
+
+ expect(helper.send(:count_filters_in_state, state)).to eq(4)
+ end
+ end
+ end
+end
diff --git a/admin/spec/models/spree/admin/table/column_spec.rb b/admin/spec/models/spree/admin/table/column_spec.rb
index 4907e4357b..8021515d1a 100644
--- a/admin/spec/models/spree/admin/table/column_spec.rb
+++ b/admin/spec/models/spree/admin/table/column_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Spree::Admin::Table::Column do
column = described_class.new(
key: 'price',
label: 'Product Price',
- type: 'currency',
+ type: 'money',
sortable: false,
filterable: true,
default: true,
@@ -30,8 +30,8 @@ RSpec.describe Spree::Admin::Table::Column do
)
expect(column.label).to eq('Product Price')
- expect(column.type).to eq('currency')
- expect(column.filter_type).to eq('currency')
+ expect(column.type).to eq('money')
+ expect(column.filter_type).to eq('money')
expect(column.sortable).to be false
expect(column.default).to be true
expect(column.position).to eq(10)
diff --git a/admin/spec/models/spree/admin/table/query_builder_spec.rb b/admin/spec/models/spree/admin/table/query_builder_spec.rb
index 4cf43717f2..193b8ed5ba 100644
--- a/admin/spec/models/spree/admin/table/query_builder_spec.rb
+++ b/admin/spec/models/spree/admin/table/query_builder_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Spree::Admin::Table::QueryBuilder do
before do
table.add(:name, label: 'Name', type: :string, filterable: true)
table.add(:status, label: 'Status', type: :status, filterable: true, value_options: %w[active draft archived])
- table.add(:price, label: 'Price', type: :currency, filterable: true)
+ table.add(:price, label: 'Price', type: :money, filterable: true)
table.add(:created_at, label: 'Created', type: :datetime, filterable: true)
end