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: Improve Developer Experience working with Bulk Operations

Damian Legawiec1625939fcc3e
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 ba735ca228..2e32128098 100644
--- a/admin/app/controllers/concerns/spree/admin/bulk_operations_concern.rb
+++ b/admin/app/controllers/concerns/spree/admin/bulk_operations_concern.rb
@@ -3,6 +3,24 @@ module Spree
module BulkOperationsConcern
extend ActiveSupport::Concern
+ # GET /admin/:resources/bulk_modal?kind=:action_key
+ # Generic bulk modal action that reads configuration from BulkAction
+ def bulk_modal
+ @bulk_action = find_bulk_action(params[:kind])
+
+ if @bulk_action.nil?
+ head :not_found
+ return
+ end
+
+ @title = @bulk_action.resolve_title
+ @body = @bulk_action.resolve_body
+ @form_partial = @bulk_action.form_partial
+ @form_partial_locals = @bulk_action.form_partial_locals || {}
+
+ render partial: 'spree/admin/shared/bulk_modal_content'
+ end
+
def bulk_add_tags
Spree::Tags::BulkAdd.call(tag_names: params[:tags], records: bulk_collection)
@@ -33,6 +51,16 @@ module Spree
def bulk_collection
@bulk_collection ||= model_class.accessible_by(current_ability, :update).where(id: params[:ids])
end
+
+ def find_bulk_action(key)
+ return nil if key.blank?
+
+ table_key = controller_name.to_sym
+ table = Spree.admin.tables.get(table_key)
+ return nil if table.nil?
+
+ table.find_bulk_action(key.to_sym)
+ end
end
end
end
diff --git a/admin/app/controllers/spree/admin/classifications_controller.rb b/admin/app/controllers/spree/admin/classifications_controller.rb
index 74ed18256b..472e1fa9e5 100644
--- a/admin/app/controllers/spree/admin/classifications_controller.rb
+++ b/admin/app/controllers/spree/admin/classifications_controller.rb
@@ -9,7 +9,7 @@ module Spree
# create classifications in bulk
def create
- products = current_store.products.accessible_by(current_ability, :update).where(id: params[:product_ids].compact.uniq)
+ products = current_store.products.accessible_by(current_ability, :update).where(id: params[:ids].compact.uniq)
Spree::Taxons::AddProducts.call(taxons: Spree::Taxon.where(id: parent.id), products: products)
parent.reload
diff --git a/admin/app/controllers/spree/admin/price_list_products_controller.rb b/admin/app/controllers/spree/admin/price_list_products_controller.rb
index 2daf4c537a..f526a4c74e 100644
--- a/admin/app/controllers/spree/admin/price_list_products_controller.rb
+++ b/admin/app/controllers/spree/admin/price_list_products_controller.rb
@@ -1,31 +1,38 @@
module Spree
module Admin
class PriceListProductsController < ResourceController
+ include BulkOperationsConcern
+
belongs_to 'spree/price_list', find_by: :id
+ before_action :set_price_list
+
# GET /admin/price_lists/:price_list_id/products/bulk_new
def bulk_new
- @price_list = parent
@currency = params[:currency] || current_store.default_currency
end
# POST /admin/price_lists/:price_list_id/products/bulk_create.turbo_stream
def bulk_create
- parent.add_products(params[:product_ids])
+ @price_list.add_products(bulk_collection.pluck(:id))
@collection = collection
- @price_list = parent
flash.now[:success] = Spree.t(:products_added)
end
# DELETE /admin/price_lists/:price_list_id/products/bulk_destroy.turbo_stream
def bulk_destroy
- parent.remove_products(params[:ids])
+ @price_list.remove_products(bulk_collection.pluck(:id))
+ flash.now[:success] = Spree.t(:products_removed)
end
private
+ def set_price_list
+ @price_list = parent
+ end
+
def model_class
Spree::Product
end
@@ -37,6 +44,7 @@ module Spree
def edit_object_url(object, options = {})
spree.edit_admin_product_path(object, options)
end
+
end
end
end
diff --git a/admin/app/controllers/spree/admin/products_controller.rb b/admin/app/controllers/spree/admin/products_controller.rb
index 5a96beaf73..01dbdef4a1 100644
--- a/admin/app/controllers/spree/admin/products_controller.rb
+++ b/admin/app/controllers/spree/admin/products_controller.rb
@@ -85,16 +85,6 @@ module Spree
end
end
- def bulk_modal
- if params[:kind] == 'set_status'
- @title = Spree.t('admin.bulk_ops.products.title.set_status', status: params[:status].titleize)
- @body = Spree.t("admin.bulk_ops.products.body.set_status.#{params[:status]}")
- else
- @title = Spree.t("admin.bulk_ops.products.title.#{params[:kind]}")
- @body = Spree.t("admin.bulk_ops.products.body.#{params[:kind]}")
- end
- end
-
def bulk_status_update
if bulk_collection.update_all(status: params[:status], updated_at: Time.current)
product_ids = bulk_collection.ids
diff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rb
index 6e6fb4491e..e319c4c229 100644
--- a/admin/app/controllers/spree/admin/users_controller.rb
+++ b/admin/app/controllers/spree/admin/users_controller.rb
@@ -50,11 +50,6 @@ module Spree
Spree.user_class
end
- def bulk_modal
- @title = Spree.t("admin.bulk_ops.users.title.#{params[:kind]}")
- @body = Spree.t("admin.bulk_ops.users.body.#{params[:kind]}")
- end
-
protected
def collection_includes
diff --git a/admin/app/helpers/spree/admin/table_helper.rb b/admin/app/helpers/spree/admin/table_helper.rb
index f36d7a5635..9343fd3486 100644
--- a/admin/app/helpers/spree/admin/table_helper.rb
+++ b/admin/app/helpers/spree/admin/table_helper.rb
@@ -346,16 +346,21 @@ module Spree
def render_bulk_action(action, **options)
return unless action.visible?(self)
+ action_path = action.action_path.is_a?(Proc) ? action.action_path.call(self) : action.action_path
+ modal_path = action.modal_path.is_a?(Proc) ? action.modal_path.call(self) : action.modal_path
+ confirm_message = resolve_bulk_action_confirm(action.confirm)
+
link_options = {
class: options[:class] || 'btn',
data: {
action: 'click->bulk-operation#setBulkAction click->bulk-dialog#open',
turbo_frame: :bulk_dialog,
- url: action.action_path
+ url: action_path,
+ method: action.method
}
}
- link_options[:data][:confirm] = action.confirm if action.confirm.present?
+ link_options[:data][:confirm] = confirm_message if confirm_message.present?
content = if action.icon.present?
icon(action.icon) + ' ' + action.resolve_label
@@ -363,7 +368,22 @@ module Spree
action.resolve_label
end
- link_to content, action.modal_path, link_options
+ link_to content, modal_path, link_options
+ end
+
+ # Resolve confirm message for bulk action
+ # @param confirm [String, Symbol, nil] the confirm value (can be i18n key or plain string)
+ # @return [String, nil]
+ def resolve_bulk_action_confirm(confirm)
+ return nil if confirm.blank?
+
+ if confirm.is_a?(Symbol)
+ Spree.t(confirm)
+ elsif confirm.is_a?(String) && confirm.start_with?('admin.')
+ Spree.t(confirm, default: confirm)
+ else
+ confirm
+ end
end
# Render bulk actions panel for a table
diff --git a/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.js b/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.js
index 1c261a6a21..8a60d10a06 100644
--- a/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.js
@@ -72,7 +72,33 @@ export default class extends CheckboxSelectAll {
setBulkAction(e) {
this.formTarget.action = e.target.dataset.url
if (e.target.dataset.method) {
- this.formTarget.method = e.target.dataset.method
+ const method = e.target.dataset.method.toLowerCase()
+ // HTML forms only support GET and POST, so use hidden _method field for others
+ if (method === 'get' || method === 'post') {
+ this.formTarget.method = method
+ this.removeMethodInput()
+ } else {
+ this.formTarget.method = 'post'
+ this.setMethodInput(method)
+ }
+ }
+ }
+
+ setMethodInput(method) {
+ let methodInput = this.formTarget.querySelector('input[name="_method"]')
+ if (!methodInput) {
+ methodInput = document.createElement('input')
+ methodInput.type = 'hidden'
+ methodInput.name = '_method'
+ this.formTarget.appendChild(methodInput)
+ }
+ methodInput.value = method
+ }
+
+ removeMethodInput() {
+ const methodInput = this.formTarget.querySelector('input[name="_method"]')
+ if (methodInput) {
+ methodInput.remove()
}
}
}
diff --git a/admin/app/models/spree/admin/table/bulk_action.rb b/admin/app/models/spree/admin/table/bulk_action.rb
index 9ded4092f8..95c983462b 100644
--- a/admin/app/models/spree/admin/table/bulk_action.rb
+++ b/admin/app/models/spree/admin/table/bulk_action.rb
@@ -11,13 +11,21 @@ module Spree
attribute :label
attribute :label_options, default: -> { {} }
attribute :icon, :string
- attribute :modal_path, :string
- attribute :action_path, :string
+ attribute :modal_path
+ attribute :action_path
attribute :position, :integer, default: 999
attribute :condition
- attribute :confirm, :string
+ attribute :confirm
attribute :method, default: :put
+ # Modal content attributes - used by generic bulk_modal action
+ attribute :title
+ attribute :title_options, default: -> { {} }
+ attribute :body
+ attribute :body_options, default: -> { {} }
+ attribute :form_partial, :string
+ attribute :form_partial_locals, default: -> { {} }
+
validates :key, presence: true
validates :method, presence: true, inclusion: { in: METHODS }
@@ -60,6 +68,18 @@ module Spree
end
end
+ # Resolve title for modal dialog (handles i18n keys)
+ # @return [String]
+ def resolve_title
+ resolve_i18n_attribute(title, title_options, "#{key}.title")
+ end
+
+ # Resolve body for modal dialog (handles i18n keys)
+ # @return [String]
+ def resolve_body
+ resolve_i18n_attribute(body, body_options, "#{key}.body")
+ end
+
# Deep clone the action
# @return [BulkAction]
def deep_clone
@@ -69,6 +89,22 @@ module Spree
def inspect
"#<Spree::Admin::Table::BulkAction key=#{key}>"
end
+
+ private
+
+ def resolve_i18n_attribute(value, options, default_key)
+ return nil if value.blank?
+
+ if value.is_a?(Symbol)
+ Spree.t(value, **options)
+ elsif value.is_a?(String) && value.start_with?('admin.')
+ Spree.t(value, **options.merge(default: default_key.to_s.humanize))
+ elsif value.is_a?(String) && value.present?
+ value
+ else
+ Spree.t(default_key, scope: 'admin.bulk_ops', default: default_key.to_s.humanize, **options)
+ end
+ end
end
end
end
diff --git a/admin/app/views/spree/admin/bulk_operations/forms/_confirmation.html.erb b/admin/app/views/spree/admin/bulk_operations/forms/_confirmation.html.erb
new file mode 100644
index 0000000000..bacaacb117
--- /dev/null
+++ b/admin/app/views/spree/admin/bulk_operations/forms/_confirmation.html.erb
@@ -0,0 +1 @@
+<%# Empty partial for confirmation-only modals (no form fields needed) %>
diff --git a/admin/app/views/spree/admin/bulk_operations/forms/_tag_picker.html.erb b/admin/app/views/spree/admin/bulk_operations/forms/_tag_picker.html.erb
new file mode 100644
index 0000000000..b820744b39
--- /dev/null
+++ b/admin/app/views/spree/admin/bulk_operations/forms/_tag_picker.html.erb
@@ -0,0 +1,8 @@
+<%# locals: (allow_create: false) %>
+<%= tom_select_tag 'tags',
+ multiple: true,
+ class: 'w-full',
+ options: tags_json_array,
+ required: true,
+ value_field: :name,
+ create: allow_create %>
diff --git a/admin/app/views/spree/admin/bulk_operations/forms/_taxon_picker.html.erb b/admin/app/views/spree/admin/bulk_operations/forms/_taxon_picker.html.erb
new file mode 100644
index 0000000000..d2e6776692
--- /dev/null
+++ b/admin/app/views/spree/admin/bulk_operations/forms/_taxon_picker.html.erb
@@ -0,0 +1,5 @@
+<%= tom_select_tag 'taxon_ids',
+ multiple: true,
+ class: 'w-full',
+ url: spree.admin_taxons_select_options_path(format: :json),
+ required: true %>
diff --git a/admin/app/views/spree/admin/price_list_products/bulk_destroy.turbo_stream.erb b/admin/app/views/spree/admin/price_list_products/bulk_destroy.turbo_stream.erb
index 9280df4ce9..e3d26b4ac1 100644
--- a/admin/app/views/spree/admin/price_list_products/bulk_destroy.turbo_stream.erb
+++ b/admin/app/views/spree/admin/price_list_products/bulk_destroy.turbo_stream.erb
@@ -1,7 +1,9 @@
-<% params[:ids]&.each do |id| %>
- <%= turbo_stream.remove("product_#{id}") %>
+<%= turbo_render_alerts %>
+
+<%= turbo_stream.replace 'bulk-dialog' do %>
+ <%= render 'spree/admin/shared/bulk_modal' %>
<% end %>
-<%= turbo_stream.update :products_count do %>
- <%= @price_list.products.distinct.count %>
+<% params[:ids]&.each do |id| %>
+ <%= turbo_stream.remove("product_#{id}") %>
<% end %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/products/_search_result.html.erb b/admin/app/views/spree/admin/products/_search_result.html.erb
index c357e4bb09..0253fdc713 100644
--- a/admin/app/views/spree/admin/products/_search_result.html.erb
+++ b/admin/app/views/spree/admin/products/_search_result.html.erb
@@ -1,5 +1,5 @@
<div class="search-picker__option" data-action="click->search-picker#toggle">
- <%= check_box_tag "product_ids[]", product.id, false, id: "ids_#{product.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %>
+ <%= check_box_tag "ids[]", product.id, false, id: "ids_#{product.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %>
<label for="ids_<%= product.id %>">
<%= render 'spree/admin/shared/product_image', object: product %>
<div class="ml-6">
diff --git a/admin/app/views/spree/admin/products/bulk_modal.html.erb b/admin/app/views/spree/admin/products/bulk_modal.html.erb
deleted file mode 100644
index 5ba17b759e..0000000000
--- a/admin/app/views/spree/admin/products/bulk_modal.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<%= turbo_frame_tag :bulk_dialog do %>
- <%= dialog_header(@title, 'bulk-dialog') %>
- <div class="dialog-body overflow-visible">
- <p class="mb-3"><%= @body %></p>
-
- <% if params[:kind] == 'add_to_taxons' || params[:kind] == 'remove_from_taxons' %>
- <%= tom_select_tag 'taxon_ids', multiple: true, class: 'w-full', url: spree.admin_taxons_select_options_path(format: :json), required: true %>
- <% elsif params[:kind] == 'add_tags' || params[:kind] == 'remove_tags' %>
- <%= tom_select_tag 'tags', multiple: true, class: 'w-full', options: tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %>
- <% end %>
- </div>
- <div class="dialog-footer">
- <%= dialog_discard_button('bulk-dialog') %>
- <%= turbo_save_button_tag %>
- </div>
-<% end %>
diff --git a/admin/app/views/spree/admin/shared/_bulk_modal_content.html.erb b/admin/app/views/spree/admin/shared/_bulk_modal_content.html.erb
new file mode 100644
index 0000000000..07bb738a88
--- /dev/null
+++ b/admin/app/views/spree/admin/shared/_bulk_modal_content.html.erb
@@ -0,0 +1,18 @@
+<%# @form_partial is sourced from registered BulkAction configuration, not user input %>
+<%= turbo_frame_tag :bulk_dialog do %>
+ <%= dialog_header(@title, 'bulk-dialog') %>
+ <div class="dialog-body overflow-visible">
+ <% if @body.present? %>
+ <p class="mb-3"><%= @body %></p>
+ <% end %>
+
+ <% if @form_partial.present? %>
+ <%# brakeman:disable:Render - @form_partial comes from BulkAction registry, not params %>
+ <%= render partial: @form_partial, locals: @form_partial_locals || {} %>
+ <% end %>
+ </div>
+ <div class="dialog-footer">
+ <%= dialog_discard_button('bulk-dialog') %>
+ <%= turbo_save_button_tag %>
+ </div>
+<% end %>
diff --git a/admin/app/views/spree/admin/users/bulk_modal.html.erb b/admin/app/views/spree/admin/users/bulk_modal.html.erb
deleted file mode 100644
index 782763a4e8..0000000000
--- a/admin/app/views/spree/admin/users/bulk_modal.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= turbo_frame_tag :bulk_dialog do %>
- <%= dialog_header(@title, 'bulk-dialog') %>
- <div class="dialog-body overflow-visible">
- <p class="mb-3"><%= @body %></p>
-
- <% if params[:kind] == 'add_tags' || params[:kind] == 'remove_tags' %>
- <%= tom_select_tag 'tags', multiple: true, class: 'w-full', options: user_tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %>
- <% end %>
- </div>
- <div class="dialog-footer">
- <%= dialog_discard_button('bulk-dialog') %>
- <%= turbo_save_button_tag %>
- </div>
-<% end %>
diff --git a/admin/config/brakeman.ignore b/admin/config/brakeman.ignore
new file mode 100644
index 0000000000..1f6197104d
--- /dev/null
+++ b/admin/config/brakeman.ignore
@@ -0,0 +1,10 @@
+{
+ "ignored_warnings": [
+ {
+ "fingerprint": "49c48c04e8e7307b26d32cfd6caf251970baaf0a8f3910a1c681600f7b995a53",
+ "note": "form_partial comes from BulkAction registry configuration, not directly from user input. The params[:kind] is used to look up a pre-registered BulkAction object, and only the form_partial attribute from that registered configuration is rendered."
+ }
+ ],
+ "updated": "2026-01-08",
+ "brakeman_version": "7.1.2"
+}
diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rb
index b88b444478..15a158f8c4 100644
--- a/admin/config/initializers/spree_admin_tables.rb
+++ b/admin/config/initializers/spree_admin_tables.rb
@@ -130,28 +130,31 @@ Rails.application.config.after_initialize do
# Products bulk actions
Spree.admin.tables.products.add_bulk_action :set_active,
- label: 'admin.bulk_ops.products.title.set_status',
- label_options: { status: :active },
+ label: 'admin.bulk_ops.products.title.set_active',
icon: 'circle-check',
- modal_path: '/admin/products/bulk_modal?kind=set_status&status=active',
+ 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) }
Spree.admin.tables.products.add_bulk_action :set_draft,
- label: 'admin.bulk_ops.products.title.set_status',
- label_options: { status: :draft },
+ label: 'admin.bulk_ops.products.title.set_draft',
icon: 'circle-dotted',
- modal_path: '/admin/products/bulk_modal?kind=set_status&status=draft',
+ 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
Spree.admin.tables.products.add_bulk_action :set_archived,
- label: 'admin.bulk_ops.products.title.set_status',
- label_options: { status: :archived },
+ label: 'admin.bulk_ops.products.title.set_archived',
icon: 'archive',
- modal_path: '/admin/products/bulk_modal?kind=set_status&status=archived',
+ 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
Spree.admin.tables.products.add_bulk_action :add_to_taxons,
@@ -159,6 +162,9 @@ 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,
condition: -> { can?(:manage, Spree::Classification) }
@@ -167,6 +173,9 @@ 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,
condition: -> { can?(:manage, Spree::Classification) }
@@ -175,6 +184,10 @@ 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 },
position: 60,
condition: -> { can?(:manage_tags, Spree::Product) }
@@ -183,6 +196,10 @@ 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 },
position: 70,
condition: -> { can?(:manage_tags, Spree::Product) }
@@ -538,6 +555,10 @@ 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 },
method: :post,
position: 10,
condition: -> { can?(:manage_tags, Spree.user_class) }
@@ -547,6 +568,10 @@ 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 },
method: :post,
position: 20,
condition: -> { can?(:manage_tags, Spree.user_class) }
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index 7023e22374..98cf695b6b 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -14,11 +14,9 @@ en:
add_to_taxons: 'Select which taxons to add the products to:'
remove_from_taxons: 'Select which taxons to remove the products from:'
remove_tags: 'Select tags to remove from the products:'
- set_return_rule: Select return rule for products
- set_status:
- active: Setting products to active will make those products available on the storefront.
- archived: Setting products to archived will hide them from storefront.
- draft: Setting products to draft will hide them from storefront.
+ set_active: Setting products to active will make those products available on the storefront.
+ set_archived: Setting products to archived will hide them from storefront.
+ set_draft: Setting products to draft will hide them from storefront.
status_updated: Status updated
title:
add_tags: Add tags
@@ -27,9 +25,9 @@ en:
remove_from_brand: Remove from brand
remove_from_taxons: Remove from taxons
remove_tags: Remove tags
- set_return_rule: Set Return Rule
- set_size_chart: Set Size Chart
- set_status: Set as %{status}
+ set_active: Set as Active
+ set_archived: Set as Archived
+ set_draft: Set as Draft
users:
body:
add_tags: 'Select tags to add to the customers:'
diff --git a/admin/spec/controllers/spree/admin/classifications_controller_spec.rb b/admin/spec/controllers/spree/admin/classifications_controller_spec.rb
index fbb7b0f59b..8b3898cd1d 100644
--- a/admin/spec/controllers/spree/admin/classifications_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/classifications_controller_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Spree::Admin::ClassificationsController, type: :controller do
end
describe 'POST #create' do
- subject { post :create, params: { taxon_id: taxon.id, product_ids: [product1.id, product2.id], format: :turbo_stream } }
+ subject { post :create, params: { taxon_id: taxon.id, ids: [product1.id, product2.id], format: :turbo_stream } }
it 'creates classifications' do
expect { subject }.to change(Spree::Classification, :count).by(2)
diff --git a/admin/spec/controllers/spree/admin/products_controller_spec.rb b/admin/spec/controllers/spree/admin/products_controller_spec.rb
index 41b85fceb0..e1863868d3 100644
--- a/admin/spec/controllers/spree/admin/products_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/products_controller_spec.rb
@@ -1505,10 +1505,18 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller do
describe 'GET #bulk_modal' do
context 'as admin' do
- it 'renders modal' do
- get :bulk_modal
+ it 'renders modal for set_active' do
+ get :bulk_modal, params: { kind: 'set_active' }
- expect(response).to render_template('bulk_modal')
+ expect(response).to have_http_status(:ok)
+ expect(assigns[:title]).to eq(Spree.t('admin.bulk_ops.products.title.set_active'))
+ expect(assigns[:body]).to eq(Spree.t('admin.bulk_ops.products.body.set_active'))
+ end
+
+ it 'returns not found for unknown kind' do
+ get :bulk_modal, params: { kind: 'unknown' }
+
+ expect(response).to have_http_status(:not_found)
end
end
end
diff --git a/admin/spec/controllers/spree/admin/users_controller_spec.rb b/admin/spec/controllers/spree/admin/users_controller_spec.rb
index 362e1617fd..4bec217b4e 100644
--- a/admin/spec/controllers/spree/admin/users_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/users_controller_spec.rb
@@ -163,11 +163,15 @@ RSpec.describe Spree::Admin::UsersController, type: :controller do
get :bulk_modal, params: { kind: 'add_tags' }
expect(response).to have_http_status(:ok)
- expect(response).to render_template(:bulk_modal)
-
expect(assigns[:title]).to eq(Spree.t('admin.bulk_ops.users.title.add_tags'))
expect(assigns[:body]).to eq(Spree.t('admin.bulk_ops.users.body.add_tags'))
end
+
+ it 'returns not found for unknown kind' do
+ get :bulk_modal, params: { kind: 'unknown' }
+
+ expect(response).to have_http_status(:not_found)
+ end
end
describe 'POST #bulk_add_tags' do