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.

Simplify Bulk Actions code

Damian Legawiec95227b1ccea9
diff --git a/admin/app/controllers/concerns/spree/admin/bulk_operations_concern.rb b/admin/app/controllers/concerns/spree/admin/bulk_operations_concern.rb
index 2e32128098..ef734c6095 100644
--- a/admin/app/controllers/concerns/spree/admin/bulk_operations_concern.rb
+++ b/admin/app/controllers/concerns/spree/admin/bulk_operations_concern.rb
@@ -23,18 +23,25 @@ module Spree
def bulk_add_tags
Spree::Tags::BulkAdd.call(tag_names: params[:tags], records: bulk_collection)
+ after_bulk_tags_change
handle_bulk_operation_response
end
def bulk_remove_tags
Spree::Tags::BulkRemove.call(tag_names: params[:tags], records: bulk_collection)
+ after_bulk_tags_change
handle_bulk_operation_response
end
private
+ # Hook for subclasses to perform additional actions after bulk tag operations
+ def after_bulk_tags_change
+ # Override in controller to add custom behavior
+ end
+
def handle_bulk_operation_response
respond_to do |format|
format.turbo_stream do
diff --git a/admin/app/controllers/spree/admin/products_controller.rb b/admin/app/controllers/spree/admin/products_controller.rb
index 01dbdef4a1..f3d0c1129c 100644
--- a/admin/app/controllers/spree/admin/products_controller.rb
+++ b/admin/app/controllers/spree/admin/products_controller.rb
@@ -104,20 +104,6 @@ module Spree
end
end
- def bulk_add_tags
- Spree::Tags::BulkAdd.call(tag_names: params[:tags], records: bulk_collection)
- Spree::Product.bulk_auto_match_taxons(current_store, bulk_collection.ids)
-
- handle_bulk_operation_response
- end
-
- def bulk_remove_tags
- Spree::Tags::BulkRemove.call(tag_names: params[:tags], records: bulk_collection)
- Spree::Product.bulk_auto_match_taxons(current_store, bulk_collection.ids)
-
- handle_bulk_operation_response
- end
-
def bulk_remove_from_taxons
taxons = current_store.taxons.accessible_by(current_ability, :manage).where(id: params[:taxon_ids])
Spree::Taxons::RemoveProducts.call(taxons: taxons, products: bulk_collection)
@@ -282,6 +268,10 @@ module Spree
private
+ def after_bulk_tags_change
+ Spree::Product.bulk_auto_match_taxons(current_store, bulk_collection.ids)
+ end
+
def variant_stock_includes
[:images, { stock_items: :stock_location, option_values: :option_type }]
end
diff --git a/admin/app/models/spree/admin/table/bulk_action.rb b/admin/app/models/spree/admin/table/bulk_action.rb
index 95c983462b..34e1a058c0 100644
--- a/admin/app/models/spree/admin/table/bulk_action.rb
+++ b/admin/app/models/spree/admin/table/bulk_action.rb
@@ -42,36 +42,23 @@ module Spree
# @return [Boolean]
def visible?(context = nil)
return true if condition.nil?
+ return condition unless condition.respond_to?(:call)
- if condition.respond_to?(:call)
- if context&.respond_to?(:instance_exec)
- context.instance_exec(&condition)
- else
- condition.call(context)
- end
- else
- condition
- end
+ context&.respond_to?(:instance_exec) ? context.instance_exec(&condition) : condition.call(context)
end
# Resolve label (handles i18n keys)
# @return [String]
def resolve_label
- if label.is_a?(String) && label.start_with?('admin.')
- # Full translation key
- Spree.t(label, **label_options.merge(default: key.to_s.humanize))
- elsif label.is_a?(String) && label.present?
- label
- else
- key_to_translate = label || key
- Spree.t(key_to_translate, scope: 'admin.bulk_ops', default: key_to_translate.to_s.humanize, **label_options)
- end
+ resolve_i18n_attribute(label || key, label_options, key.to_s) || key.to_s.humanize
end
# Resolve title for modal dialog (handles i18n keys)
+ # Falls back to label if title is not set
# @return [String]
def resolve_title
- resolve_i18n_attribute(title, title_options, "#{key}.title")
+ resolve_i18n_attribute(title, title_options, "#{key}.title") ||
+ resolve_i18n_attribute(label, label_options, key.to_s)
end
# Resolve body for modal dialog (handles i18n keys)
@@ -95,11 +82,12 @@ module Spree
def resolve_i18n_attribute(value, options, default_key)
return nil if value.blank?
- if value.is_a?(Symbol)
+ case value
+ when Symbol
Spree.t(value, **options)
- elsif value.is_a?(String) && value.start_with?('admin.')
+ when /\Aadmin\./
Spree.t(value, **options.merge(default: default_key.to_s.humanize))
- elsif value.is_a?(String) && value.present?
+ when String
value
else
Spree.t(default_key, scope: 'admin.bulk_ops', default: default_key.to_s.humanize, **options)
diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rb
index 85acba4a86..ee145d346f 100644
--- a/admin/config/initializers/spree_admin_tables.rb
+++ b/admin/config/initializers/spree_admin_tables.rb
@@ -134,7 +134,6 @@ Rails.application.config.after_initialize do
icon: 'circle-check',
modal_path: '/admin/products/bulk_modal?kind=set_active',
action_path: '/admin/products/bulk_status_update?status=active',
- title: 'admin.bulk_ops.products.title.set_active',
body: 'admin.bulk_ops.products.body.set_active',
position: 10,
condition: -> { can?(:activate, Spree::Product) }
@@ -144,7 +143,6 @@ Rails.application.config.after_initialize do
icon: 'circle-dotted',
modal_path: '/admin/products/bulk_modal?kind=set_draft',
action_path: '/admin/products/bulk_status_update?status=draft',
- title: 'admin.bulk_ops.products.title.set_draft',
body: 'admin.bulk_ops.products.body.set_draft',
position: 20
@@ -153,7 +151,6 @@ Rails.application.config.after_initialize do
icon: 'archive',
modal_path: '/admin/products/bulk_modal?kind=set_archived',
action_path: '/admin/products/bulk_status_update?status=archived',
- title: 'admin.bulk_ops.products.title.set_archived',
body: 'admin.bulk_ops.products.body.set_archived',
position: 30
@@ -162,7 +159,6 @@ Rails.application.config.after_initialize do
icon: 'category-plus',
modal_path: '/admin/products/bulk_modal?kind=add_to_taxons',
action_path: '/admin/products/bulk_add_to_taxons',
- title: 'admin.bulk_ops.products.title.add_to_taxons',
body: 'admin.bulk_ops.products.body.add_to_taxons',
form_partial: 'spree/admin/bulk_operations/forms/taxon_picker',
position: 40,
@@ -173,7 +169,6 @@ Rails.application.config.after_initialize do
icon: 'category-minus',
modal_path: '/admin/products/bulk_modal?kind=remove_from_taxons',
action_path: '/admin/products/bulk_remove_from_taxons',
- title: 'admin.bulk_ops.products.title.remove_from_taxons',
body: 'admin.bulk_ops.products.body.remove_from_taxons',
form_partial: 'spree/admin/bulk_operations/forms/taxon_picker',
position: 50,
@@ -184,7 +179,6 @@ Rails.application.config.after_initialize do
icon: 'tag-plus',
modal_path: '/admin/products/bulk_modal?kind=add_tags',
action_path: '/admin/products/bulk_add_tags',
- title: 'admin.bulk_ops.products.title.add_tags',
body: 'admin.bulk_ops.products.body.add_tags',
form_partial: 'spree/admin/bulk_operations/forms/tag_picker',
form_partial_locals: { allow_create: true },
@@ -196,7 +190,6 @@ Rails.application.config.after_initialize do
icon: 'tag-minus',
modal_path: '/admin/products/bulk_modal?kind=remove_tags',
action_path: '/admin/products/bulk_remove_tags',
- title: 'admin.bulk_ops.products.title.remove_tags',
body: 'admin.bulk_ops.products.body.remove_tags',
form_partial: 'spree/admin/bulk_operations/forms/tag_picker',
form_partial_locals: { allow_create: false },
@@ -555,7 +548,6 @@ Rails.application.config.after_initialize do
icon: 'tag-plus',
modal_path: '/admin/users/bulk_modal?kind=add_tags',
action_path: '/admin/users/bulk_add_tags',
- title: 'admin.bulk_ops.users.title.add_tags',
body: 'admin.bulk_ops.users.body.add_tags',
form_partial: 'spree/admin/bulk_operations/forms/tag_picker',
form_partial_locals: { allow_create: true },
@@ -568,7 +560,6 @@ Rails.application.config.after_initialize do
icon: 'tag-minus',
modal_path: '/admin/users/bulk_modal?kind=remove_tags',
action_path: '/admin/users/bulk_remove_tags',
- title: 'admin.bulk_ops.users.title.remove_tags',
body: 'admin.bulk_ops.users.body.remove_tags',
form_partial: 'spree/admin/bulk_operations/forms/tag_picker',
form_partial_locals: { allow_create: false },
@@ -1543,7 +1534,6 @@ Rails.application.config.after_initialize do
icon: 'trash',
modal_path: ->(view_context) { view_context.spree.bulk_modal_admin_price_list_products_path(view_context.instance_variable_get(:@price_list), kind: :remove_from_price_list) },
action_path: ->(view_context) { view_context.spree.bulk_destroy_admin_price_list_products_path(view_context.instance_variable_get(:@price_list)) },
- title: 'admin.bulk_ops.price_list_products.title.remove',
body: 'admin.bulk_ops.price_list_products.body.remove',
method: :delete,
position: 10