spree_admin 5.0.0 → 5.0.1

data/app/views/spree/admin/reimbursement_types/index.html.erb

@@ -1,44 +1,46 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-primary", :icon => 'plus', :id => 'admin_new_reimbursement_type' } %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_reimbursement_type), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::ReimbursementType) %>
 
-<%= render partial: 'spree/admin/shared/returns_and_refunds_nav' %>
+<%= render 'spree/admin/shared/returns_and_refunds_nav' %>
 
-<% if @reimbursement_types.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_reimbursement_types'>
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:type) %></th>
-          <th><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:mutable) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-      <% @reimbursement_types.each do |reimbursement_type| %>
-        <tr id="<%= spree_dom_id reimbursement_type %>" data-controller="row-link">
-          <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
-            <%= reimbursement_type.name.humanize %>
-          </td>
-          <td class="w-30 cursor-pointer" data-action="click->row-link#openLink">
-            <code><%= reimbursement_type.type.demodulize %></code>
-          </td>
-          <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
-            <%= active_badge(reimbursement_type.active, label: Spree.t(reimbursement_type.active? ? :active : :inactive)) %>
-          </td>
-          <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
-            <%= active_badge(reimbursement_type.mutable) %>
-          </td>
-          <td class="actions w-10">
-            <%= link_to_edit reimbursement_type, no_text: true, data: { row_link_target: :link } if can?(:edit, reimbursement_type) %>
-          </td>
-        </tr>
-      <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:type) %></th>
+            <th><%= Spree.t(:status) %></th>
+            <th><%= Spree.t(:mutable) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @collection.each do |reimbursement_type| %>
+            <tr id="<%= spree_dom_id reimbursement_type %>" data-controller="row-link">
+              <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= reimbursement_type.name.humanize %>
+              </td>
+              <td class="w-30 cursor-pointer" data-action="click->row-link#openLink">
+                <code><%= reimbursement_type.type.demodulize %></code>
+              </td>
+              <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= active_badge(reimbursement_type.active, label: Spree.t(reimbursement_type.active? ? :active : :inactive)) %>
+              </td>
+              <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= active_badge(reimbursement_type.mutable) %>
+              </td>
+              <td class="actions w-10">
+                <%= link_to_edit reimbursement_type, no_text: true, data: { row_link_target: :link } if can?(:edit, reimbursement_type) %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

data/app/views/spree/admin/reports/_report.html.erb

@@ -1,4 +1,4 @@
-<div class="card-lg p-0">
+<div class="card-lg">
   <div class="table-responsive">
     <table class="table">
       <thead class="text-muted">

data/app/views/spree/admin/return_authorization_reasons/index.html.erb

@@ -1,45 +1,45 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_rma_reason),
-  new_object_url,
-  { icon: "plus", id: "admin_new_named_type", class: "btn-primary" } %>
-  <% end if can? :create, Spree::RefundReason %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_rma_reason), new_object_url, class: "btn btn-primary" %>
+<% end if can? :create, Spree::ReturnAuthorizationReason %>
 
-    <%= render partial: "spree/admin/shared/returns_and_refunds_nav" %>
+<%= render"spree/admin/shared/returns_and_refunds_nav" %>
 
-    <% if @collection.any? %>
-      <div class="table-responsive card-lg p-0">
-        <table class="table" id='listing_named_types'>
-          <thead class="text-muted">
-            <tr>
-              <th><%= Spree.t(:name) %></th>
-              <th><%= Spree.t(:status) %></th>
-              <th></th>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:status) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody id="<%= plural_resource_name(Spree::ReturnAuthorizationReason).to_s.parameterize.underscore %>">
+          <% @collection.each do |return_authorization_reason| %>
+            <tr id="<%= spree_dom_id return_authorization_reason %>" data-controller="row-link">
+              <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= return_authorization_reason.name %>
+              </td>
+              <td class="w-20 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= active_badge(
+                  return_authorization_reason.active,
+                  label: Spree.t(return_authorization_reason.active? ? :active : :inactive),
+                ) %>
+              </td>
+              <td class="actions w-10">
+                <% if return_authorization_reason.mutable? %>
+                  <%= if can? :edit, return_authorization_reason
+                    link_to_edit(return_authorization_reason, no_text: true, data: { row_link_target: :link })
+                  end %>
+                <% end %>
+              </td>
             </tr>
-          </thead>
-          <tbody id="<%= plural_resource_name(Spree::ReturnAuthorizationReason).to_s.parameterize.underscore %>">
-            <% @collection.each do |return_authorization_reason| %>
-              <tr id="<%= spree_dom_id return_authorization_reason %>" data-controller="row-link">
-                <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
-                  <%= return_authorization_reason.name %>
-                </td>
-                <td class="w-20 align-center cursor-pointer" data-action="click->row-link#openLink">
-                  <%= active_badge(
-                    return_authorization_reason.active,
-                    label: Spree.t(return_authorization_reason.active? ? :active : :inactive),
-                  ) %>
-                </td>
-                <td class="actions w-10">
-                  <% if return_authorization_reason.mutable? %>
-                    <%= if can? :edit, return_authorization_reason
-                      link_to_edit(return_authorization_reason, no_text: true, data: { row_link_target: :link })
-                    end %>
-                  <% end %>
-                </td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-    <% else %>
-      <%= render "spree/admin/shared/no_resource_found" %>
-    <% end %>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render "spree/admin/shared/no_resource_found" %>
+  <% end %>
+</div>

data/app/views/spree/admin/return_authorizations/_filters.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path, class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render "spree/admin/shared/filters_search_bar", param: :number_cont %>
 

data/app/views/spree/admin/return_authorizations/_list.html.erb

@@ -17,14 +17,5 @@
     </table>
   </div>
 <% else %>
-  <div
-    class="
-      text-muted p-5 d-flex align-items-center w-100 justify-content-center
-    "
-  >
-    <%= Spree.t(
-      :no_resource_found,
-      resource: plural_resource_name(Spree::ReturnAuthorization),
-    ) %>.
-  </div>
+  <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
 <% end %>

data/app/views/spree/admin/return_authorizations/index.html.erb

@@ -2,7 +2,7 @@
   <%= Spree.t(:return_authorizations) %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "spree/admin/return_authorizations/filters" %>
   <%= render "spree/admin/return_authorizations/list" %>
 

data/app/views/spree/admin/roles/_form.html.erb

@@ -2,5 +2,5 @@
   <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
   <%= f.text_field :name, class: 'form-control' %>
   <%= f.error_message_on :name %>
-<% end %>
+</div>
 

data/app/views/spree/admin/roles/index.html.erb

@@ -3,30 +3,32 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-primary", icon: 'plus', id: 'admin_new_role_link' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_role), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::Role %>
 
-<% if @roles.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:role_id) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @roles.each do |role| %>
-          <tr id="<%= spree_dom_id role %>">
-            <td><%= role.name %></td>
-            <td class="actions">
-              <%= link_to_edit(role, no_text: true) if can? :edit, role %>
-            </td>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:role_id) %></th>
+            <th></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+        </thead>
+        <tbody>
+          <% @collection.each do |role| %>
+            <tr id="<%= spree_dom_id role %>">
+              <td><%= role.name %></td>
+              <td class="actions">
+                <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/_bulk_modal.html.erb

@@ -2,18 +2,17 @@
   <div class="modal-dialog modal-dialog-centered">
     <%= turbo_frame_tag :bulk_modal do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center">
           <div class="spinner-border text-muted" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>
           </div>
         </div>
-        <div class="modal-footer d-flex justify-content-between">
-          <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t(:close) %></button>
-          <button type="button" class="btn btn-primary" disabled="disabled"><%= Spree.t(:save_changes) %></button>
+        <div class="modal-footer">
+          <%= modal_discard_button %>
+          <button type="button" class="btn btn-primary" disabled="disabled">
+            <%= Spree.t('actions.save') %>
+          </button>
         </div>
       </div>
     <% end %>

data/app/views/spree/admin/shared/_filter_submit.html.erb

@@ -0,0 +1,6 @@
+<div class="form-actions">
+  <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+    <%= icon("search") %>
+    <%= Spree.t(:filter_results) %>
+  <% end %>
+</div>

data/app/views/spree/admin/shared/_modal.html.erb

@@ -2,10 +2,7 @@
   <div class="modal-dialog modal-dialog-centered">
     <%= turbo_frame_tag :dialog_modal do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center">
           <div class="spinner-border text-light mx-auto my-5" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>
@@ -20,10 +17,7 @@
   <div class="modal-dialog modal-dialog-centered modal-lg">
     <%= turbo_frame_tag :dialog_modal_lg do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center" style="min-height: 200px">
           <div class="spinner-border text-light" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>

data/app/views/spree/admin/shared/_multi_product_picker.html.erb

@@ -1,9 +1,6 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <div class="modal-content" data-controller="search-picker">
-    <div class="modal-header">
-      <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_products) %></h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+    <%= modal_header(Spree.t(:add_products)) %>
     <div class="modal-body border-bottom">
       <%= form_with url: spree.search_admin_products_path, method: :post, data: { controller: 'auto-submit'} do |form| %>
         <%= form.hidden_field :omit_ids, value: parent.product_ids.join(',') %>
@@ -19,6 +16,7 @@
         </div>
       </div>
       <div class="modal-footer border-top">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %>
       </div>
     <% end %>

data/app/views/spree/admin/shared/_no_resource_found.html.erb

@@ -2,5 +2,5 @@
 
 <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
   <%= Spree.t(:no_resource_found, resource: resource_name) %>
-  <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-light ml-3' if can?(:create, model_class) && defined?(new_object_url) %>
+  <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-light ml-3', data: { 'turbo-frame': '_top' } if can?(:create, model_class) && defined?(new_object_url) && new_object_url.present? %>
 </div>

data/app/views/spree/admin/shared/_product_image.html.erb

@@ -5,16 +5,7 @@
 <% if image.present? && image.attached? && image.variable? %>
   <% alt ||= image.alt || object.name %>
   <div class="admin-product-image-container">
-    <%= image_tag(
-          main_app.cdn_image_url(
-            image.variant(
-              spree_image_variant_options(resize_to_fill: [width * 2, height * 2])
-            )
-          ),
-          width: width,
-          height: height,
-          alt: alt
-    ) %>
+    <%= spree_image_tag(image, width: width, height: height, alt: alt) %>
   </div>
 <% else %>
   <%= render 'spree/admin/shared/no_image', width: width, height: height %>

data/app/views/spree/admin/shared/_refunds.html.erb

@@ -1,4 +1,4 @@
-<div class="table-responsive card-lg p-0">
+<div class="table-responsive card-lg">
   <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
     <thead class="text-muted">
       <tr data-hook="refunds_header" class="border-bottom">

data/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb

@@ -16,7 +16,7 @@
       <% end %>
 
       <% if can?(:manage, :checkouts) %>
-        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path, active: params[:controller] == 'checkouts') %>
+        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path) %>
       <% end %>
 
       <%= render_admin_partials(:store_orders_nav_partials) %>

data/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb

@@ -1,3 +1,36 @@
+<% if available_stores.count > 1 %>
+  <div class="modal fade" id="switch-store-modal" tabindex="-1" role="dialog" aria-labelledby="switchStoreModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <%= modal_header(icon('switch-horizontal', class: 'mr-2') + Spree.t(:switch_store)) %>
+        <div class="modal-body">
+          <div class="list-group">
+            <% available_stores.each do |store| %>
+              <% if store.id != current_store.id %>
+                <%= link_to spree.admin_dashboard_url(host: store.url), class: 'list-group-item hover-light d-flex text-dark w-100 align-items-center text-primary' do %>
+                  <%= store_admin_icon(current_store, height: 32, width: 32) %>
+                  <span class="ml-3">
+                    <%= store.name %>
+                  </span>
+                <% end %>
+              <% else %>
+                <div class="list-group-item d-flex text-dark w-100 align-items-center cursor-disabled active">
+                  <%= store_admin_icon(current_store, height: 32, width: 32) %>
+                  <span class="ml-3">
+                    <%= store.name %>
+                  </span>
+
+                  <%= icon('check', class: 'ml-auto') %>
+                </div>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>
+
 <div class="border-bottom border-bottom-dashed pb-2 d-flex align-items-center justify-content-between pr-1" id="store-menu" data-turbo-permanent>
   <div class="dropdown">
     <button type="button" class="btn d-flex align-items-center justify-content-between text-left dropdown-toggle d-flex align-items-center gap-2"
@@ -18,15 +51,11 @@
       <% end if current_store.default_theme && can?(:manage, Spree::Theme) %>
 
       <% if available_stores.count > 1 %>
-        <div class="dropdown-header">
+        <div class="dropdown-divider"></div>
+        <%= link_to "#", class: 'dropdown-item mb-0', data: { toggle: 'modal', target: '#switch-store-modal' } do %>
+          <%= icon 'switch-horizontal' %>
           <%= Spree.t(:switch_store) %>
-        </div>
-        <% available_stores.each do |store| %>
-          <% next if store.id == current_store.id %>
-          <%= link_to store.name, spree.admin_dashboard_url(host: store.url), class: 'dropdown-item' %>
         <% end %>
-
-        <div class="dropdown-divider"></div>
       <% end %>
     </div>
   </div>

data/app/views/spree/admin/shared/sidebar/_store_nav.html.erb

@@ -77,6 +77,10 @@
         <%= active_link_to spree.admin_getting_started_path, class: 'nav-link'  do %>
           <%= icon 'map' %>
           <%= Spree.t('admin.getting_started') %>
+
+          <span class="badge ml-auto badge-info">
+            <%= current_store.setup_tasks_done %><span class="opacity-50">/<%= current_store.setup_tasks_total %></span>
+          </span>
         <% end %>
       </li>
     <% end %>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -10,29 +10,9 @@
   <div class="flex-grow-1 cursor-pointer" data-action="click->row-link#openLink">
     <div class="d-flex align-items-center overflow-hidden w-100 <% if taxon.square_image&.attached? || taxon.image&.attached? %>py-2<% else %>py-3<% end %>">
       <% if taxon.square_image&.attached? && taxon.square_image.variable? %>
-        <%= image_tag(
-              main_app.cdn_image_url(
-                taxon.square_image.variant(
-                  spree_image_variant_options(resize_to_fill: [96, 96])
-                )
-              ),
-              class: 'rounded mr-3',
-              width: 48,
-              height: 48,
-              loading: :lazy
-        ) %>
+        <%= spree_image_tag(taxon.square_image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>
       <% elsif taxon.image&.attached? && taxon.image.variable? %>
-        <%= image_tag(
-              main_app.cdn_image_url(
-                taxon.image.variant(
-                  spree_image_variant_options(resize_to_fill: [96, 96])
-                )
-              ),
-              class: 'rounded mr-3',
-              width: 48,
-              height: 48,
-              loading: :lazy
-        ) %>
+        <%= spree_image_tag(taxon.image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>
       <% end %>
       <div class="overflow-hidden">
         <%= taxon.name %>
@@ -47,7 +27,7 @@
   </div>
 
   <div class="d-flex align-items-center px-3 ml-3">
-    <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link }) %>
+    <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link }) if can?(:edit, taxon) %>
 
     <div class="dropdown ml-2 h-100">
       <button class="btn btn-light btn-sm px-1 h-100" type="button" id="dropdownMenuButton-<%= taxon.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

data/app/views/spree/admin/shipping_categories/index.html.erb

@@ -3,34 +3,36 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-primary", icon: 'plus.svg' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_shipping_category), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::ShippingCategory %>
 
 <%= render partial: 'spree/admin/shared/shipping_nav' %>
 
-<% if @shipping_categories.any? %>
-  <div class="table-responsive border rounded bg-white shadow-xs">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @shipping_categories.each do |shipping_category| %>
-          <tr id="<%= spree_dom_id shipping_category %>" class="cursor-pointer" data-controller="row-link">
-            <td data-action="click->row-link#openLink"><%= shipping_category.name %></td>
-            <td class="actions">
-              <span class="d-flex justify-content-end">
-                <%= link_to_edit(shipping_category, data: { row_link_target: :link }) if can? :edit, shipping_category %>
-              </span>
-            </td>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+        </thead>
+        <tbody>
+          <% @collection.each do |shipping_category| %>
+            <tr id="<%= spree_dom_id shipping_category %>" class="cursor-pointer" data-controller="row-link">
+              <td data-action="click->row-link#openLink"><%= shipping_category.name %></td>
+              <td class="actions">
+                <span class="d-flex justify-content-end">
+                  <%= link_to_edit(shipping_category, data: { row_link_target: :link }) if can? :edit, shipping_category %>
+                </span>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

data/app/views/spree/admin/shipping_methods/_actions.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingMethod) %>
-    <%= button_link_to Spree.t(:new_shipping_method), new_object_url, class: "btn-primary", icon: 'plus' %>
+    <%= link_to_with_icon 'plus', Spree.t(:new_shipping_method), new_object_url, class: "btn btn-primary" %>
   <% end %>
 <% end %>