spree_admin 5.1.7 → 5.2.0.rc1

data/app/views/spree/admin/shared/named_types/_edit.html.erb

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button collection_url %>
-  <%= @object.name %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_for [:admin, @object] do |f| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
-      <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
-      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/edit_resource' %>

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -1,15 +1,6 @@
 <div class="card mb-4">
   <div class="card-body">
-    <div class="form-group">
-      <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-      <%= f.text_field :name, class: 'form-control', autofocus: f.object.new_record?, required: true %>
-      <%= f.error_message_on :name %>
-    </div>
-    <div class="custom-control custom-checkbox">
-      <%= f.check_box :active, class: 'custom-control-input' %>
-      <%= f.label :active, class: 'custom-control-label' do %>
-        <%= Spree.t(:active) %>
-      <% end %>
-    </div>
+    <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
+    <%= f.spree_check_box :active %>
   </div>
 </div>

data/app/views/spree/admin/shared/named_types/_new.html.erb

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button collection_url %>
-  <%= page_title %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_for [:admin, @object] do |f| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
-      <%= render partial: 'spree/admin/shared/named_types/form', locals: { f: f } %>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -0,0 +1,8 @@
+<% if can?(:manage, Spree.user_class) %>
+  <% customers_active = %w[users newsletter_subscribers].include?(controller_name) %>
+  <%= nav_item(Spree.t(:customers), spree.admin_users_path, icon: 'users', active: customers_active) %>
+
+  <ul class="nav-submenu <% unless customers_active %>d-none<% end %>">
+    <%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %>
+  </ul>
+<% end %>

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

@@ -5,7 +5,7 @@
         <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, data: { turbo_method: :patch }, class: 'btn-close' %>
         <p>You're using Spree Community Edition. To get access to all features, please upgrade to Enterprise Edition.</p>
 
-        <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-link btn-sm shadow-xs' %>
+        <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-secondary btn-sm shadow-xs' %>
       </div>
     </section>
   <% end %>

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

@@ -12,7 +12,7 @@
     <% if can?(:manage, Spree::OptionType) %>
       <%= nav_item(Spree.t(:options), spree.admin_option_types_path, active: %w[option_types option_values].include?(controller_name)) %>
     <% end %>
-    <% if can?(:manage, Spree::Property) %>
+    <% if can?(:manage, Spree::Property) && Spree::Config[:product_properties_enabled] %>
       <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
     <% end %>
 

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

@@ -1,16 +1,15 @@
-<div class="store-dropdown" id="store-menu" data-turbo-permanent>
-  <div class="dropdown">
-    <button type="button" class="btn store-dropdown-button dropdown-toggle"
-            data-toggle="dropdown" aria-expanded="false">
+<div class="store-dropdown" id="store-menu">
+  <%= dropdown do %>
+    <%= dropdown_toggle class: 'store-dropdown-button dropdown-toggle' do %>
       <%= store_admin_icon(current_store, height: 32, width: 32) %>
       <%= truncate(current_store.name, length: 10) %>
-    </button>
-    <div class="dropdown-menu ml-2">
+    <% end %>
+    <%= dropdown_menu class: 'ml-2', direction: 'left' do %>
       <%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %>
         <%= icon 'eye' %>
         <%= Spree.t(:view_store) %>
       <% end %>
-      <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'dropdown-item' do %>
+      <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'dropdown-item', data: { turbo_prefetch: false } do %>
         <%= icon 'tools' %>
         <%= Spree.t('admin.edit_theme') %>
       <% end if current_store.default_theme && can?(:manage, Spree::Theme) %>
@@ -47,8 +46,8 @@
           <% end %>
         </div>
       <% end %>
-    </div>
-  </div>
+    <% end %>
+  <% end %>
 
   <%= render 'spree/admin/shared/new_item_dropdown' %>
 </div>

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

@@ -1,4 +1,4 @@
-<% if settings_active? %>
+<% if settings_area? %>
   <ul class="nav flex-column">
     <% if can?(:manage, current_store) %>
       <%= nav_item(Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), icon: 'building-store', active: params[:section] == 'general-settings') %>
@@ -8,12 +8,10 @@
       <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users', active: %w[admin_users invitations roles].include?(controller_name)) %>
     <% end %>
 
-    <% if can?(:manage, current_store) %>
-      <%= nav_item(Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), icon: 'send', active: params[:section] == 'emails') %>
-      <%= nav_item(Spree.t(:policies), spree.edit_admin_store_path(section: 'policies'), icon: 'list-check', active: params[:section] == 'policies') %>
-      <%= nav_item(Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), icon: 'shopping-cart', active: params[:section] == 'checkout') %>
-      <%= render_admin_partials(:store_settings_nav_partials) %>
-    <% end %>
+    <%= nav_item(Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), icon: 'send', active: params[:section] == 'emails') if can?(:manage, current_store) %>
+    <%= nav_item(Spree.t(:policies), spree.admin_policies_path, icon: 'list-check') if can?(:manage, Spree::Policy) %>
+    <%= nav_item(Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), icon: 'shopping-cart', active: params[:section] == 'checkout') if can?(:manage, current_store) %>
+    <%= render_admin_partials(:store_settings_nav_partials) %>
 
     <% if can?(:manage, Spree::CustomDomain) %>
       <%= nav_item(Spree.t(:domains), spree.admin_custom_domains_path, icon: 'world-www') %>
@@ -43,6 +41,10 @@
       <%= nav_item(Spree.t(:stock_locations), spree.admin_stock_locations_path, icon: 'map-pin') %>
     <% end %>
 
+    <% if can?(:manage, Spree::MetafieldDefinition) %>
+      <%= nav_item(Spree.t(:metafield_definitions), spree.admin_metafield_definitions_path, icon: 'list-details') %>
+    <% end %>
+
     <% if can?(:manage, Spree::Store) %>
       <% if spree.respond_to?(:admin_audits_path) %>
         <%= nav_item(Spree.t('admin.audit_log'), spree.admin_audits_path, icon: 'history', active: %w[audits exports imports].include?(controller_name)) %>
@@ -52,7 +54,10 @@
             <%= icon 'history' %>
             <%= Spree.t('admin.audit_log') %>
 
-            <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+            <span class="badge ml-auto rounded-pill" data-controller="tooltip">
+              Enterprise
+              <%= tooltip("This feature is part of the Enterprise Edition.") %>
+            </span>
           <% end %>
         </li>
       <% end %>
@@ -62,6 +67,8 @@
       <%= nav_item(Spree.t(:developers), spree.admin_oauth_applications_path, icon: 'terminal', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
     <% end %>
 
+    <%= nav_item(Spree.t('admin.edit_profile'), spree.edit_admin_profile_path, icon: 'user-scan') %>
+
     <%= render_admin_partials(:settings_nav_partials) %>
   </ul>
 <% else %>
@@ -84,11 +91,7 @@
     <%= render 'spree/admin/shared/sidebar/returns_nav' %>
     <%= render 'spree/admin/shared/sidebar/products_nav' %>
     <%= render 'spree/admin/shared/sidebar/vendors_nav' %>
-
-    <% if can?(:manage, Spree.user_class) %>
-      <%= nav_item(Spree.t(:customers), spree.admin_users_path, icon: 'users') %>
-    <% end %>
-
+    <%= render 'spree/admin/shared/sidebar/customers_nav' %>
     <%= render 'spree/admin/shared/sidebar/promotions_nav' %>
 
     <% if can?(:manage, Spree::Report) %>
@@ -97,7 +100,6 @@
 
     <%= render_admin_partials(:store_nav_partials) %>
 
-    <li class="nav-item border-top border-top-dashed my-1"></li>
     <%= render 'spree/admin/shared/sidebar/storefront_nav' %>
     <%= render 'spree/admin/shared/sidebar/integrations_nav' %>
   </ul>

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

@@ -3,11 +3,14 @@
     <%= render_admin_partials(:vendors_nav_partials) %>
   <% else %>
     <li class="nav-item">
-      <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
+      <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100', data: { controller: 'tooltip' } do %>
         <%= icon 'heart-handshake' %>
         <%= Spree.t(:vendors) %>
 
-        <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+        <span class="badge ml-auto rounded-pill">
+          Enterprise
+        </span>
+        <%= tooltip('This feature is part of the Enterprise Edition.') %>
       <% end %>
     </li>
   <% end %>

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

@@ -27,20 +27,20 @@
   </div>
 
   <div class="d-flex align-items-center px-3 ml-3 gap-2">
-    <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link }) if can?(:edit, taxon) %>
+    <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link, turbo_frame: '_top' }) if can?(:edit, taxon) %>
 
-    <div class="dropdown 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">
+    <%= dropdown class: 'h-100' do %>
+      <%= dropdown_toggle class: 'btn-sm px-1 h-100' do %>
         <%= icon('dots-vertical', class: 'mr-0') %>
-      </button>
-      <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= taxon.id %>">
+      <% end %>
+      <%= dropdown_menu class: 'dropdown-menu-right' do %>
         <% if can?(:create, Spree::Taxon) %>
           <%= link_to_with_icon 'plus', Spree.t(:new_nested_taxon), spree.new_admin_taxonomy_taxon_path(taxonomy, taxon: { parent_id: taxon.id }), class: 'dropdown-item' %>
           <div class="dropdown-divider"></div>
         <% end %>
         <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item btn-danger') if can?(:destroy, taxon) %>
-      </div>
-    </div>
+      <% end %>
+    <% end %>
   </div>
 </div>
 

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

@@ -1,9 +1,5 @@
 <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>
 </div>

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

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

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

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

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_shipping_categories_url %>
-  <%= @shipping_category.name %>
-<% end %>
-
-<%= form_for [:admin, @shipping_category] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @shipping_category } %>
-      <%= render 'form',  f: f %>
-      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-    </div>
-  </div>
-<% end %>
+<%= render 'spree/admin/shared/edit_resource' %>

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

@@ -4,38 +4,11 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:shipping_categories_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_shipping_category), new_object_url, class: "btn btn-primary" %>
-<% end if can? :create, Spree::ShippingCategory %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_shipping_category), new_object_url, class: "btn btn-primary" if can? :create, Spree::ShippingCategory %>
+<% end %>
 
 <%= render_admin_partials(:shipping_categories_header_partials) %>
 
 <%= render partial: 'spree/admin/shared/shipping_nav' %>
 
-<div class="card-lg">
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th></th>
-          </tr>
-        </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>
+<%= render 'spree/admin/shared/index_table' %>

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

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

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

@@ -0,0 +1,8 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:zone) %></th>
+  <th scope="col"><%= Spree.t(:estimated_delivery_time) %></th>
+  <th scope="col"><%= Spree.t(:amount) %></th>
+  <th scope="col"><%= Spree.t(:visibility) %></th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/shipping_methods/{_shipping_method.html.erb → _table_row.html.erb}

@@ -28,6 +28,6 @@
     <% end %>
   </td>
   <td class="actions w-10">
-    <%= link_to_edit(shipping_method, data: { row_link_target: :link }) if can? :edit, shipping_method %>
+    <%= link_to_edit(shipping_method, data: { row_link_target: :link, turbo_frame: '_top' }) if can? :edit, shipping_method %>
   </td>
 </tr>

data/app/views/spree/admin/shipping_methods/form/_display.html.erb

@@ -8,7 +8,7 @@
           <%= f.error_message_on :name %>
         </div>
 
-        <p class="form-text text-muted small mt-2">
+        <p class="form-text small mt-2">
           This will be displayed to customers.
         </p>
       </div>
@@ -30,7 +30,7 @@
           <%= f.error_message_on :admin_name %>
         </div>
 
-        <p class="form-text text-muted small mt-2">
+        <p class="form-text small mt-2">
           This will be displayed to admins.
         </p>
       </div>

data/app/views/spree/admin/shipping_methods/form/_tax_category.html.erb

@@ -7,10 +7,7 @@
     </div>
 
     <div class="card-body">
-      <div class="form-group">
-        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
-        <%= f.error_message_on :tax_category %>
-      </div>
+      <%= f.spree_collection_select :tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none'), label: Spree.t(:tax_category) } %>
     </div>
   </div>
 <% end %>

data/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb

@@ -10,7 +10,7 @@
       <%= f.error_message_on :tracking_url %>
     </div>
 
-    <p class="form-text text-muted small mt-2">
+    <p class="form-text small mt-2">
       <code>:tracking</code>
       <span>will be replaced with the tracking number.</span>
     </p>

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

@@ -4,10 +4,9 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:shipping_methods_actions_partials) %>
-  <% if can?(:create, Spree::ShippingMethod) %>
-    <%= link_to_with_icon 'plus', Spree.t(:new_shipping_method), new_object_url, class: "btn btn-primary" %>
-  <% end %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_shipping_method), new_object_url, class: "btn btn-primary" if can?(:create, Spree::ShippingMethod) %>
 <% end %>
+
 <%= render partial: 'spree/admin/shared/shipping_nav' %>
 
 <% content_for :page_alerts do %>
@@ -18,26 +17,4 @@
 
 <%= render_admin_partials(:shipping_methods_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(:zone) %></th>
-            <th><%= Spree.t(:estimated_delivery_time) %></th>
-            <th><%= Spree.t(:amount) %></th>
-            <th><%= Spree.t(:visibility) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= render partial: 'spree/admin/shipping_methods/shipping_method', collection: @collection.includes(:zones, :calculator), as: :shipping_method %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found' %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

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

@@ -1,34 +1,25 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters reveal", reveal_hidden_class: "d-none" } do |f| %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>
 
     <%= render 'spree/admin/shared/filters_button' %>
   </div>
-  <div data-reveal-target="item" class="d-none" id="table-filter">
-    <div class="row">
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :variant_sku_cont, Spree.t(:sku) %>
-          <%= f.text_field :variant_sku_cont, size: 15, class: "form-control", data: {filters_target: :input} %>
-        </div>
-      </div>
-
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :stock_location_id_eq, Spree.t(:stock_location) %>
-          <%= f.select :stock_location_id_eq,
-                   available_stock_locations_list,
-                   { include_blank: true },
-                   class: "custom-select", data: {filters_target: :input}  %>
-        </div>
-      </div>
-
+  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+    <div class="form-group">
+      <%= f.label :variant_sku_cont, Spree.t(:sku) %>
+      <%= f.text_field :variant_sku_cont, size: 15, class: "form-control", data: {filters_target: :input} %>
+    </div>
+    <div class="form-group">
+      <%= f.label :stock_location_id_eq, Spree.t(:stock_location) %>
+      <%= f.select :stock_location_id_eq,
+                available_stock_locations_list,
+                { include_blank: true },
+                data: { controller: 'autocomplete-select' }  %>
     </div>
     <%= render_admin_partials(:stock_items_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
-
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
 <% end %>

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

@@ -0,0 +1,9 @@
+<tr>
+  <th scope="col"><%= Spree.t(:variant) %></th>
+  <th scope="col"><%= Spree.t(:stock_location) %></th>
+  <th scope="col" class="text-center">
+    <%= Spree.t(:backorderable) %>
+    <%= help_bubble(Spree.t(:continue_selling_when_out_of_stock)) %>
+  </th>
+  <th scope="col"><%= Spree.t(:count_on_hand) %></th>
+</tr>

data/app/views/spree/admin/stock_items/{_stock_item.html.erb → _table_row.html.erb}

@@ -4,7 +4,7 @@
   </td>
   <td class="w-20">
     <% if can?(:manage, stock_item.stock_location) %>
-      <%= link_to stock_item.stock_location.display_name, spree.edit_admin_stock_location_path(stock_item.stock_location) %>
+      <%= link_to stock_item.stock_location.display_name, spree.edit_admin_stock_location_path(stock_item.stock_location), data: { turbo_frame: '_top' } %>
     <% else %>
       <%= stock_item.stock_location.display_name %>
     <% end %>

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

@@ -12,30 +12,4 @@
 
 <%= render_admin_partials(:stock_items_header_partials) %>
 
-<div class="card-lg">
-  <%= render "filters" %>
-
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table" id="listing_products">
-        <thead>
-          <tr>
-            <th scope="col"><%= Spree.t(:variant) %></th>
-            <th scope="col"><%= Spree.t(:stock_location) %></th>
-            <th scope="col" class="text-center">
-              <%= Spree.t(:backorderable) %>
-              <%= help_bubble(Spree.t(:continue_selling_when_out_of_stock)) %>
-            </th>
-            <th scope="col"><%= Spree.t(:count_on_hand) %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= render collection: @collection, partial: "stock_item" %>
-        </tbody>
-      </table>
-    </div>
-    <%= render "spree/admin/shared/index_table_options", collection: @collection %>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table', new_object_url: nil %>

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

@@ -5,22 +5,10 @@
     </h5>
   </div>
   <div class="card-body" >
-    <div class="form-group">
-      <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-      <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
-      <%= f.error_message_on :name %>
-    </div>
-    <div class="form-group">
-      <%= f.label :admin_name, Spree.t(:internal_name) %>
-      <%= f.text_field :admin_name, class: 'form-control', label: false %>
-    </div>
+    <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>
+    <%= f.spree_text_field :admin_name, label: Spree.t(:internal_name) %>
     <% unless f.object.default? %>
-      <div class="form-group">
-        <div class="custom-control custom-checkbox">
-          <%= f.check_box :active, class: 'custom-control-input' %>
-          <%= f.label :active, class: 'custom-control-label' %>
-        </div>
-      </div>
+      <%= f.spree_check_box :active %>
     <% end %>
   </div>
 </div>

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

@@ -0,0 +1,9 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link search_collection, :country, Spree.t(:country) %></th>
+  <th scope="col"><%= Spree.t(:active) %>?</th>
+  <% if can?(:mark_as_default, Spree::StockLocation) %>
+    <th scope="col"><%= Spree.t(:default) %>?</th>
+  <% end %>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/stock_locations/{_stock_location.html.erb → _table_row.html.erb}

@@ -13,21 +13,22 @@
   <td class="actions">
     <% if can? :edit, stock_location %>
       <div class="d-flex justify-content-end align-items-center">
-        <div><%= link_to_edit stock_location, data: { row_link_target: 'link' } %></div>
+        <div><%= link_to_edit stock_location, data: { row_link_target: 'link', turbo_frame: '_top' } %></div>
 
         <% if !stock_location.default? && can?(:mark_as_default, Spree::StockLocation) %>
-          <div class="dropdown">
-            <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <%= dropdown do %>
+            <%= dropdown_toggle class: 'btn-sm h-100' do %>
               <%= icon('dots-vertical', class: 'mr-0') %>
-            </button>
-            <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+            <% end %>
+            <%= dropdown_menu class: 'dropdown-menu-right' do %>
               <%= link_to_with_icon 'check',
                 Spree.t(:mark_as_default),
                 spree.mark_as_default_admin_stock_location_path(stock_location),
                 class: 'dropdown-item',
                 data: { turbo_method: :put } %>
-            </div>
+            <% end %>
           <% end %>
+        <% end %>
         </div>
       </div>
     <% end %>