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.

Added `Admin::BulkOperationsHelper` (#12621)

Damian Legawiece77cd7eb53eb
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss b/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss
index dd2efee50c..6df84ea1df 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss
@@ -5,6 +5,9 @@
background-color: $white;
padding: 0.5rem;
box-shadow: $dropdown-box-shadow;
+ animation: bounceInUp;
+ animation-duration: 0.5s;
+ gap: 0.75rem;
}
#bulk-panel {
@@ -28,4 +31,11 @@
left: 16.66666667%;
width: 83.33333333%;
}
-}
\ No newline at end of file
+}
+
+.bulk-operations-counter {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ gap: 0.25rem;
+}
diff --git a/admin/app/helpers/spree/admin/bulk_operations_helper.rb b/admin/app/helpers/spree/admin/bulk_operations_helper.rb
new file mode 100644
index 0000000000..c5d47a87dd
--- /dev/null
+++ b/admin/app/helpers/spree/admin/bulk_operations_helper.rb
@@ -0,0 +1,69 @@
+module Spree
+ module Admin
+ module BulkOperationsHelper
+ def bulk_operations_select_all_checkbox
+ content_tag :div, class: "custom-control custom-checkbox ml-1" do
+ check_box_tag(
+ nil,
+ nil,
+ false,
+ id: "checkAllMasterCheckbox",
+ class: "custom-control-input",
+ data: { bulk_operation_target: "checkboxAll" }
+ ) +
+ content_tag(:label, content_tag(:span, ""), class: "custom-control-label", for: "checkAllMasterCheckbox")
+ end
+ end
+
+ def bulk_operations_checkbox(object)
+ content_tag :div, class: "custom-control custom-checkbox ml-1" do
+ check_box_tag(
+ "ids[]",
+ object.id,
+ false,
+ class: "custom-control-input",
+ id: "ids_#{object.id}",
+ data: { bulk_operation_target: "checkbox" }
+ ) +
+ content_tag(:label, content_tag(:span, ""), class: "custom-control-label", for: "ids_#{object.id}")
+ end
+ end
+
+ def bulk_action_link(text, path, options = {})
+ options[:data] ||= {}
+ options[:data][:action] ||= 'click->bulk-operation#setBulkAction'
+ options[:data][:turbo_frame] ||= :bulk_modal
+ options[:data][:url] ||= options[:url]
+ options[:class] ||= 'btn btn-light'
+
+ if options[:icon]
+ text = icon(options[:icon]) + ' ' + text
+ end
+
+ content_tag :span, data: { toggle: 'modal', target: '#bulk-modal' } do
+ link_to text, path, options
+ end
+ end
+
+ def bulk_operations_close_button
+ button_tag(
+ '',
+ type: 'button',
+ class: 'btn-close',
+ data: {
+ dismiss: 'modal',
+ aria_label: Spree.t(:close),
+ action: 'bulk-operation#cancel'
+ }
+ )
+ end
+
+ def bulk_operations_counter
+ content_tag(:span, class: 'bulk-operations-counter ml-1') do
+ content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
+ Spree.t("admin.selected")
+ end
+ end
+ end
+ end
+end
diff --git a/admin/app/views/spree/admin/products/_bulk_operations.html.erb b/admin/app/views/spree/admin/products/_bulk_operations.html.erb
index 6f47fc3ee0..50e610c7ca 100644
--- a/admin/app/views/spree/admin/products/_bulk_operations.html.erb
+++ b/admin/app/views/spree/admin/products/_bulk_operations.html.erb
@@ -1,35 +1,22 @@
<div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
- <div
- class="
- bulk-panel-container animate__animated animate__bounceInUp animate__faster
- "
- >
- <div data-toggle="modal" data-target="#bulk-modal">
- <% if can?(:activate, Spree::Product) %>
- <a
- href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :active) %>"
- data-turbo-frame="bulk_modal"
- class="btn btn-light mr-2 d-vendor"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_status_update_admin_products_path(status: :active) %>"
- >
- <%= icon("circle-check") %>
- <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :active) %>
- </a>
- <% end %>
- <a
- href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :draft) %>"
- data-turbo-frame="bulk_modal"
- class="btn btn-light mr-2"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_status_update_admin_products_path(status: :draft) %>"
- >
- <%= icon("circle-dotted") %>
- <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :draft) %>
- </a>
- </div>
+ <div class="bulk-panel-container">
+ <% if can?(:activate, Spree::Product) %>
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.products.title.set_status", status: :active),
+ spree.bulk_modal_admin_products_path(kind: :set_status, status: :active),
+ icon: "circle-check",
+ url: spree.bulk_status_update_admin_products_path(status: :active)
+ ) %>
+ <% end %>
+
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.products.title.set_status", status: :draft),
+ spree.bulk_modal_admin_products_path(kind: :set_status, status: :draft),
+ icon: "circle-dotted",
+ url: spree.bulk_status_update_admin_products_path(status: :draft)
+ ) %>
- <div class="dropdown dropup mr-3 ml-1" role="group">
+ <div class="dropdown dropup" role="group">
<button
type="button"
data-display="static"
@@ -43,80 +30,58 @@
<div
class="dropdown-menu dropdown-menu-left"
aria-labelledby="btnGroupDrop1"
- data-toggle="modal"
- data-target="#bulk-modal"
>
- <a
- href="<%= spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived) %>"
- data-turbo-frame="bulk_modal"
- class="dropdown-item"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_status_update_admin_products_path(status: :archived) %>"
- >
- <%= icon("archive") %>
- <%= Spree.t("admin.bulk_ops.products.title.set_status", status: :archived) %>
- </a>
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.products.title.set_status", status: :archived),
+ spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived),
+ icon: "archive",
+ url: spree.bulk_status_update_admin_products_path(status: :archived),
+ class: "dropdown-item"
+ ) %>
+
<% if can?(:manage, Spree::Classification) %>
<div class="dropdown-divider"></div>
- <a
- href="<%= spree.bulk_modal_admin_products_path(kind: :add_to_taxons) %>"
- data-turbo-frame="bulk_modal"
- class="dropdown-item"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_add_to_taxons_admin_products_path %>"
- >
- <%= icon("category-plus") %>
- <%= Spree.t("admin.bulk_ops.products.title.add_to_taxons") %>
- </a>
- <a
- href="<%= spree.bulk_modal_admin_products_path(kind: :remove_from_taxons) %>"
- data-turbo-frame="bulk_modal"
- class="dropdown-item"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_remove_from_taxons_admin_products_path %>"
- >
- <%= icon("category-minus") %>
- <%= Spree.t("admin.bulk_ops.products.title.remove_from_taxons") %>
- </a>
+
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.products.title.add_to_taxons"),
+ spree.bulk_modal_admin_products_path(kind: :add_to_taxons),
+ icon: "category-plus",
+ url: spree.bulk_add_to_taxons_admin_products_path,
+ class: "dropdown-item"
+ ) %>
+
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.products.title.remove_from_taxons"),
+ spree.bulk_modal_admin_products_path(kind: :remove_from_taxons),
+ icon: "category-minus",
+ url: spree.bulk_remove_from_taxons_admin_products_path,
+ class: "dropdown-item"
+ ) %>
<% end %>
<% if can?(:manage_tags, Spree::Product) %>
<div class="dropdown-divider"></div>
- <a
- href="<%= spree.bulk_modal_admin_products_path(kind: :add_tags) %>"
- data-turbo-frame="bulk_modal"
- class="dropdown-item"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_add_tags_admin_products_path %>"
- >
- <%= icon("tag-plus") %>
- <%= Spree.t("admin.bulk_ops.products.title.add_tags") %>
- </a>
- <a
- href="<%= spree.bulk_modal_admin_products_path(kind: :remove_tags) %>"
- data-turbo-frame="bulk_modal"
- class="dropdown-item"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_remove_tags_admin_products_path %>"
- >
- <%= icon("tag-minus") %>
- <%= Spree.t("admin.bulk_ops.products.title.remove_tags") %>
- </a>
+
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.products.title.add_tags"),
+ spree.bulk_modal_admin_products_path(kind: :add_tags),
+ icon: "tag-plus",
+ url: spree.bulk_add_tags_admin_products_path,
+ class: "dropdown-item"
+ ) %>
+
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.products.title.remove_tags"),
+ spree.bulk_modal_admin_products_path(kind: :remove_tags),
+ icon: "tag-minus",
+ url: spree.bulk_remove_tags_admin_products_path,
+ class: "dropdown-item"
+ ) %>
<% end %>
</div>
</div>
- <span>
- <strong data-bulk-operation-target="counter"></strong>
- <%= Spree.t("admin.products.selected") %>
- </span>
-
- <button
- type="button"
- class="btn-close ml-2"
- data-dismiss="modal"
- aria-label="<%= Spree.t(:close) %>"
- data-action="bulk-operation#cancel"
- />
+ <%= bulk_operations_counter %>
+ <%= bulk_operations_close_button %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/products/_list.html.erb b/admin/app/views/spree/admin/products/_list.html.erb
index 19368ed21d..6801151231 100644
--- a/admin/app/views/spree/admin/products/_list.html.erb
+++ b/admin/app/views/spree/admin/products/_list.html.erb
@@ -9,15 +9,7 @@
<thead class="text-muted">
<tr>
<th scope="col" class="pr-0 w-5">
- <div class="custom-control custom-checkbox ml-1">
- <input
- type="checkbox"
- class="custom-control-input"
- id="checkAllMasterCheckbox"
- data-bulk-operation-target="checkboxAll"
- >
- <label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label>
- </div>
+ <%= bulk_operations_select_all_checkbox %>
</th>
<th scope="col">
<%= sort_link @search,
diff --git a/admin/app/views/spree/admin/products/_product.html.erb b/admin/app/views/spree/admin/products/_product.html.erb
index 40f3c84ccb..9356faf9c4 100644
--- a/admin/app/views/spree/admin/products/_product.html.erb
+++ b/admin/app/views/spree/admin/products/_product.html.erb
@@ -1,9 +1,6 @@
<tr id="<%= dom_id product %>" data-controller="row-link">
<td class="pr-0 w-5">
- <div class="custom-control custom-checkbox ml-1">
- <%= check_box_tag "ids[]", product.id, false, class: "custom-control-input", id: "ids_#{product.id}", data: { bulk_operation_target: "checkbox" } %>
- <label class="custom-control-label" for="ids_<%= product.id %>"><span></span></label>
- </div>
+ <%= bulk_operations_checkbox(product) %>
</td>
<td scope="row" class="w-40 py-0 text-wrap" data-action="click->row-link#openLink">
<%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center w-100 text-decoration-none h-100 py-2', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>
diff --git a/admin/app/views/spree/admin/users/_user.html.erb b/admin/app/views/spree/admin/users/_user.html.erb
index 43c98b9839..e4e2584cb3 100644
--- a/admin/app/views/spree/admin/users/_user.html.erb
+++ b/admin/app/views/spree/admin/users/_user.html.erb
@@ -1,9 +1,6 @@
<tr id="<%= spree_dom_id user %>">
<td class="pr-0 w-5">
- <div class="custom-control custom-checkbox ml-1">
- <%= check_box_tag "ids[]", user.id, false, class: "custom-control-input", id: "ids_#{user.id}", data: { bulk_operation_target: "checkbox" } %>
- <label class="custom-control-label" for="ids_<%= user.id %>"><span></span></label>
- </div>
+ <%= bulk_operations_checkbox(user) %>
</td>
<td class='user_name w-50 no-wrap py-0 pl-1 pr-0'>
<%= render 'spree/admin/shared/user', user: user %>
diff --git a/admin/app/views/spree/admin/users/index.html.erb b/admin/app/views/spree/admin/users/index.html.erb
index b28fabd768..c39a05bbbb 100644
--- a/admin/app/views/spree/admin/users/index.html.erb
+++ b/admin/app/views/spree/admin/users/index.html.erb
@@ -21,45 +21,23 @@
<%= form_tag spree.admin_users_path, data: { 'bulk-operation-target': 'form' } do %>
<%= render 'spree/admin/shared/bulk_modal' %>
<div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
- <div class="bulk-panel-container animate__animated animate__bounceInUp animate__faster">
- <div data-toggle="modal" data-target="#bulk-modal">
- <% if can?(:manage_tags, Spree.user_class) %>
- <a
- href="<%= spree.bulk_modal_admin_users_path(kind: :add_tags) %>"
- data-turbo-frame="bulk_modal"
- class="btn btn-light mr-2"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_add_tags_admin_users_path %>"
- >
- <%= icon("tag-plus") %>
- <%= Spree.t("admin.bulk_ops.users.title.add_tags") %>
- </a>
-
- <a
- href="<%= spree.bulk_modal_admin_users_path(kind: :remove_tags) %>"
- data-turbo-frame="bulk_modal"
- class="btn btn-light mr-3"
- data-action="click->bulk-operation#setBulkAction"
- data-url="<%= spree.bulk_remove_tags_admin_users_path %>"
- >
- <%= icon("tag-minus") %>
- <%= Spree.t("admin.bulk_ops.users.title.remove_tags") %>
- </a>
- <% end %>
- </div>
-
- <span>
- <strong data-bulk-operation-target="counter"></strong>
- customers selected
- </span>
-
- <button
- type="button"
- class="btn-close ml-2"
- data-dismiss="modal"
- aria-label="<%= Spree.t(:close) %>"
- data-action="bulk-operation#cancel"
- />
+ <div class="bulk-panel-container">
+ <% if can?(:manage_tags, Spree.user_class) %>
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.users.title.add_tags"),
+ spree.bulk_modal_admin_users_path(kind: :add_tags),
+ icon: "tag-plus",
+ url: spree.bulk_add_tags_admin_users_path
+ ) %>
+ <%= bulk_action_link(
+ Spree.t("admin.bulk_ops.users.title.remove_tags"),
+ spree.bulk_modal_admin_users_path(kind: :remove_tags),
+ icon: "tag-minus",
+ url: spree.bulk_remove_tags_admin_users_path
+ ) %>
+ <% end %>
+ <%= bulk_operations_counter %>
+ <%= bulk_operations_close_button %>
</div>
</div>
@@ -68,15 +46,7 @@
<thead class="text-muted">
<tr data-hook="admin_users_index_headers">
<th scope="col" class="pr-0 w-5">
- <div class="custom-control custom-checkbox ml-1">
- <input
- type="checkbox"
- class="custom-control-input"
- id="checkAllMasterCheckbox"
- data-bulk-operation-target="checkboxAll"
- >
- <label class="custom-control-label" for="checkAllMasterCheckbox"><span></span></label>
- </div>
+ <%= bulk_operations_select_all_checkbox %>
</th>
<th><%= Spree.t(:name) %></th>
<th><%= Spree.t(:email_marketing) %></th>
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index 8bad0a80ca..53c8680036 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -169,7 +169,6 @@ en:
paused: Paused
search_results:
no_products: We couldn't find any products matching your search :(
- selected: products selected
seo:
placeholder: Add a title and description to see how this product might appear in a search engine listing
status_form:
@@ -184,6 +183,7 @@ en:
report_created: Your report is being generated. You will receive an email with a download link when it is ready!
reset_digital_link_download_limits: Reset download limits
response_code: Response Code
+ selected: selected
send_payment_link: Send Payment Link
shipment_transfer:
wrong_destination: Wrong destination