spree_backend 4.3.0 → 4.4.0.rc1

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

@@ -55,6 +55,7 @@
       <tr data-hook="admin_products_index_headers">
         <th scope="col" colspan="2"><%= sort_link @search,:name, Spree.t(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
         <th scope="col"><%= Spree.t(:sku) %></th>
+        <th scope="col"><%= Spree.t('admin.digitals.digital') %></th>
         <th scope="col"><%= Spree.t(:status) %></th>
         <th scope="col" class="text-center">
           <%= sort_link @search, :master_default_price_amount, Spree.t(:master_price), {}, {title: 'admin_products_listing_price_title'} %>
@@ -73,6 +74,7 @@
             </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="sku"><%= product.sku rescue '' %></td>
+            <td class="text-center"><%= active_badge(product.digitals.any?) %></td>
             <td class="status"><%= active_badge(available_status == Spree.t(:available), label: available_status) %></td>
             <td class="text-center"><%= display_price(product) %></td>
 

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

@@ -7,7 +7,7 @@
 
 <%= form_for [:admin, @product], html: { multipart: true } do |f| %>
   <fieldset data-hook="new_product">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
       <%= f.text_field :name, class: 'form-control title', required: :required %>
       <%= f.error_message_on :name %>
@@ -16,7 +16,7 @@
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
         <div data-hook="new_product_sku" class="col-12 col-md-4">
-          <%= f.field_container :sku, class: ['form-group'] do %>
+          <%= f.field_container :sku do %>
             <%= f.label :sku, Spree.t(:sku) %>
             <%= f.text_field :sku, size: 16, class: 'form-control' %>
             <%= f.error_message_on :sku %>
@@ -25,14 +25,14 @@
       <% end %>
 
       <div data-hook="new_product_prototype" class="col-12 col-md-4">
-        <%= f.field_container :prototype, class: ['form-group'] do %>
+        <%= f.field_container :prototype do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %>
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, { include_blank: true }, { class: 'select2-clear w-100' } %>
         <% end %>
       </div>
 
       <div data-hook="new_product_price" class="col-12 col-md-4">
-        <%= f.field_container :price, class: ['form-group'] do %>
+        <%= f.field_container :price do %>
         <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -45,7 +45,7 @@
       </div>
 
       <div data-hook="new_product_available_on" class="col-12 col-md-4">
-        <%= f.field_container :available_on, class: ['form-group'] do %>
+        <%= f.field_container :available_on do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
 
@@ -64,7 +64,7 @@
       </div>
 
       <div data-hook="new_product_shipping_category" class="col-12 col-md-4">
-        <%= f.field_container :shipping_category, class: ['form-group'] do %>
+        <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span>
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
           <%= f.error_message_on :shipping_category_id %>

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,6 +1,6 @@
 $('#actions').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_action', object: @promotion_action) ) %>');
 $('#actions .no-objects-found').hide();
-$(document).ready(function(){
+$(document).ready(function() {
   $(".variant_autocomplete").variantAutocomplete();
   //enable select2 functions for recently added box
   $('.type-select.select2').last().select2();

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

@@ -1,11 +1,11 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_category } %>
 
-<%= f.field_container :name, class: ['form-group'] do %>
+<%= f.field_container :name do %>
   <%= f.label :name %>
   <%= f.text_field :name, class: 'form-control' %>
   <%= f.error_message_on :name %>
 <% end %>
-<%= f.field_container :code, class: ['form-group'] do %>
+<%= f.field_container :code do %>
   <%= f.label :code %>
   <%= f.text_field :code, class: 'form-control' %>
 <% end %>

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

@@ -2,7 +2,7 @@
 
 <div class="row" id="general_fields">
   <div class="col-12 col-lg-4">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
@@ -22,7 +22,7 @@
       <% end %>
     </div>
 
-    <%= f.field_container :path, class: ['form-group'] do %>
+    <%= f.field_container :path do %>
       <%= f.label :path %>
       <%= f.text_field :path, class: 'form-control' %>
     <% end %>
@@ -36,18 +36,18 @@
   </div>
 
   <div class="col-12 col-lg-4">
-    <%= f.field_container :description, class: ['form-group'] do %>
+    <%= f.field_container :description do %>
       <%= f.label :description %>
       <%= f.text_area :description, rows: 7, class: 'form-control' %>
     <% end %>
 
-    <%= f.field_container :category, class: ['form-group'] do %>
+    <%= f.field_container :category do %>
       <%= f.label :promotion_category %>
       <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
     <% end %>
 
     <% if @stores.count > 1 %>
-      <%= f.field_container :stores, class: ['form-group'] do %>
+      <%= f.field_container :stores do %>
         <%= f.label :promotion_stores, Spree.t(:stores) %>
         <%= collection_select(:promotion, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
       <% end %>

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

@@ -1,20 +1,20 @@
 <div data-hook="admin_property_form" class="row">
   <div class="col-12 col-md-6">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :presentation, class: ['form-group'] do %>
+    <%= f.field_container :presentation do %>
       <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
       <%= f.text_field :presentation, class: 'form-control' %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :filterable, class: ['form-group'] do %>
+    <%= f.field_container :filterable do %>
       <%= f.label :filterable, Spree.t(:filterable) %>
       <%= f.check_box :filterable %>
     <% end %>

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

@@ -1,26 +1,26 @@
 <div data-hook="admin_prototype_form_fields">
-  <%= f.field_container :name, class: ['form-group'] do %>
+  <%= f.field_container :name do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>
 
   <div id='properties' data-hook>
-    <%= f.field_container :property_ids, class: ['form-group'] do %>
+    <%= f.field_container :property_ids do %>
       <%= f.label :property_ids, Spree.t(:properties) %><br>
       <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 
   <div id="option_types" data-hook>
-    <%= f.field_container :option_type_ids, class: ['form-group'] do %>
+    <%= f.field_container :option_type_ids do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
       <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 
   <div id='taxons' data-hook>
-    <%= f.field_container :taxon_ids, class: ['form-group'] do %>
+    <%= f.field_container :taxon_ids do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
       <%= f.select :taxon_ids, current_store.taxons.pluck(:name, :id), {}, { multiple: true, class: "select2" } %>
     <% end %>

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

@@ -18,12 +18,12 @@
         <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br>
         <%= @refund.payment.credit_allowed %>
       </div>
-      <%= f.field_container :amount, class: ['form-group'] do %>
+      <%= f.field_container :amount do %>
         <%= f.label :amount, Spree.t(:amount) %>
         <%= f.text_field :amount, class: 'form-control' %>
         <%= f.error_message_on :amount %>
       <% end %>
-      <%= f.field_container :reason, class: ['form-group'] do %>
+      <%= f.field_container :reason do %>
         <%= f.label :refund_reason_id, Spree.t(:reason) %>
         <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2-clear'}) %>
         <%= f.error_message_on :reason %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_reimbursement_type_form_fields" class="row">
   <div class="col-12 col-md-8">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, class:'form-control' %>
       <%= f.error_message_on :name %>
@@ -8,7 +8,7 @@
   </div>
   <%- if @reimbursement_type.new_record? %>
     <div class="col-12 col-md-8">
-      <%= f.field_container :type, class: ['form-group'] do %>
+      <%= f.field_container :type do %>
         <%= f.label :type, Spree.t(:type) %>
         <%= f.select :type, options_for_select(Spree::ReimbursementType::KINDS), {:include_blank => false}, { :class => 'select2' } %>
         <%= f.error_message_on :type %>

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

@@ -82,19 +82,19 @@
     <%= Spree.t(:total_pre_tax_refund) %>: <span id="total_pre_tax_refund">0.00</span>
   <% end %>
 
-  <%= f.field_container :stock_location, class: ['form-group'] do %>
+  <%= f.field_container :stock_location do %>
     <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
     <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location %>
   <% end %>
 
-  <%= f.field_container :reason, class: ['form-group'] do %>
+  <%= f.field_container :reason do %>
     <%= f.label :reason, Spree.t(:reason) %> <span class="required">*</span>
     <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
     <%= f.error_message_on :reason %>
   <% end %>
 
-  <%= f.field_container :memo, class: ['form-group'] do %>
+  <%= f.field_container :memo do %>
     <%= f.label :memo, Spree.t(:memo) %>
     <%= f.text_area :memo, class: 'form-control' %>
     <%= f.error_message_on :memo %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_role_form_fields">
-  <%= f.field_container :name, class: ["form-group"], 'data-hook' => "role_name" do %>
+  <%= f.field_container :name, 'data-hook' => "role_name" do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>

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

@@ -12,7 +12,7 @@
       <div class="dropdown-divider m-0"></div>
 
       <% if spree.respond_to? :root_path %>
-          <%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+          <%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item', data: { turbo: false } do %>
             <%= svg_icon name: "store.svg", width: '18', height: '18' %>
             &nbsp;
             <%= Spree.t(:back_to_store) %>

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

@@ -2,14 +2,14 @@
 <div id="<%= type %>" data-hook="address_fields">
   <% Spree::Address::ADDRESS_FIELDS.each do |field| %>
     <% if field == "country" %>
-      <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
+      <%= field_container (s_or_b + '_' + field), nil, class: ["#{type}-row"] do %>
         <%= f.label :country_id, Spree.t(:country) %>
         <div id="<%= s_or_b %>country">
           <%= f.collection_select :country_id, all_countries, :id, :name, {}, { class: 'select2 w-100' } %>
         </div>
       <% end %>
     <% elsif field == "state" %>
-      <%= field_container (s_or_b + '_' + field), :state, class: ["form-group", "#{type}-row"] do %>
+      <%= field_container (s_or_b + '_' + field), :state, class: ["#{type}-row"] do %>
         <%= f.label :state_id, Spree.t(:state) %>
         <div id="<%= s_or_b %>state">
           <% if f.object.country.try(:states) %>
@@ -26,7 +26,7 @@
         <%= error_message_on f.object, :state_id %>
       <% end %>
     <% else %>
-      <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
+      <%= field_container (s_or_b + '_' + field), nil, class: ["#{type}-row"] do %>
         <%= f.label field, Spree.t(field) %>
         <%= f.text_field field, class: 'form-control' %>
         <%= error_message_on f.object, field %>
@@ -37,7 +37,7 @@
 
 <% content_for :head do %>
   <script>
-    document.addEventListener('DOMContentLoaded', function() {
+    document.addEventListener("spree:load", function() {
       updateAddressState('<%= s_or_b %>');
       $('#<%= s_or_b %>country select').on('change', function() { updateAddressState('<%= s_or_b %>'); });
     })

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

@@ -15,18 +15,14 @@
 
 <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
 
-<%= render 'spree/admin/shared/paths' %>
-<%= javascript_include_tag 'spree/backend/all' %>
-<%= render "spree/admin/shared/translations" %>
-
 <script>
   <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
-  <%== "Spree.api_key = '#{try_spree_current_user.spree_api_key}';" if try_spree_current_user %>
   <%== "var OAUTH_TOKEN = '#{admin_oauth_token}';" if defined?(admin_oauth_token) %>
   <%== "var ADDRESS_FIELDS = #{Spree::Address::ADDRESS_FIELDS}" %>
-  <% if Rails.env.test? %>
-  jQuery.fx.off = false
-  <% end %>
 </script>
+<%= render 'spree/admin/shared/paths' %>
+<%= javascript_include_tag "spree-dashboard", defer: true, data: { turbo_track: "reload" } %>
+<%= javascript_include_tag 'spree/backend/all', data: { turbo_track: "reload" } %>
+<%= render "spree/admin/shared/translations" %>
 
 <%= yield :head %>

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

@@ -61,6 +61,18 @@
     </ul>
   <% end %>
 
+  <% if can? :admin, Spree::Webhooks::Subscriber %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarIntegrations">
+      <%= main_menu_tree Spree.t('admin.tab.integrations'), icon: "enter.svg", sub_menu: "integrations", url: "#sidebar-integrations" %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, Spree::OauthApplication %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarApps">
+      <%= main_menu_tree Spree.t('admin.tab.apps'), icon: "extensions.svg", sub_menu: "apps", url: "#sidebar-apps" %>
+    </ul>
+  <% end %>
+
   <% if can? :admin, current_store %>
     <ul class="nav nav-sidebar border-bottom" id="sidebarConfiguration">
       <%= main_menu_tree Spree.t(:configurations), icon: "settings.svg", sub_menu: "configuration", url: "#sidebar-configuration" %>

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

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
   <%= button Spree.t('actions.create'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
+  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg', data: { turbo: false } %>
 </div>

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

@@ -52,5 +52,13 @@
         class: "nav-link #{'active' if current == :prices}" %>
 
     <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
+
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'hdd.svg',
+        Spree.t('admin.digitals.digital_assets'),
+        admin_product_digitals_path(@product),
+        class: "nav-link #{'active' if current == :digitals} #{current}" %>
+
+    <% end if can?(:admin, Spree::Digital) && !@product.deleted? %>
   </ul>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
+<% if can?(:admin, current_store) && Spree::Backend::Config[:admin_show_version] %>
   <small
     class="spree-version font-weight-bold ml-3 my-3 text-muted"
     aria-label="Spree Commerce version">

data/app/views/spree/admin/shared/cms/_spree_product.html.erb

@@ -1,8 +1,8 @@
-<%= f.field_container save_to, class: ['form-group'] do %>
+<%= f.field_container save_to do %>
   <%= f.label save_to, Spree.t('admin.cms.link_to_product') %>
   <%= f.select save_to, options_from_collection_for_select([resource], save_to, save_to, resource.send(save_to) || nil), { include_blank: true },
                           id: "cms_section_#{save_to}",
-                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_product'),
                                   autocomplete_clear_value: true,
                                   autocomplete_url_value: 'products_api_v2',
                                   autocomplete_return_attr_value: 'name',

data/app/views/spree/admin/shared/cms/_spree_taxon.html.erb

@@ -1,8 +1,8 @@
-<%= f.field_container save_to, class: ['form-group'] do %>
+<%= f.field_container save_to do %>
   <%= f.label save_to, Spree.t('admin.cms.link_to_taxon') %>
   <%= f.select save_to, options_from_collection_for_select([resource], save_to, save_to, resource.send(save_to) || nil), { include_blank: true },
                           id: "cms_section_#{save_to}",
-                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_taxon'),
                                   autocomplete_clear_value: true,
                                   autocomplete_url_value: 'taxons_api_v2',
                                   autocomplete_return_attr_value: 'pretty_name',

data/app/views/spree/admin/shared/linkables/_spree_cms_page.erb

@@ -4,14 +4,14 @@
    <% name_holder = :title %>
    <% active_id_holder = resource.linked_resource.id %>
  <% end %>
- <%= f.field_container :linked_resource_id, class: ['form-group'] do %>
+ <%= f.field_container :linked_resource_id do %>
     <%= f.label :linked_resource_id, Spree.t('page') %>
     <%= f.select :linked_resource_id,
          options_from_collection_for_select(resorce_holder || [],
                                             id_holder, name_holder, active_id_holder || nil),
          { include_blank: true },
          class: 'select2autocomplete',
-         data: { autocomplete_placeholder_value: Spree.t('admin.linkable.seach_for_a_page'),
+         data: { autocomplete_placeholder_value: Spree.t('admin.linkable.search_for_a_page'),
                  autocomplete_clear_value: true,
                  autocomplete_url_value: 'pages_api_v2',
                  autocomplete_return_attr_value: 'title',

data/app/views/spree/admin/shared/linkables/_spree_product.html.erb

@@ -4,14 +4,14 @@
    <% name_holder = :name %>
    <% active_id_holder = resource.linked_resource.id %>
  <% end %>
- <%= f.field_container :linked_resource_id, class: ['form-group'] do %>
+ <%= f.field_container :linked_resource_id do %>
     <%= f.label :linked_resource_id, Spree.t('product') %>
     <%= f.select :linked_resource_id,
          options_from_collection_for_select(resorce_holder || [],
                                             id_holder, name_holder, active_id_holder || nil),
          { include_blank: true },
          class: 'select2autocomplete',
-         data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
+         data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_product'),
                  autocomplete_clear_value: true,
                  autocomplete_url_value: 'products_api_v2' } %>
 

data/app/views/spree/admin/shared/linkables/_spree_taxon.html.erb

@@ -5,14 +5,14 @@
    <% active_id_holder = resource.linked_resource.id %>
  <% end %>
 
- <%= f.field_container :linked_resource_field, class: ['form-group'] do %>
+ <%= f.field_container :linked_resource_field do %>
    <%= f.label :linked_resource_id, Spree.t('taxon') %>
    <%= f.select :linked_resource_id,
         options_from_collection_for_select(resource_holder || [],
                                            id_holder, name_holder, active_id_holder || nil),
         { include_blank: true },
         class: 'select2autocomplete',
-        data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
+        data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_taxon'),
                 autocomplete_clear_value: true,
                 autocomplete_url_value: 'taxons_api_v2',
                 autocomplete_return_attr_value: 'pretty_name' } %>

data/app/views/spree/admin/shared/linkables/_url.html.erb

@@ -1,4 +1,4 @@
-<%= f.field_container :destination, class: ['form-group'] do %>
+<%= f.field_container :destination do %>
   <%= f.label :destination, Spree.t(:url) %>
   <%= f.text_field :destination, class: 'form-control' %>
   <%= f.error_message_on :destination %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_named_type_form_fields">
-  <%= f.field_container :name, class: ['form-group'] do %>
+  <%= f.field_container :name do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>

data/app/views/spree/admin/{menus/nested_menu_items/_item_bar.html.erb → shared/sortable_tree/_menu.html.erb}

@@ -1,4 +1,7 @@
-<div class="container-item-row d-flex flex-nowrap">
+<% menu = parent_resource %>
+<% item = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
   <div class="move-handle d-flex align-items-center p-3">
     <%= svg_icon(name: 'sort.svg', width: '20', height: '20') %>
   </div>
@@ -14,13 +17,13 @@
         <%= "| #{Spree.t('admin.navigation.code')}: #{item.code}" if item.code.present? %>
       </small>
     </div>
-      <% if item.icon.present? %>
-        <div class="ml-2">
-          <div class="menu_items_image_holder">
-            <%= image_tag main_app.url_for(item.icon.attachment) %>
-          </div>
+    <% if item.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.url_for(item.icon.attachment) %>
         </div>
-      <% end %>
+      </div>
+    <% end %>
   </div>
 
   <div class="d-flex align-items-center space-buttons px-2">

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

@@ -0,0 +1,34 @@
+<% taxonomy = parent_resource %>
+<% taxon = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
+  <div class="move-handle d-flex align-items-center p-3">
+    <%= svg_icon(name: 'sort.svg', width: '20', height: '20') %>
+  </div>
+
+  <div class="d-flex align-items-center overflow-hidden w-100">
+    <div class="overflow-hidden">
+      <%= taxon.name %>
+      <!-- TODO: Taxon Paths do not update in view, fix with Turbo Frames.
+        <h6 class="form-text text-muted mt-0 mb-1">
+          <span class="badge badge-light badge-light-muted-text"><%#= svg_icon(name: 'link.svg', width: '16', height: '16') %> <%= taxon.permalink %></span>
+        </h6>
+      -->
+      <small class="form-text text-muted mt-0 mb-1">
+        <%= Spree.t('admin.taxonomies.submenu') %>: <%= active_badge(!taxon.hide_from_nav) %>
+      </small>
+    </div>
+    <% if taxon.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.url_for(taxon.icon.attachment) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="d-flex align-items-center space-buttons px-2">
+    <%= link_to_edit(taxon, no_text: true, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id)) %>
+    <%= link_to_delete(taxon, no_text: true, url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id)) if can?(:destroy, taxon) %>
+  </div>
+</div>

data/app/views/spree/admin/shared/sub_menu/_apps.html.erb

@@ -0,0 +1,3 @@
+<ul id="sidebar-apps" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_apps">
+  <%= tab :oauth_applications, match_path: '/oauth_applications', label: 'oAuth Applications', do_not_titleize: true %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_integrations.html.erb

@@ -0,0 +1,3 @@
+<ul id="sidebar-integrations" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_integrations">
+  <%= tab :webhooks_subscribers, match_path: '/webhooks_subscribers', label: 'Webhooks' %>
+</ul>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_shipping_category_form_fields">
   <div data-hook="name" class="form-group">
-    <%= f.field_container :name, class: ["form-group"] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %><br>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_shipping_method_form_fields">
   <div class="row">
     <div data-hook="admin_shipping_method_form_name_field" class="col-12 col-lg-6">
-      <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.field_container :name do %>
         <%= f.label :name, Spree.t(:name) %>
         <%= f.text_field :name, class: 'form-control' %>
         <%= f.error_message_on :name %>
@@ -9,7 +9,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_display_field" class="col-12 col-lg-6">
-      <%= f.field_container :display_on, class: ['form-group'] do %>
+      <%= f.field_container :display_on do %>
         <%= f.label :display_on, Spree.t(:display) %>
         <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2-clear' }) %>
         <%= f.error_message_on :display_on %>
@@ -19,7 +19,7 @@
 
   <div class="row">
     <div data-hook="admin_shipping_method_form_internal_name_field" class="col-12 col-lg-4">
-      <%= f.field_container :admin_name, class: ['form-group'] do %>
+      <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
         <%= f.error_message_on :admin_name %>
@@ -27,7 +27,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_code" class="col-12 col-lg-4">
-      <%= f.field_container :code, class: ['form-group'] do %>
+      <%= f.field_container :code do %>
         <%= f.label :code, Spree.t(:code) %>
         <%= f.text_field :code, class: 'form-control', label: false %>
         <%= f.error_message_on :code %>
@@ -35,7 +35,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-12 col-lg-4">
-      <%= f.field_container :tracking_url, class: ['form-group'] do %>
+      <%= f.field_container :tracking_url do %>
         <%= f.label :tracking_url, Spree.t(:tracking_url) %>
         <%= f.text_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
         <%= f.error_message_on :tracking_url %>
@@ -54,7 +54,7 @@
       </div>
 
       <div class="card-body">
-        <%= f.field_container :categories, class: ['form-group'] do %>
+        <%= f.field_container :categories do %>
           <% Spree::ShippingCategory.all.each do |category| %>
             <div class="checkbox">
               <%= label_tag do %>
@@ -78,7 +78,7 @@
       </div>
 
       <div class="card-body">
-        <%= f.field_container :zones, class: ['form-group'] do %>
+        <%= f.field_container :zones do %>
           <% shipping_method_zones = @shipping_method.zones.to_a %>
           <% Spree::Zone.all.each do |zone| %>
             <div class="checkbox">
@@ -109,7 +109,7 @@
       </div>
 
       <div class="card-body">
-        <%= f.field_container :categories, class: ['form-group'] do %>
+        <%= f.field_container :categories do %>
           <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2-clear" %>
           <%= f.error_message_on :tax_category_id %>
         <% end %>