spree_admin 5.1.8 → 5.2.0.rc2

data/app/views/spree/admin/refund_reasons/_table_row.html.erb

@@ -0,0 +1,14 @@
+<tr id="<%= spree_dom_id refund_reason %>" data-controller="row-link" class="cursor-pointer">
+  <td class="w-40 align-center" data-action="click->row-link#openLink">
+    <%= refund_reason.name %>
+  </td>
+  <td class="w-20 align-center" data-action="click->row-link#openLink">
+    <%= active_badge(refund_reason.active, label: Spree.t(refund_reason.active? ? :active : :inactive)) %>
+  </td>
+  <td class="w-10 align-center" data-action="click->row-link#openLink">
+    <%= active_badge(refund_reason.mutable) %>
+  </td>
+  <td class="actions w-10" data-action="click->row-link#openLink">
+    <%= link_to_edit(refund_reason, no_text: true, data: { row_link_target: :link, turbo_frame: '_top' }) if can? :edit, refund_reason %>
+  </td>
+</tr>

data/app/views/spree/admin/refund_reasons/edit.html.erb

@@ -1,3 +1 @@
-<%= render partial: 'spree/admin/shared/named_types/edit', locals: {
-  collection_url_label: Spree.t(:refund_reasons)
-} %>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -7,39 +7,4 @@
 
 <%= render_admin_partials(:refund_reasons_header_partials) %>
 
-<div class="card-lg">
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:status) %></th>
-            <th><%= Spree.t(:mutable) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-        <% @collection.each do |refund_reason| %>
-          <tr id="<%= spree_dom_id refund_reason %>" data-controller="row-link" class="cursor-pointer">
-            <td class="w-40 align-center" data-action="click->row-link#openLink">
-              <%= refund_reason.name %>
-            </td>
-            <td class="w-20 align-center" data-action="click->row-link#openLink">
-              <%= active_badge(refund_reason.active, label: Spree.t(refund_reason.active? ? :active : :inactive)) %>
-            </td>
-            <td class="w-10 align-center" data-action="click->row-link#openLink">
-              <%= active_badge(refund_reason.mutable) %>
-            </td>
-            <td class="actions w-10" data-action="click->row-link#openLink">
-              <%= link_to_edit(refund_reason, no_text: true, data: { row_link_target: :link }) if can? :edit, refund_reason %>
-            </td>
-          </tr>
-        <% end %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found' %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

data/app/views/spree/admin/refund_reasons/new.html.erb

@@ -1,4 +1 @@
-<%= render partial: 'spree/admin/shared/named_types/new', locals: {
-  collection_url_label: Spree.t(:refund_reasons),
-  page_title: Spree.t(:new_refund_reason)
-} %>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -10,8 +10,4 @@
   </div>
 <% end %>
 
-<div class="form-group mb-0">
-  <%= f.label :refund_reason_id, Spree.t(:reason) %>
-  <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, { include_blank: true }, { data: { controller: 'autocomplete-select' }, required: true }) %>
-  <%= f.error_message_on :reason %>
-</div>
+<%= f.spree_collection_select :refund_reason_id, refund_reasons, :id, :name, { include_blank: true, label: Spree.t(:reason), required: true } %>

data/app/views/spree/admin/refunds/edit.html.erb

@@ -1,15 +1,13 @@
-<%= turbo_frame_tag :dialog_modal do %>
+<%= turbo_frame_tag :dialog do %>
   <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund], data: { turbo_frame: '_top' } do |f| %>
-    <div class="modal-content">
-      <%= modal_header(Spree.t(:edit_refund)) %>
-      <div class="modal-body">
-        <%= render 'spree/admin/shared/error_messages', target: @refund %>
-        <%= render 'spree/admin/refunds/form', f: f %>
-      </div>
-      <div class="modal-footer">
-        <%= modal_discard_button %>
-        <%= turbo_save_button_tag %>
-      </div>
+    <%= dialog_header(Spree.t(:edit_refund)) %>
+    <div class="dialog-body">
+      <%= render 'spree/admin/shared/error_messages', target: @refund %>
+      <%= render 'spree/admin/refunds/form', f: f %>
+    </div>
+    <div class="dialog-footer">
+      <%= dialog_discard_button %>
+      <%= turbo_save_button_tag %>
     </div>
   <% end %>
 <% end %>

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

@@ -1,38 +1,18 @@
 <div class="card mb-4">
   <div class="card-body">
-    <div class="form-group">
-      <%= f.label :name, Spree.t(:name) %>
-      <%= f.text_field :name, class: "form-control", autofocus: f.object.new_record?, required: true %>
-      <%= f.error_message_on :name %>
-    </div>
+    <%= f.spree_text_field :name, autofocus: f.object.new_record?, required: true %>
 
-    <div class="form-group">
-      <%= f.label :type, Spree.t(:type) %>
-      <%= f.select :type,
-                options_for_select(
-                  Spree::ReimbursementType::KINDS.map do |kind|
-                    [kind.demodulize.titleize, kind]
-                  end,
-                ),
-                { include_blank: false },
-                { class: "custom-select" } %>
-      <%= f.error_message_on :type %>
-    </div>
+    <%= f.spree_select :type,
+              options_for_select(
+                Spree::ReimbursementType::KINDS.map do |kind|
+                  [kind.demodulize.titleize, kind]
+                end,
+                f.object.type
+              ),
+              { include_blank: false, label: Spree.t(:type), autocomplete: true } %>
 
-    <div class="form-group">
-      <div class="custom-control custom-checkbox">
-        <%= f.check_box :active, class: "custom-control-input" %>
-        <%= f.label :active, Spree.t(:active), class: "custom-control-label" %>
-      </div>
-      <%= f.error_message_on :active %>
-    </div>
+    <%= f.spree_check_box :active, label: Spree.t(:active) %>
 
-    <div class="form-group">
-      <div class="custom-control custom-checkbox">
-        <%= f.check_box :mutable, class: "custom-control-input" %>
-        <%= f.label :mutable, Spree.t(:mutable), class: "custom-control-label" %>
-      </div>
-      <%= f.error_message_on :mutable %>
-    </div>
+    <%= f.spree_check_box :mutable, label: Spree.t(:mutable) %>
   </div>
 </div>

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

@@ -0,0 +1,7 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:type) %></th>
+  <th scope="col"><%= Spree.t(:status) %></th>
+  <th scope="col"><%= Spree.t(:mutable) %></th>
+  <th scope="col"></th>
+</tr>

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

@@ -0,0 +1,17 @@
+<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, turbo_frame: '_top' } if can?(:edit, reimbursement_type) %>
+  </td>
+</tr>

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_reimbursement_types_url %>
-  <%= @reimbursement_type.name %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_with model: @reimbursement_type, :url => object_url, :method => :put, scope: :reimbursement_type do |reimbursement_form| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
-      <%= render partial: 'form', locals: { f: reimbursement_form } %>
-      <%= render 'spree/admin/shared/edit_resource_links', f: reimbursement_form %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -7,43 +7,4 @@
 
 <%= render_admin_partials(:reimbursement_types_header_partials) %>
 
-<div class="card-lg">
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <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>
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_reimbursement_types_url %>
-  <%= Spree.t(:new_reimbursement_type) %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_for [:admin, @reimbursement_type] do |reimbursement_form| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @reimbursement_type } %>
-      <%= render partial: 'form', locals: { f: reimbursement_form } %>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/new_resource' %>

data/app/views/spree/admin/reimbursements/edit.html.erb

@@ -24,12 +24,12 @@ locals: {
       <table class="table table-condensed reimbursement-return-items-table">
         <thead>
           <tr>
-            <th><%= Spree.t(:product) %></th>
-            <th><%= Spree.t(:preferred_reimbursement_type) %></th>
-            <th><%= Spree.t(:reimbursement_type_override) %></th>
-            <th><%= Spree.t(:pre_tax_refund_amount) %></th>
-            <th><%= Spree.t(:total) %></th>
-            <th><%= Spree.t(:exchange_for) %></th>
+            <th scope="col"><%= Spree.t(:product) %></th>
+            <th scope="col"><%= Spree.t(:preferred_reimbursement_type) %></th>
+            <th scope="col"><%= Spree.t(:reimbursement_type_override) %></th>
+            <th scope="col"><%= Spree.t(:pre_tax_refund_amount) %></th>
+            <th scope="col"><%= Spree.t(:total) %></th>
+            <th scope="col"><%= Spree.t(:exchange_for) %></th>
           </tr>
         </thead>
         <tbody>
@@ -93,9 +93,9 @@ locals: {
     <table class="table table-condensed">
       <thead>
         <tr>
-          <th><%= Spree.t(:reimbursement_type) %></th>
-          <th><%= Spree.t(:description) %></th>
-          <th><%= Spree.t(:amount) %></th>
+          <th scope="col"><%= Spree.t(:reimbursement_type) %></th>
+          <th scope="col"><%= Spree.t(:description) %></th>
+          <th scope="col"><%= Spree.t(:amount) %></th>
         </tr>
       </thead>
       <tbody>

data/app/views/spree/admin/reimbursements/show.html.erb

@@ -23,12 +23,12 @@ locals: {
     <table class="table reimbursement-reimbursement-items-table">
       <thead>
         <tr>
-          <th><%= Spree.t(:product) %></th>
-          <th><%= Spree.t(:preferred_reimbursement_type) %></th>
-          <th><%= Spree.t(:reimbursement_type_override) %></th>
-          <th><%= Spree.t(:exchange_for) %></th>
-          <th><%= Spree.t(:pre_tax_amount) %></th>
-          <th><%= Spree.t(:total) %></th>
+          <th scope="col"><%= Spree.t(:product) %></th>
+          <th scope="col"><%= Spree.t(:preferred_reimbursement_type) %></th>
+          <th scope="col"><%= Spree.t(:reimbursement_type_override) %></th>
+          <th scope="col"><%= Spree.t(:exchange_for) %></th>
+          <th scope="col"><%= Spree.t(:pre_tax_amount) %></th>
+          <th scope="col"><%= Spree.t(:total) %></th>
         </tr>
       </thead>
       <tbody>
@@ -68,16 +68,16 @@ locals: {
     <table class="table table-condensed">
       <thead>
         <tr>
-          <th><%= Spree.t(:amount) %></th>
-          <th><%= Spree.t(:date) %></th>
-          <th><%= Spree.t(:reason) %></th>
+          <th scope="col"><%= Spree.t(:amount) %></th>
+          <th scope="col"><%= Spree.t(:date) %></th>
+          <th scope="col"><%= Spree.t(:reason) %></th>
         </tr>
       </thead>
       <tbody>
         <% @reimbursement.refunds.includes(:reason).each do |refund| %>
           <tr id="<%= spree_dom_id(refund) %>">
             <td><%= refund.display_amount %></td>
-            <td><%= local_time(refund.created_at) %></td>
+            <td><%= spree_time(refund.created_at) %></td>
             <td><%= refund.reason&.name %></td>
           </tr>
         <% end %>
@@ -95,8 +95,8 @@ locals: {
       <table class="table table-condensed">
         <thead>
           <tr>
-            <th><%= Spree.t(:description) %></th>
-            <th><%= Spree.t(:amount) %></th>
+            <th scope="col"><%= Spree.t(:description) %></th>
+            <th scope="col"><%= Spree.t(:amount) %></th>
           </tr>
         </thead>
         <tbody>

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

@@ -4,7 +4,7 @@
       <thead>
         <tr>
           <% @report.line_item_class.headers.each do |header| %>
-            <th><%= header[:label] %></th>
+            <th scope="col"><%= header[:label] %></th>
           <% end %>
         </tr>
       </thead>

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

@@ -13,7 +13,7 @@
     <table class="table">
       <thead>
         <tr>
-          <th><%= Spree.t(:name) %></th>
+          <th scope="col"><%= Spree.t(:name) %></th>
           <th class="text-right"><%= Spree.t(:action) %></th>
         </tr>
       </thead>
@@ -24,7 +24,7 @@
               <%= Spree.t("report_names.#{report_type}") %>
             </td>
             <td class="text-right w-10">
-              <%= link_to Spree.t(:show_report), spree.new_admin_report_path(type: report_type), class: 'btn btn-light btn-sm', data: { row_link_target: :link } %>
+              <%= link_to Spree.t(:show_report), spree.new_admin_report_path(type: report_type), class: 'btn btn-light btn-sm', data: { row_link_target: :link, turbo_frame: '_top' } %>
             </td>
           </tr>
         <% end %>

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

@@ -9,9 +9,10 @@
     <%= f.hidden_field :date_from %>
     <%= f.hidden_field :date_to %>
     <%= f.hidden_field :currency %>
-    <button class="btn btn-primary with-tip" title="Export report as CSV file">
+    <button class="btn btn-primary" data-controller="tooltip">
       <%= icon('table-export') %>
       <%= Spree.t(:export) %>
+      <%= tooltip(Spree.t('admin.export_report')) %>
     </button>
   <% end %>
 <% end if can?(:create, Spree::Export) %>

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

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/named_types/form', f: f %>

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

@@ -0,0 +1,5 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:status) %></th>
+  <th scope="col"></th>
+</tr>

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

@@ -0,0 +1,18 @@
+<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, turbo_frame: '_top' })
+      end %>
+    <% end %>
+  </td>
+</tr>

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

@@ -1,3 +1 @@
-<%= render partial: 'spree/admin/shared/named_types/edit', locals: {
-  collection_url_label: Spree.t(:return_authorization_reasons)
-} %>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -7,42 +7,4 @@
 
 <%= render_admin_partials(:return_authorization_reasons_header_partials) %>
 
-<div class="card-lg">
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <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>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render "spree/admin/shared/no_resource_found" %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -1,4 +1 @@
-<%= render partial: 'spree/admin/shared/named_types/new', locals: {
-  collection_url_label: Spree.t(:return_authorization_reasons),
-  page_title: Spree.t(:new_rma_reason)
-} %>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -3,9 +3,9 @@
     <table class="table">
       <thead>
         <tr>
-          <th><%= Spree.t(:number) %></th>
-          <th><%= Spree.t(:created_at) %></th>
-          <th><%= Spree.t(:customer) %></th>
+          <th scope="col"><%= Spree.t(:number) %></th>
+          <th scope="col"><%= Spree.t(:created_at) %></th>
+          <th scope="col"><%= Spree.t(:customer) %></th>
           <th class="text-center w-10"><%= Spree.t(:status) %></th>
         </tr>
       </thead>

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

@@ -0,0 +1,6 @@
+<tr>
+  <th scope="col"><%= Spree.t(:number) %></th>
+  <th scope="col"><%= Spree.t(:created_at) %></th>
+  <th scope="col"><%= Spree.t(:customer) %></th>
+  <th class="text-center w-10"><%= Spree.t(:status) %></th>
+</tr>

data/app/views/spree/admin/return_authorizations/{_return_authorization.html.erb → _table_row.html.erb}

@@ -27,7 +27,7 @@
     } %>
   </td>
   <td data-action="click->row-link#openLink">
-    <%= link_to local_time_ago(return_authorization.created_at, class: "with-tip"),
+    <%= link_to spree_time_ago(return_authorization.created_at),
     return_url,
     class: "text-dark" %>
   </td>

data/app/views/spree/admin/return_authorizations/{_filters.html.erb → filters.html.erb}

@@ -1,14 +1,9 @@
-<%= 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| %>
+<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path, class: "filter-wrap", data: {controller: "filters"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render "spree/admin/shared/filters_search_bar", param: :number_cont %>
 
-    <div class="dropdown">
-      <button
-        class="btn btn-light dropdown-toggle"
-        type="button"
-        data-toggle="dropdown"
-        aria-expanded="false"
-      >
+    <%= dropdown do %>
+      <%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>
         <span class="text-muted font-weight-normal mr-1">
           <%= Spree.t(:show) %>:
         </span>
@@ -17,8 +12,8 @@
         <% else %>
           <%= Spree.t(:all) %>
         <% end %>
-      </button>
-      <div class="dropdown-menu dropdown-menu-right w-100" style="min-width: 200px">
+      <% end %>
+      <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %>
         <%= active_link_to Spree.t(:all),
         params.to_unsafe_h.deep_merge({ q: { state_eq: "" } }),
         class: "dropdown-item",
@@ -29,8 +24,8 @@
         <%= link_to Spree.t("return_authorization_states.canceled"),
         params.to_unsafe_h.deep_merge({ q: { state_eq: :canceled } }),
         class: "dropdown-item #{"active" if params.dig(:q, :state_eq) == "canceled"}" %>
-      </div>
-    </div>
+      <% end %>
+    <% end %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -8,13 +8,4 @@
 
 <%= render_admin_partials(:return_authorizations_header_partials) %>
 
-<div class="card-lg">
-  <%= render "spree/admin/return_authorizations/filters" %>
-  <%= render "spree/admin/return_authorizations/list" %>
-
-  <%= render partial: "spree/admin/shared/index_table_options",
-  locals: {
-    collection: @collection,
-    per_page_action: :return_authorizations,
-  } %>
-</div>
+<%= render 'spree/admin/shared/index_table', new_object_url: nil %>

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

@@ -1,6 +1,5 @@
-<div class="form-group">
-  <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-  <%= f.text_field :name, class: 'form-control', required: true %>
-  <%= f.error_message_on :name %>
+<div class="card mb-4">
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true %>
+  </div>
 </div>
-

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

@@ -1,15 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_roles_url %>
-  <%= @role.name.capitalize %>
-<% end %>
-
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
-
-<%= form_for [:admin, @role] do |f| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <%= render 'form', f: f %>
-    </div>
-  </div>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-<% end %>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -13,9 +13,9 @@
       <table class="table">
         <thead>
           <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:permissions) %></th>
-            <th></th>
+            <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+            <th scope="col"><%= Spree.t(:permissions) %></th>
+            <th scope="col"></th>
           </tr>
         </thead>
         <tbody>
@@ -28,7 +28,7 @@
                 <%= Spree.t(:all) %>
               </td>
               <td class="actions">
-                <%= link_to_edit(role) %>
+                <%= link_to_edit(role, data: { turbo_frame: '_top' }) %>
               </td>
             </tr>
           <% end %>