solidus_admin 0.3.1 → 0.4.0

data/app/components/solidus_admin/stock_locations/index/component.rb

@@ -57,7 +57,7 @@ class SolidusAdmin::StockLocations::Index::Component < SolidusAdmin::Shipping::C
           color = _1.active? ? :green : :graphite_light
           text = _1.active? ? t('.active') : t('.inactive')
 
-          component('ui/badge').new(name: text, color: color)
+          component('ui/badge').new(name: text, color:)
         },
       },
       {
@@ -78,7 +78,7 @@ class SolidusAdmin::StockLocations::Index::Component < SolidusAdmin::Shipping::C
           count = _1.stock_movements.count
 
           link_to(
-            "#{count} #{Spree::StockMovement.model_name.human(count: count).downcase}",
+            "#{count} #{Spree::StockMovement.model_name.human(count:).downcase}",
             spree.admin_stock_location_stock_movements_path(_1),
             class: 'body-link'
           )

data/app/components/solidus_admin/store_credit_reasons/edit/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_store_credit_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @store_credit_reason, url: solidus_admin.store_credit_reason_path(@store_credit_reason), html: { id: form_id } do |f| %>
+    <%= form_for @store_credit_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
         <label class="flex gap-2 items-center">
@@ -23,4 +23,3 @@
     <% end %>
   <% end %>
 <% end %>
-<%= render component("store_credit_reasons/index").new(page: @page) %>

data/app/components/solidus_admin/store_credit_reasons/edit/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::StoreCreditReasons::Edit::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, store_credit_reason:)
-    @page = page
-    @store_credit_reason = store_credit_reason
-  end
-
-  def form_id
-    dom_id(@store_credit_reason, "#{stimulus_id}_edit_store_credit_reason_form")
-  end
+class SolidusAdmin::StoreCreditReasons::Edit::Component < SolidusAdmin::Resources::Edit::Component
 end

data/app/components/solidus_admin/store_credit_reasons/index/component.rb

@@ -9,7 +9,8 @@ class SolidusAdmin::StoreCreditReasons::Index::Component < SolidusAdmin::Refunds
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: solidus_admin.new_store_credit_reason_path, data: { turbo_frame: :new_store_credit_reason_modal },
+      href: solidus_admin.new_store_credit_reason_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
@@ -17,13 +18,12 @@ class SolidusAdmin::StoreCreditReasons::Index::Component < SolidusAdmin::Refunds
 
   def turbo_frames
     %w[
-      new_store_credit_reason_modal
-      edit_store_credit_reason_modal
+      resource_modal
     ]
   end
 
-  def row_url(store_credit_reason)
-    spree.edit_admin_store_credit_reason_path(store_credit_reason, _turbo_frame: :edit_store_credit_reason_modal)
+  def edit_path(store_credit_reason)
+    spree.edit_admin_store_credit_reason_path(store_credit_reason, **search_filter_params)
   end
 
   def search_url
@@ -38,7 +38,7 @@ class SolidusAdmin::StoreCreditReasons::Index::Component < SolidusAdmin::Refunds
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.store_credit_reasons_path,
+        action: solidus_admin.store_credit_reasons_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -47,7 +47,14 @@ class SolidusAdmin::StoreCreditReasons::Index::Component < SolidusAdmin::Refunds
 
   def columns
     [
-      :name,
+      {
+        header: :name,
+        data: ->(store_credit_reason) do
+          link_to store_credit_reason.name, edit_path(store_credit_reason),
+            data: { turbo_frame: :resource_modal },
+            class: 'body-link'
+        end
+      },
       {
         header: :active,
         data: ->(store_credit_reason) do

data/app/components/solidus_admin/store_credit_reasons/new/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :new_store_credit_reason_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @store_credit_reason, url: solidus_admin.store_credit_reasons_path, html: { id: form_id } do |f| %>
+    <%= form_for @store_credit_reason, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
         <label class="flex gap-2 items-center">
@@ -23,5 +23,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("store_credit_reasons/index").new(page: @page) %>

data/app/components/solidus_admin/store_credit_reasons/new/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::StoreCreditReasons::New::Component < SolidusAdmin::BaseComponent
-  def initialize(page:, store_credit_reason:)
-    @page = page
-    @store_credit_reason = store_credit_reason
-  end
-
-  def form_id
-    dom_id(@store_credit_reason, "#{stimulus_id}_new_store_credit_reason_form")
-  end
+class SolidusAdmin::StoreCreditReasons::New::Component < SolidusAdmin::Resources::New::Component
 end

data/app/components/solidus_admin/tax_categories/edit/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :edit_tax_category_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @tax_category, url: solidus_admin.tax_category_path(@tax_category), html: { id: form_id } do |f| %>
+    <%= form_for @tax_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name) %>
         <%= render component("ui/forms/field").text_field(f, :tax_code) %>
@@ -24,5 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("tax_categories/index").new(page: @page) %>

data/app/components/solidus_admin/tax_categories/edit/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::TaxCategories::Edit::Component < SolidusAdmin::TaxCategories::Index::Component
-  def initialize(page:, tax_category:)
-    @page = page
-    @tax_category = tax_category
-  end
-
-  def form_id
-    dom_id(@tax_category, "#{stimulus_id}_edit_tax_category_form")
-  end
+class SolidusAdmin::TaxCategories::Edit::Component < SolidusAdmin::Resources::Edit::Component
 end

data/app/components/solidus_admin/tax_categories/index/component.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Component
-  def row_url(tax_category)
-    spree.edit_admin_tax_category_path(tax_category, _turbo_frame: :edit_tax_category_modal)
+  def edit_path(tax_category)
+    spree.edit_admin_tax_category_path(tax_category, **search_filter_params)
   end
 
   def model_class
@@ -17,7 +17,8 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
     render component("ui/button").new(
       tag: :a,
       text: t('.add'),
-      href: solidus_admin.new_tax_category_path, data: { turbo_frame: :new_tax_category_modal },
+      href: solidus_admin.new_tax_category_path(**search_filter_params),
+      data: { turbo_frame: :resource_modal },
       icon: "add-line",
       class: "align-self-end w-full",
     )
@@ -25,8 +26,7 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
 
   def turbo_frames
     %w[
-      new_tax_category_modal
-      edit_tax_category_modal
+      resource_modal
     ]
   end
 
@@ -38,7 +38,7 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
     [
       {
         label: t('.batch_actions.delete'),
-        action: solidus_admin.tax_categories_path,
+        action: solidus_admin.tax_categories_path(**search_filter_params),
         method: :delete,
         icon: 'delete-bin-7-line',
       },
@@ -47,9 +47,30 @@ class SolidusAdmin::TaxCategories::Index::Component < SolidusAdmin::Taxes::Compo
 
   def columns
     [
-      :name,
-      :tax_code,
-      :description,
+      {
+        header: :name,
+        data: ->(tax_category) do
+          link_to tax_category.name, edit_path(tax_category),
+            data: { turbo_frame: :resource_modal },
+            class: 'body-link'
+        end
+      },
+      {
+        header: :tax_code,
+        data: ->(tax_category) do
+          link_to_if tax_category.tax_code, tax_category.tax_code, edit_path(tax_category),
+            data: { turbo_frame: :resource_modal },
+            class: 'body-link'
+        end
+      },
+      {
+        header: :description,
+        data: ->(tax_category) do
+          link_to_if tax_category.description, tax_category.description, edit_path(tax_category),
+            data: { turbo_frame: :resource_modal },
+            class: 'body-link'
+        end
+      },
       {
         header: :is_default,
         data: ->(tax_category) {

data/app/components/solidus_admin/tax_categories/new/component.html.erb

@@ -1,6 +1,6 @@
-<%= turbo_frame_tag :new_tax_category_modal do %>
+<%= turbo_frame_tag :resource_modal, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @tax_category, url: solidus_admin.tax_categories_path(page: params[:page], q: params[:q]), html: { id: form_id } do |f| %>
+    <%= form_for @tax_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
         <%= render component("ui/forms/field").text_field(f, :name) %>
         <%= render component("ui/forms/field").text_field(f, :tax_code) %>
@@ -24,5 +24,3 @@
     <% end %>
   <% end %>
 <% end %>
-
-<%= render component("tax_categories/index").new(page: @page) %>

data/app/components/solidus_admin/tax_categories/new/component.rb

@@ -1,12 +1,4 @@
 # frozen_string_literal: true
 
-class SolidusAdmin::TaxCategories::New::Component < SolidusAdmin::TaxCategories::Index::Component
-  def initialize(page:, tax_category:)
-    @page = page
-    @tax_category = tax_category
-  end
-
-  def form_id
-    dom_id(@tax_category, "#{stimulus_id}_new_tax_category_form")
-  end
+class SolidusAdmin::TaxCategories::New::Component < SolidusAdmin::Resources::New::Component
 end

data/app/components/solidus_admin/ui/dropdown/component.js

@@ -1,5 +1,5 @@
-import { Controller } from '@hotwired/stimulus'
-import { useClickOutside } from 'stimulus-use'
+import { Controller } from "@hotwired/stimulus"
+import { useClickOutside } from "stimulus-use"
 
 export default class extends Controller {
   connect() {
@@ -11,6 +11,6 @@ export default class extends Controller {
   }
 
   close() {
-    this.element.removeAttribute('open')
+    this.element.removeAttribute("open")
   }
 }

data/app/components/solidus_admin/ui/forms/address/component.js

@@ -1,4 +1,4 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   static targets = ["country", "state", "stateName", "stateWrapper", "stateNameWrapper"]
@@ -7,8 +7,8 @@ export default class extends Controller {
     const countryId = this.countryTarget.value
 
     fetch(`/admin/countries/${countryId}/states`)
-      .then(response => response.json())
-      .then(data => {
+      .then((response) => response.json())
+      .then((data) => {
         this.updateStateOptions(data)
       })
   }
@@ -30,13 +30,12 @@ export default class extends Controller {
     const stateSelect = this.stateTarget
     const stateName = this.stateNameTarget
 
-
     if (showSelect) {
       // Show state select dropdown.
       stateSelect.disabled = false
       stateName.value = ""
-      stateWrapper.classList.remove('hidden')
-      stateNameWrapper.classList.add('hidden')
+      stateWrapper.classList.remove("hidden")
+      stateNameWrapper.classList.add("hidden")
     } else {
       // Show state name text input if no states to choose from.
       stateSelect.disabled = true

data/app/components/solidus_admin/ui/forms/field/component.rb

@@ -18,14 +18,14 @@ class SolidusAdmin::UI::Forms::Field::Component < SolidusAdmin::BaseComponent
     object_name, object, label, errors = extract_form_details(form, object, method)
 
     new(
-      label: label,
-      hint: hint,
-      tip: tip,
+      label:,
+      hint:,
+      tip:,
       error: errors,
       input_attributes: {
         name: "#{object_name}[#{method}]",
         tag: :input,
-        size: size,
+        size:,
         value: object.public_send(method),
         error: (errors.to_sentence.capitalize if errors),
         **attributes,
@@ -37,16 +37,16 @@ class SolidusAdmin::UI::Forms::Field::Component < SolidusAdmin::BaseComponent
     object_name, object, label, errors = extract_form_details(form, object, method)
 
     new(
-      label: label,
-      hint: hint,
-      tip: tip,
+      label:,
+      hint:,
+      tip:,
       error: errors,
       input_attributes: {
         name: "#{object_name}[#{method}]",
         tag: :select,
-        choices: choices,
-        size: size,
-        value: object.public_send(method),
+        choices:,
+        size:,
+        value: (object.public_send(method) if object.respond_to?(method)),
         error: (errors.to_sentence.capitalize if errors),
         **attributes,
       }
@@ -57,13 +57,13 @@ class SolidusAdmin::UI::Forms::Field::Component < SolidusAdmin::BaseComponent
     object_name, object, label, errors = extract_form_details(form, object, method)
 
     new(
-      label: label,
-      hint: hint,
-      tip: tip,
+      label:,
+      hint:,
+      tip:,
       error: errors,
       input_attributes: {
         name: "#{object_name}[#{method}]",
-        size: size,
+        size:,
         tag: :textarea,
         value: object.public_send(method),
         error: (errors.to_sentence.capitalize if errors),
@@ -76,14 +76,14 @@ class SolidusAdmin::UI::Forms::Field::Component < SolidusAdmin::BaseComponent
     object_name, object, label, errors = extract_form_details(form, object, method)
 
     new(
-      label: label,
-      hint: hint,
-      tip: tip,
+      label:,
+      hint:,
+      tip:,
       error: errors,
     ).with_content(
       component('ui/forms/switch').new(
         name: "#{object_name}[#{method}]",
-        size: size,
+        size:,
         checked: object.public_send(method),
         include_hidden: true,
         **attributes,

data/app/components/solidus_admin/ui/forms/input/component.js

@@ -1,4 +1,4 @@
-import { Controller } from '@hotwired/stimulus'
+import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   static values = {
@@ -6,11 +6,10 @@ export default class extends Controller {
   }
 
   connect() {
-    if (this.customValidityValue)
-      this.element.setCustomValidity(this.customValidityValue)
+    if (this.customValidityValue) this.element.setCustomValidity(this.customValidityValue)
   }
 
   clearCustomValidity() {
-    this.element.setCustomValidity('')
+    this.element.setCustomValidity("")
   }
 }

data/app/components/solidus_admin/ui/forms/input/component.rb

@@ -93,13 +93,24 @@ class SolidusAdmin::UI::Forms::Input::Component < SolidusAdmin::BaseComponent
       with_content options_for_select(@attributes.delete(:choices), @attributes.delete(:value))
     end
 
-    tag.public_send(
-      @tag,
-      content,
+    build_tag
+  end
+
+  private
+
+  def build_tag
+    args = [@tag]
+    args << content unless void_element?(@tag)
+
+    tag.public_send(*args, **tag_options)
+  end
+
+  def tag_options
+    @tag_options ||= {
       "data-controller": stimulus_id,
       "data-#{stimulus_id}-custom-validity-value": @error.presence,
       "data-action": "#{stimulus_id}#clearCustomValidity",
       **@attributes
-    )
+    }
   end
 end

data/app/components/solidus_admin/ui/icon/component.rb

@@ -23,7 +23,9 @@ class SolidusAdmin::UI::Icon::Component < SolidusAdmin::BaseComponent
   end
 
   def call
-    href = "#{image_path('solidus_admin/remixicon.symbol.svg')}#ri-#{@name}"
+    # bypass the asset_host configuration to avoid CORS issues with CDNs:
+    # https://github.com/solidusio/solidus/issues/5657
+    href = asset_path("solidus_admin/remixicon.symbol.svg#ri-#{@name}", host: "")
     tag.svg(tag.use("xlink:href": href), **@attrs)
   end
 end

data/app/components/solidus_admin/ui/modal/component.js

@@ -1,7 +1,7 @@
-import { Controller } from "@hotwired/stimulus";
+import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   connect() {
-    this.element.showModal();
+    this.element.showModal()
   }
 }

data/app/components/solidus_admin/ui/pages/index/component.html.erb

@@ -1,12 +1,12 @@
 <%= page do %>
-  <% if @tabs %>
+  <% if tabs %>
     <%= page_header do %>
       <%= render_title %>
     <% end %>
 
     <%= page_header do %>
       <% rendered_tabs = capture do %>
-        <% @tabs.each do %>
+        <% renderable_tabs.each do %>
           <%= render(component("ui/button").new(tag: :a, scheme: :ghost, text: _1.text, 'aria-current': _1.current, href: _1.href)) %>
         <% end %>
       <% end %>
@@ -39,6 +39,6 @@
   <% end %>
 
   <% turbo_frames.each do |frame| %>
-    <%= turbo_frame_tag frame %>
+    <%= turbo_frame_tag frame, target: "_top" %>
   <% end %>
 <% end %>

data/app/components/solidus_admin/ui/pages/index/component.rb

@@ -22,13 +22,18 @@ class SolidusAdmin::UI::Pages::Index::Component < SolidusAdmin::BaseComponent
 
   def initialize(page:)
     @page = page
-    @tabs = tabs&.map { |tab| Tab.new(**tab) }
   end
 
   def row_fade(_record)
     false
   end
 
+  def renderable_tabs
+    return unless tabs
+
+    tabs.map { |tab| Tab.new(**tab) }
+  end
+
   def title
     model_class.model_name.human.pluralize
   end
@@ -61,8 +66,8 @@ class SolidusAdmin::UI::Pages::Index::Component < SolidusAdmin::BaseComponent
       value: search_params,
       url: search_url,
       searchbar_key: search_key,
-      filters: filters,
-      scopes: scopes,
+      filters:,
+      scopes:,
     }
   end
 
@@ -80,12 +85,12 @@ class SolidusAdmin::UI::Pages::Index::Component < SolidusAdmin::BaseComponent
       id: stimulus_id,
       data: {
         class: model_class,
-        rows: rows,
+        rows:,
         fade: -> { row_fade(_1) },
         prev: prev_page_path,
         next: next_page_path,
-        columns: columns,
-        batch_actions: batch_actions,
+        columns:,
+        batch_actions:,
         url: -> { row_url(_1) },
       },
       search: search_options,

data/app/components/solidus_admin/ui/table/component.html.erb

@@ -137,11 +137,12 @@
       <%= "data-sortable-animation-value=#{@sortable.animation}" if @sortable&.animation %>
     >
       <% @data.rows.each do |row| %>
+        <% row_url = @data.url&.call(row) %>
         <tr
-          class="border-b border-gray-100 last:border-0 hover:bg-gray-50 cursor-pointer <%= 'bg-gray-15 text-gray-700' if @data.fade&.call(row) %>"
-          <% if @data.url %>
+          class="border-b border-gray-100 last:border-0 <%= 'hover:bg-gray-50 cursor-pointer' if row_url %> <%= 'bg-gray-15 text-gray-700' if @data.fade&.call(row) %>"
+          <% if row_url %>
             data-action="click-><%= stimulus_id %>#rowClicked"
-            data-<%= stimulus_id %>-url-param="<%= @data.url.call(row) %>"
+            data-<%= stimulus_id %>-url-param="<%= row_url %>"
             <%= "data-sortable-url=#{@sortable.url.call(row)}" if @sortable&.url %>
           <% end %>
         >

data/app/components/solidus_admin/ui/table/component.js

@@ -36,9 +36,9 @@ export default class extends Controller {
     const shouldSetSortable = this.sortableValue && this.modeValue !== "batch" && this.modeValue !== "search"
 
     if (shouldSetSortable) {
-      this.tableBodyTarget.setAttribute('data-controller', 'sortable')
+      this.tableBodyTarget.setAttribute("data-controller", "sortable")
     } else {
-      this.tableBodyTarget.removeAttribute('data-controller')
+      this.tableBodyTarget.removeAttribute("data-controller")
     }
   }
 
@@ -54,13 +54,13 @@ export default class extends Controller {
   }
 
   clearSearch() {
-    this.searchFieldTarget.value = ''
+    this.searchFieldTarget.value = ""
     this.search()
   }
 
   resetSearchAndFilters() {
     if (this.hasFilterToolbarTarget) {
-      this.filterToolbarTarget.querySelectorAll('fieldset').forEach(fieldset => fieldset.disabled = true)
+      this.filterToolbarTarget.querySelectorAll("fieldset").forEach((fieldset) => (fieldset.disabled = true))
     }
 
     this.searchFieldTarget.disabled = true
@@ -70,7 +70,7 @@ export default class extends Controller {
   selectRow(event) {
     if (this.checkboxTargets.some((checkbox) => checkbox.checked)) {
       this.modeValue = "batch"
-    } else if (this.hasSearchFieldTarget && (this.searchFieldTarget.value !== '')) {
+    } else if (this.hasSearchFieldTarget && this.searchFieldTarget.value !== "") {
       this.modeValue = "search"
     } else if (this.hasScopesToolbarTarget) {
       this.modeValue = "scopes"
@@ -84,7 +84,7 @@ export default class extends Controller {
   selectAllRows(event) {
     if (event.target.checked) {
       this.modeValue = "batch"
-    } else if (this.hasSearchFieldTarget && (this.searchFieldTarget.value !== '')) {
+    } else if (this.hasSearchFieldTarget && this.searchFieldTarget.value !== "") {
       this.modeValue = "search"
     } else if (this.hasScopesToolbarTarget) {
       this.modeValue = "scopes"
@@ -103,13 +103,13 @@ export default class extends Controller {
 
     if (this.modeValue === "batch") {
       this.toggleCheckbox(event.currentTarget)
-    } else {
+    } else if (event.params.url) {
       const url = new URL(event.params.url, "http://dummy.com")
       const params = new URLSearchParams(url.search)
-      const frameId = params.get('_turbo_frame')
+      const frameId = params.get("_turbo_frame")
       const frame = frameId ? { frame: frameId } : {}
       // remove the custom _turbo_frame param from url search:
-      params.delete('_turbo_frame')
+      params.delete("_turbo_frame")
       url.search = params.toString()
 
       window.Turbo.visit(url.pathname + url.search, frame)
@@ -117,7 +117,7 @@ export default class extends Controller {
   }
 
   toggleCheckbox(row) {
-    const checkbox = this.checkboxTargets.find(selection => row.contains(selection))
+    const checkbox = this.checkboxTargets.find((selection) => row.contains(selection))
 
     if (checkbox) {
       checkbox.checked = !checkbox.checked
@@ -131,14 +131,10 @@ export default class extends Controller {
 
   confirmAction(event) {
     const message = event.params.message
+      .replace("${count}", this.selectedRows().length)
       .replace(
-        "${count}",
-        this.selectedRows().length
-      ).replace(
         "${resource}",
-        this.selectedRows().length > 1 ?
-        event.params.resourcePlural :
-        event.params.resourceSingular
+        this.selectedRows().length > 1 ? event.params.resourcePlural : event.params.resourceSingular
       )
 
     if (!confirm(message)) {
@@ -167,7 +163,7 @@ export default class extends Controller {
 
     // Update the rows background color
     this.checkboxTargets.filter((checkbox) =>
-      checkbox.closest("tr").classList.toggle(this.selectedRowClass, checkbox.checked),
+      checkbox.closest("tr").classList.toggle(this.selectedRowClass, checkbox.checked)
     )
 
     // Update the selected rows count

data/app/components/solidus_admin/ui/table/component.rb

@@ -138,7 +138,7 @@ class SolidusAdmin::UI::Table::Component < SolidusAdmin::BaseComponent
       predicate: filter.predicate,
       options: filter.options,
       form: search_form_id,
-      index: index,
+      index:,
     )
   end