spree_admin 5.1.7 → 5.2.0.rc1

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

@@ -1,138 +1,128 @@
-<div class="modal fade" id="new-store-modal" tabindex="-1" aria-labelledby="newStoreModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered">
-    <%= turbo_frame_tag :dialog_modal_lg do %>
-      <%= form_for @store, url: spree.admin_stores_path, data: { turbo_frame: '_top', controller: 'store-form enable-button' } do |f| %>
-        <div class="modal-content">
-          <%= modal_header(Spree.t(:new_store)) %>
-          <div class="modal-body">
-            <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %>
-            <div class="row">
-              <div class="col-lg-6">
-                <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %>
-                  <div class="form-group">
-                    <%= f.label :name %>
-                    <%= f.text_field :name, class: 'form-control',
-                                          placeholder: Spree.t(:store_name),
-                                          required: true,
-                                          autofocus: true,
-                                          data: {
-                                            enable_button_target: 'input',
-                                          } %>
-                  </div>
+<%= form_for @store, url: spree.admin_stores_path, data: { turbo: false, controller: 'store-form enable-button' } do |f| %>
+  <div class="container pt-5">
+    <h1><%= Spree.t(:new_store) %></h1>
 
-                  <div class="form-group">
-                    <%= f.label :default_country_iso, Spree.t(:country) %>
-                    <%= f.collection_select :default_country_iso, Spree::Country.order(:name), :iso, :name, { }, { data: { controller: 'autocomplete-select', enable_button_target: 'input', action: 'store-form#updateCurrency' } } %>
-                  </div>
-
-                  <div class="form-group">
-                    <%= f.label :default_locale %>
-                    <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, current_store.default_locale || I18n.locale), { }, { data: { controller: 'autocomplete-select', enable_button_target: 'input', action: 'store-form#updateCurrency' } } %>
-                  </div>
+    <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %>
+    <div class="row">
+      <div class="col-lg-6">
+          <div class="form-group">
+            <%= f.label :name %>
+            <%= f.text_field :name, class: 'form-control',
+                                  placeholder: Spree.t(:store_name),
+                                  required: true,
+                                  autofocus: true,
+                                  data: {
+                                    enable_button_target: 'input',
+                                  } %>
+          </div>
 
-                  <div class="form-group">
-                    <%= f.label :default_currency, Spree.t(:currency) %>
-                    <%= f.select :default_currency, currency_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
-                  </div>
+          <div class="form-group">
+            <%= f.label :default_country_iso, Spree.t(:country) %>
+            <%= f.collection_select :default_country_iso, Spree::Country.order(:name), :iso, :name, { }, { data: { controller: 'autocomplete-select', enable_button_target: 'input', action: 'store-form#updateCurrency' } } %>
+          </div>
 
-                  <% if available_stores.any? %>
-                    <div class="form-group">
-                      <%= f.label :import_products_from_store_id, Spree.t(:import_products_from) %>
-                      <%= f.select :import_products_from_store_id,
-                                  options_for_select(available_stores.pluck(:name, :id)),
-                                  { include_blank: Spree.t(:do_not_import) },
-                                  {
-                                    data: { controller: 'autocomplete-select' }
-                                    } %>
-                    </div>
+          <div class="form-group">
+            <%= f.label :default_locale %>
+            <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, current_store.default_locale || I18n.locale), { }, { data: { controller: 'autocomplete-select', enable_button_target: 'input', action: 'store-form#updateCurrency' } } %>
+          </div>
 
-                    <div class="form-group">
-                      <%= f.label :import_payment_methods_from_store_id, Spree.t(:import_payment_methods_from) %>
-                      <%= f.select :import_payment_methods_from_store_id,
-                                  options_for_select(available_stores.pluck(:name, :id)),
-                                  { include_blank: Spree.t(:do_not_import) },
-                                  {
-                                    data: { controller: 'autocomplete-select' }
-                                    } %>
-                    </div>
-                  <% end %>
-                </div>
-                <div class="col-lg-6">
-                  <h5>What will be shared with this new store:</h5>
-                  <ul class="list-unstyled">
-                    <li>
-                      <%= icon('check', class: 'text-success') %>
-                      <%= Spree.t(:products) %>, <%= Spree.t(:stock_locations) %> & <%= Spree.t(:inventory) %><br />
-                      <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>
-                    </li>
-                    <li>
-                      <%= icon('check', class: 'text-success') %>
-                      <%= Spree.t(:customers) %>
-                    </li>
-                    <li>
-                      <%= icon('check', class: 'text-success') %>
-                      Shipping methods, rates and markets
-                    </li>
-                    <li>
-                      <%= icon('check', class: 'text-success') %>
-                      <%= Spree.t(:payment_methods) %><br />
-                      <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>
-                    </li>
-                    <li>
-                      <%= icon('check', class: 'text-success') %>
-                      Admin user privileges
-                    </li>
-                  </ul>
+          <div class="form-group">
+            <%= f.label :default_currency, Spree.t(:currency) %>
+            <%= f.select :default_currency, currency_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
+          </div>
 
-                  <h5>What will not be shared with this new store:</h5>
-                  <ul class="list-unstyled">
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:orders) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:shipments) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:payments) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:refunds) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:store_credits) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:gift_cards) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:blogs_posts) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:themes) %> & <%= Spree.t(:pages) %>
-                    </li>
-                    <li>
-                      <%= icon('x', class: 'text-danger') %>
-                      <%= Spree.t(:integrations) %> eg. Google Analytics, Meta Pixel, etc.
-                    </li>
-                  </ul>
-                </div>
-              </div>
+          <% if available_stores.any? %>
+            <div class="form-group">
+              <%= f.label :import_products_from_store_id, Spree.t(:import_products_from) %>
+              <%= f.select :import_products_from_store_id,
+                          options_for_select(available_stores.pluck(:name, :id)),
+                          { include_blank: Spree.t(:do_not_import) },
+                          {
+                            data: { controller: 'autocomplete-select' }
+                            } %>
             </div>
-            <div class="modal-footer">
-              <%= modal_discard_button %>
-              <%= turbo_save_button_tag Spree.t('actions.create') %>
+
+            <div class="form-group">
+              <%= f.label :import_payment_methods_from_store_id, Spree.t(:import_payment_methods_from) %>
+              <%= f.select :import_payment_methods_from_store_id,
+                          options_for_select(available_stores.pluck(:name, :id)),
+                          { include_blank: Spree.t(:do_not_import) },
+                          {
+                            data: { controller: 'autocomplete-select' }
+                            } %>
             </div>
-          </div>
+          <% end %>
         </div>
-      <% end %>
-    <% end %>
+        <div class="col-lg-5 offset-lg-1">
+          <h5>What will be shared with this new store:</h5>
+          <ul class="list-unstyled">
+            <li>
+              <%= icon('check', class: 'text-success') %>
+              <%= Spree.t(:products) %>, <%= Spree.t(:stock_locations) %> & <%= Spree.t(:inventory) %><br />
+              <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>
+            </li>
+            <li>
+              <%= icon('check', class: 'text-success') %>
+              <%= Spree.t(:customers) %>
+            </li>
+            <li>
+              <%= icon('check', class: 'text-success') %>
+              Shipping methods, rates and markets
+            </li>
+            <li>
+              <%= icon('check', class: 'text-success') %>
+              <%= Spree.t(:payment_methods) %><br />
+              <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>
+            </li>
+            <li>
+              <%= icon('check', class: 'text-success') %>
+              Admin user privileges
+            </li>
+          </ul>
+
+          <h5>What will not be shared with this new store:</h5>
+          <ul class="list-unstyled">
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:orders) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:shipments) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:payments) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:refunds) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:store_credits) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:gift_cards) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:blogs_posts) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:themes) %> & <%= Spree.t(:pages) %>
+            </li>
+            <li>
+              <%= icon('x', class: 'text-danger') %>
+              <%= Spree.t(:integrations) %> eg. Google Analytics, Meta Pixel, etc.
+            </li>
+          </ul>
+      </div>
+    </div>
   </div>
-</div>
+  <footer id="footer" class="d-flex justify-content-end">
+    <%= turbo_save_button_tag Spree.t('actions.create'), data: { admin_target: 'save' } %>
+  </footer>
+<% end %>

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

@@ -1,25 +1,12 @@
 <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 :tax_code, Spree.t(:tax_code) %>
-      <%= f.text_field :tax_code, class: 'form-control' %>
-    </div>
+    <%= f.spree_text_field :tax_code %>
 
-    <div class="form-group">
-      <%= f.label :description, Spree.t(:description) %><br>
-      <%= f.text_area :description, class: 'form-control' %>
-    </div>
+    <%= f.spree_text_area :description %>
 
-    <div class="custom-control custom-checkbox">
-      <%= f.check_box :is_default, class: 'custom-control-input' %>
-      <%= f.label :is_default, class: 'custom-control-label' %>
-    </div>
+    <%= f.spree_check_box :is_default, label: Spree.t(:default) %>
   </div>
 </div>

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

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

data/app/views/spree/admin/tax_categories/{_tax_category.html.erb → _table_row.html.erb}

@@ -8,6 +8,6 @@
   <td class="w-40" data-action="click->row-link#openLink"><%= tax_category.description %></td>
   <td class="w-10" data-action="click->row-link#openLink"><%= active_badge(tax_category.is_default?) %></td>
   <td class="w-10 actions">
-    <%= link_to_edit(tax_category, data: { row_link_target: :link }) if can? :edit, tax_category %>
+    <%= link_to_edit(tax_category, data: { row_link_target: :link, turbo_frame: '_top' }) if can? :edit, tax_category %>
   </td>
 </tr>

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_tax_categories_url %>
-  <%= @tax_category.name %>
-<% end %>
-
-<%= form_for [:admin, @tax_category] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_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/tax_categories/index.html.erb

@@ -4,32 +4,11 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:tax_categories_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_tax_category), new_object_url, class: "btn btn-primary" %>
-<% end if can? :create, Spree::TaxCategory %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_tax_category), new_object_url, class: "btn btn-primary" if can? :create, Spree::TaxCategory %>
+<% end %>
 
 <%= render_admin_partials(:tax_categories_header_partials) %>
 
 <%= render 'spree/admin/shared/tax_nav' %>
 
-<div class="card-lg">
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:tax_code) %></th>
-            <th><%= Spree.t(:description) %></th>
-            <th><%= Spree.t(:default) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= render collection: @collection, partial: 'spree/admin/tax_categories/tax_category', cached: spree_base_cache_scope %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found' %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

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

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

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

@@ -6,11 +6,8 @@
   </div>
 
   <div class="card-body">
-    <div class="form-group">
-      <%= f.label :name, Spree.t(:name) %>
-      <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
-      <%= f.error_message_on :name %>
-    </div>
+    <%= f.spree_text_field :name, required: true %>
+
     <div class="form-group">
       <%= f.label :amount_percentage, Spree.t(:rate) %>
       <div class="input-group">
@@ -22,30 +19,13 @@
       <%= f.error_message_on :amount %>
     </div>
 
-    <div class="form-group">
-      <%= f.label :zone_id, Spree.t(:zone) %>
-      <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, { class: 'custom-select' }) %>
-    </div>
-    <div class="form-group">
-      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-      <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, { class: 'custom-select' }) %>
-    </div>
+    <%= f.spree_collection_select :zone_id, @available_zones, :id, :name, label: Spree.t(:zone) %>
+    <%= f.spree_collection_select :tax_category_id, @available_categories, :id, :name, label: Spree.t(:tax_category) %>
 
     <hr class="my-4" />
 
-    <div class="form-group">
-      <div class="custom-control custom-checkbox">
-        <%= f.check_box :included_in_price, class: 'custom-control-input' %>
-        <%= f.label :included_in_price, class: 'custom-control-label' %>
-      </div>
-    </div>
-
-    <div class="form-group">
-      <div class="custom-control custom-checkbox">
-        <%= f.check_box :show_rate_in_label, class: 'custom-control-input' %>
-        <%= f.label :show_rate_in_label, class: 'custom-control-label' %>
-      </div>
-    </div>
+    <%= f.spree_check_box :included_in_price %>
+    <%= f.spree_check_box :show_rate_in_label %>
   </div>
 </div>
 

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

@@ -0,0 +1,9 @@
+<tr>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:tax_category) %></th>
+  <th scope="col"><%= Spree.t(:zone) %></th>
+  <th scope="col"><%= sort_link search_collection, :amount, Spree.t(:amount) %></th>
+  <th scope="col"><%= Spree.t(:included_in_price) %></th>
+  <th scope="col"><%= Spree.t(:show_rate_in_label) %></th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/tax_rates/{_tax_rate.html.erb → _table_row.html.erb}

@@ -10,6 +10,6 @@
   <td class="w-10" data-action="click->row-link#openLink"><%= active_badge(tax_rate.included_in_price?) %></td>
   <td class="w-10" data-action="click->row-link#openLink"><%= active_badge(tax_rate.show_rate_in_label?) %></td>
   <td class="w-10 actions">
-    <%= link_to_edit(tax_rate, data: { row_link_target: 'link' }) if can? :edit, tax_rate %>
+    <%= link_to_edit(tax_rate, data: { row_link_target: 'link', turbo_frame: '_top' }) if can? :edit, tax_rate %>
   </td>
 </tr>

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

@@ -1,14 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_tax_rates_path %>
-  <%= @tax_rate.name %>
-<% end %>
-
-<%= form_for [:admin, @tax_rate] do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @tax_rate } %>
-      <%= 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/tax_rates/index.html.erb

@@ -4,34 +4,11 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:tax_rates_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_tax_rate), new_object_url, class: "btn btn-primary" %>
-<% end if can? :create, Spree::TaxRate %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_tax_rate), new_object_url, class: "btn btn-primary" if can? :create, Spree::TaxRate %>
+<% end %>
 
 <%= render_admin_partials(:tax_rates_header_partials) %>
 
 <%= render 'spree/admin/shared/tax_nav' %>
 
-<div class="card-lg">
-  <% if @collection.any? %>
-    <div class="table-responsive">
-      <table class="table">
-        <thead>
-          <tr data-hook="rate_header">
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:tax_category) %></th>
-            <th><%= Spree.t(:zone) %></th>
-            <th><%= Spree.t(:amount) %></th>
-            <th><%= Spree.t(:included_in_price) %></th>
-            <th><%= Spree.t(:show_rate_in_label) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <%= render partial: 'spree/admin/tax_rates/tax_rate', collection: @collection, cached: spree_base_cache_scope %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render 'spree/admin/shared/no_resource_found' %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table' %>

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

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

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

@@ -0,0 +1,5 @@
+<div class="card mb-4">
+  <div class="card-body">
+    <%= f.spree_text_field :name, required: true, autofocus: true %>
+  </div>
+</div>

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

@@ -0,0 +1,6 @@
+<tr data-hook="listing_taxonomies_header">
+  <th class="no-border handel-head"></th>
+  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= Spree.t(:taxons) %></th>
+  <th scope="col"></th>
+</tr>

data/app/views/spree/admin/taxonomies/{_taxonomy.html.erb → _table_row.html.erb}

@@ -3,13 +3,13 @@
     <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>
   </td>
   <td class="w-50 cursor-pointer py-0" data-action="click->row-link#openLink">
-    <%= link_to taxonomy.name, spree.admin_taxonomy_path(taxonomy), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link } %>
+    <%= link_to taxonomy.name, spree.admin_taxonomy_path(taxonomy), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %>
   </td>
-  <td class="w-30 cursor-pointer" data-action="click->row-link#openLink">
+  <td class="w-15 cursor-pointer" data-action="click->row-link#openLink">
     <!-- We don't want to include the root taxon -->
     <%= taxonomy.taxons.count - 1 %>
   </td>
-  <td class="w-10 actions">
+  <td class="w-30 actions">
     <%= link_to_with_icon 'list-tree', Spree.t('admin.manage_taxons'), spree.admin_taxonomy_path(taxonomy), class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' } %>
     <%= link_to_edit(taxonomy, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can?(:edit, taxonomy) %>
   </td>

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

@@ -1,26 +1,2 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_taxonomy_path(@taxonomy) %>
-  <%= @taxonomy.name %>
-<% end %>
 
-<% content_for :page_actions_dropdown do %>
-  <%= link_to_edit_translations(@taxonomy) %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_for [:admin, @taxonomy] do |f| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
-      <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' %>
-            <%= f.error_message_on :name %>
-          </div>
-        </div>
-      </div>
-      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/edit_resource' %>

data/app/views/spree/admin/taxonomies/filters.html.erb

@@ -0,0 +1,6 @@
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>
+  <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
+
+  <%= render "spree/admin/shared/filter_badge_template" %>
+  <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
+<% end %>

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

@@ -4,40 +4,9 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:taxonomies_actions_partials) %>
-  <%= link_to_with_icon 'plus', Spree.t(:new_taxonomy), new_object_url, class: "btn btn-primary" %>
-<% end if can?(:create, Spree::Taxonomy) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_taxonomy), new_object_url, class: "btn btn-primary" if can?(:create, Spree::Taxonomy) %>
+<% end %>
 
 <%= render_admin_partials(:taxonomies_header_partials) %>
 
-<div class="card-lg">
-  <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
-    <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
-
-    <%= render "spree/admin/shared/filter_badge_template" %>
-    <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-  <% end %>
-
-  <% if @taxonomies.present? %>
-    <div class="table-responsive">
-      <table class="table" id='listing_taxonomies'>
-        <thead>
-          <tr data-hook="listing_taxonomies_header">
-            <th class="no-border handel-head"></th>
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:taxons) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody
-          data-controller="sortable"
-          data-sortable-handle-value=".move-handle"
-          data-sortable-resource-name-value="taxonomy"
-        >
-          <%= render partial: "spree/admin/taxonomies/taxonomy", collection: @collection, cached: spree_base_cache_scope %>
-        </tbody>
-      </table>
-    </div>
-  <% else %>
-    <%= render "spree/admin/shared/no_resource_found" %>
-  <% end %>
-</div>
+<%= render 'spree/admin/shared/index_table', sortable: true %>