spree_admin 5.2.0.rc3 → 5.2.0

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

@@ -1,19 +1,10 @@
 <% data_action = (@page_link.persisted? && !@page_link.parent.is_a?(Spree::Store) ? { action: 'blur->auto-submit#submit' } : {}) %>
 
-<div class="form-group">
-  <%= f.label :linkable_type, 'Link' %>
-  <%= f.select :linkable_type, @page_link.parent.allowed_linkable_types, { include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>
-  <%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_link, form_name: 'page_link' %>
-</div>
+<%= f.spree_select :linkable_type, @page_link.parent.allowed_linkable_types, { label: 'Link', include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>
+<%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_link, form_name: 'page_link' %>
 
 <hr class="my-4" />
 
-<div class="form-group">
-  <%= f.label :label, Spree.t(:name) %>
-  <%= f.text_field :label, class: 'form-control', data: data_action, required: true %>
-</div>
+<%= f.spree_text_field :label, label: Spree.t(:name), data: data_action, required: true %>
 
-<div class="custom-control custom-checkbox">
-  <%= f.check_box :open_in_new_tab, class: 'custom-control-input', data: data_action %>
-  <%= f.label :open_in_new_tab, class: 'custom-control-label' %>
-</div>
+<%= f.spree_check_box :open_in_new_tab, data: data_action %>

data/app/views/spree/admin/page_sections/forms/_header.html.erb

@@ -1,5 +1,3 @@
-<label>Logo image</label>
-
 <%= render 'spree/admin/shared/page_section_logo', f: f %>
 
 <p class="text-muted small mt-2">

data/app/views/spree/admin/payments/_payment.html.erb

@@ -46,6 +46,13 @@
     <% end %>
   </div>
   <div class="card-body">
+    <% if payment.gateway_processing_error_messages.any? %>
+      <div class="alert alert-danger inline-block">
+        <strong><%= Spree.t(:payments_gateway_processing_errors, payment_method_name: payment.payment_method&.name) %>:</strong>
+        <%= payment.gateway_processing_error_messages.join(', ') %>
+      </div>
+    <% end %>
+
     <div class="d-flex">
       <div class="w-50">
         <p class="mb-1"><%= Spree.t(:amount) %>:</p>

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

@@ -25,10 +25,7 @@
   <div class="col-lg-4">
     <div class="card mb-4">
       <div class="card-body">
-        <div class="form-group">
-          <%= f.label :image, Spree.t(:featured_image) %>
-          <%= render 'active_storage/upload_form', form: f, field_name: :image, width: 1200, height: 600, crop: true, css: 'flex-col' %>
-        </div>
+        <%= f.spree_file_field :image, width: 1200, height: 600, crop: true, css: 'flex-col', label: Spree.t(:featured_image) %>
       </div>
     </div>
 

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

@@ -1,10 +1,16 @@
-<%= 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: :search_by_title, label: Spree.t(:title) %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :search_by_title, label: Spree.t(:title) %>
 
-    <%= render 'spree/admin/shared/filters_button' %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+        <%= icon "adjustments", class: "mr-1" %>
+        <%= Spree.t("admin.filters") %>
+      <% end %>
+    </div>
+
+  <dialog class="drawer" data-dialog-target="dialog" id="posts-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <div class="form-group">
       <%= f.label :author_id_eq, Spree.t(:author) %>
       <%= f.select :author_id_eq,
@@ -20,8 +26,12 @@
                { data: { filters_target: :input, controller: 'autocomplete-select' } } %>
     </div>
     <%= render_admin_partials(:posts_filters_partials, f: f) %>
-    <%= render 'spree/admin/shared/filter_submit' %>
-  </div>
+    </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <%= render 'spree/admin/shared/filter_submit' %>
+    </div>
+  </dialog>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
 

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

@@ -18,7 +18,7 @@
       url: spree.bulk_status_update_admin_products_path(status: :draft)
     ) %>
 
-    <%= dropdown direction: 'top' do %>
+    <%= dropdown direction: 'top', portal: false do %>
       <%= dropdown_toggle do %>
         <%= icon('dots-vertical', class: "mr-0") %>
       <% end %>

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

@@ -1,9 +1,10 @@
 <% frame_name ||= nil %>
 
+
 <%= search_form_for product_list_filters_search_form_path,
   class: "filter-wrap",
   data: {
-    controller: "filters dropdown",
+    controller: "filters dialog",
     filters_url_value: request.url
   } do |f| %>
   <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
@@ -11,9 +12,15 @@
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
     <%= render "spree/admin/products/table_filter_dropdown" %>
-    <%= render 'spree/admin/shared/filters_button' %>
+    <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+      <%= icon "adjustments", class: "mr-1" %>
+      <%= Spree.t("admin.filters") %>
+    <% end %>
   </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+
+  <dialog class="drawer" data-dialog-target="dialog" id="product-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <%= f.hidden_field :status_eq, value: params.dig(:q, :status_eq) %>
     <div class="form-group">
       <%= f.label :taxons_id_in, Spree.t(:taxons) %>
@@ -44,10 +51,14 @@
         filters_target: "input",
       } %>
     </div>
-    
+
     <%= render_admin_partials(:products_filters_partials, f: f) %>
-    <%= render 'spree/admin/shared/filter_submit' %>
-  </div>
+    </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <%= render 'spree/admin/shared/filter_submit' %>
+    </div>
+  </dialog>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
 

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

@@ -13,7 +13,7 @@
       <%= product_filter_stock_dropdown_value if product_filter_stock_dropdown_value != Spree.t('admin.products.any_stock') %>
     <% end %>
   <% end %>
-  <%= dropdown_menu class: 'w-100', style: 'min-width: 200px' do %>
+  <%= dropdown_menu do %>
     <h6 class="dropdown-header"><%= Spree.t('admin.products.by_status') %>:</h6>
 
     <%= active_link_to Spree.t('admin.products.all_statuses'), params.to_unsafe_h.deep_merge({page: nil, q: {status_eq: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[status_eq in_stock_items out_of_stock_items] ).all?(&:blank?) %>

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

@@ -6,72 +6,20 @@
   <%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user', data: { admin_target: 'save' } %>
 <% end %>
 
-<%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>
-  <div class="row">
-    <div class="col-lg-6 offset-lg-3">
+<div class="row">
+  <div class="col-lg-6 offset-lg-3">
+    <%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>
       <div class="card mb-4">
         <div class="card-header">
           <h5 class="card-title"><%= Spree.t('admin.personal_details') %></h5>
         </div>
         <div class="card-body">
-          <div class="form-group mb-4">
-            <%= f.label :email, class: 'form-label' %>
-            <%= f.email_field :email, class: 'form-control', required: true %>
-          </div>
-          <div class="form-group mb-4">
-            <%= f.label :first_name, class: 'form-label' %>
-            <%= f.text_field :first_name, class: 'form-control', required: true %>
-          </div>
-          <div class="form-group mb-4">
-            <%= f.label :last_name, class: 'form-label' %>
-            <%= f.text_field :last_name, class: 'form-control', required: true %>
-          </div>
-          <div class="form-group mb-0">
-            <div>
-              <%= f.label :avatar, class: 'form-label' %>
-            </div>
-            <%= render 'active_storage/upload_form', form: f, field_name: :avatar, crop: true %>
-          </div>
+          <%= f.spree_email_field :email, required: true %>
+          <%= f.spree_text_field :first_name, required: true %>
+          <%= f.spree_text_field :last_name, required: true %>
+          <%= f.spree_file_field :avatar, crop: true %>
         </div>
       </div>
-
-      <div class="card">
-        <div class="card-header">
-          <h5 class="card-title"><%= Spree.t('admin.notifications') %></h5>
-        </div>
-        <div class="card-body">
-          <% if @user.respond_to?(:deliver_invitation_accepted_email) %>
-            <div class="custom-control custom-switch mb-3">
-              <%= f.check_box :deliver_invitation_accepted_email, class: 'custom-control-input' %>
-              <%= f.label :deliver_invitation_accepted_email, 'Someone accepted your team invitation', class: 'custom-control-label' %>
-            </div>
-          <% end %>
-
-          <% if @user.respond_to?(:deliver_vendor_new_order_email) %>
-            <hr />
-            <div class="custom-control custom-switch mb-3">
-              <%= f.check_box :deliver_vendor_new_order_email, class: 'custom-control-input' %>
-              <%= f.label :deliver_vendor_new_order_email, 'New order notification', class: 'custom-control-label' %>
-            </div>
-          <% end %>
-
-          <% if @user.respond_to?(:deliver_vendor_onboarding_started_email) %>
-            <hr />
-            <div class="custom-control custom-switch mb-3">
-              <%= f.check_box :deliver_vendor_onboarding_started_email, class: 'custom-control-input' %>
-              <%= f.label :deliver_vendor_onboarding_started_email, 'Vendor started onboarding', class: 'custom-control-label' %>
-            </div>
-            <div class="custom-control custom-switch mb-3">
-              <%= f.check_box :deliver_vendor_onboarding_completed_email, class: 'custom-control-input' %>
-              <%= f.label :deliver_vendor_onboarding_completed_email, 'Vendor completed onboarding', class: 'custom-control-label' %>
-            </div>
-            <div class="custom-control custom-switch mb-3">
-              <%= f.check_box :deliver_vendor_approved_email, class: 'custom-control-input' %>
-              <%= f.label :deliver_vendor_approved_email, 'Vendor has been approved', class: 'custom-control-label' %>
-            </div>
-          <% end %>
-        </div>
-      </div>
-    </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,17 +1,27 @@
-<%= 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: :name_cont, label: Spree.t(:name) %>
-    <%= render "spree/admin/promotions/table_filter_dropdown" %>
-    <%= render 'spree/admin/shared/filters_button' %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
-    <div class="form-group">
-      <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
-      <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
+      <%= render "spree/admin/promotions/table_filter_dropdown" %>
+      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+        <%= icon "adjustments", class: "mr-1" %>
+        <%= Spree.t("admin.filters") %>
+      <% end %>
     </div>
-    <%= render_admin_partials(:promotions_filters_partials, f: f) %>
-    <%= render 'spree/admin/shared/filter_submit' %>
-  </div>
+
+  <dialog class="drawer" data-dialog-target="dialog" id="promotion-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
+        <div class="form-group">
+          <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
+          <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
+        </div>
+      <%= render_admin_partials(:promotions_filters_partials, f: f) %>
+    </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <%= render 'spree/admin/shared/filter_submit' %>
+    </div>
+  </dialog>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
 

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

@@ -5,7 +5,7 @@
     </span>
     <%= promotion_filter_dropdown_value %>
   <% end %>
-  <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %>
+  <%= dropdown_menu do %>
     <%= active_link_to 'All Promotions', params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: nil}}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[expired active] ).all?(&:blank?) %>
     <%= link_to Spree.t(:expired),
       params.to_unsafe_h.deep_merge({page: nil, q: {active: nil, expired: true}}),

data/app/views/spree/admin/promotions/form/_settings.html.erb

@@ -2,17 +2,6 @@
   <%= f.spree_number_field :usage_limit, min: 0, step: 1, help: 'Leave this field blank for unlimited usage.' %>
 <% end %>
 
-<div class="form-group">
-  <%= f.label :starts_at %>
-  <%= f.datetime_field :starts_at, class: 'form-control' %>
-  <%= f.error_message_on :starts_at %>  
-</div>
+<%= f.spree_datetime_field :starts_at %>
 
-<div class="form-group">
-  <%= f.label :expires_at %>
-  <%= f.datetime_field :expires_at, class: 'form-control' %>
-  <%= f.error_message_on :expires_at %>
-  <span class="form-text mt-2">
-    Leave this field blank for no expiration.
-  </span>
-</div>
+<%= f.spree_datetime_field :expires_at, help: 'Leave this field blank for no expiration.' %>

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

@@ -1,13 +1,5 @@
 <% if f.object.new_record? %>
-  <div class="form-group">
-    <%= f.label :amount, Spree.t(:amount) %>
-    <div class="input-group">
-      <%= f.text_field :amount, class: 'form-control', required: true %>
-      <div class="input-group-append">
-        <span class="input-group-text"><%= currency_symbol(@order.currency) %></span>
-      </div>
-    </div>
-  </div>
+  <%= f.spree_text_field :amount, label: Spree.t(:amount), append: currency_symbol(@order.currency), required: true %>
 <% end %>
 
 <%= 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/return_authorizations/filters.html.erb

@@ -13,7 +13,7 @@
           <%= Spree.t(:all) %>
         <% end %>
       <% end %>
-      <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %>
+      <%= dropdown_menu do %>
         <%= active_link_to Spree.t(:all),
         params.to_unsafe_h.deep_merge({ q: { state_eq: "" } }),
         class: "dropdown-item",

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

@@ -1,3 +1,5 @@
 <% content_for :page_title do %>
   <%= Spree.t('admin.audit_log') %>
 <% end %>
+
+<%= render_tab_navigation(:audit_tabs) %>

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

@@ -7,7 +7,7 @@
 
 <% dropdown_direction ||= 'left' %>
 
-<%= dropdown direction: dropdown_direction, data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-100' do %>
+<%= dropdown direction: dropdown_direction, data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-100', portal: false do %>
   <%= dropdown_toggle class: css_classes do %>
     <%= icon('calendar', class: 'mr-2') %>
     <div data-calendar-range-target="label">
@@ -18,7 +18,7 @@
       <% end %>
     </div>
   <% end %>
-  <%= dropdown_menu class: "pt-2 px-2 pb-1" do %>
+  <%= dropdown_menu class: "pt-2 px-2 pb-1", style: 'min-width: 29rem' do %>
     <div data-calendar-range-target="picker" class="d-none"></div>
   <% end %>
 

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

@@ -22,7 +22,7 @@
       <% end %>
 
       <% if show_record_subtitle || content_for(:page_actions_dropdown) %>
-        <%= dropdown id: 'page_actions_dropdown', class: 'h-100' do %>
+        <%= dropdown id: 'page_actions_dropdown', class: 'h-100', portal: false do %>
           <%= dropdown_toggle id: 'more-actions-link', class: 'btn-light h-100 p-2' do %>
             <%= icon 'dots-vertical', class: 'mr-0' %>
           <% end %>

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

@@ -1,7 +1,5 @@
 <%= content_for :page_title do %>
   <%= Spree.t(:developers) %>
 <% end %>
-<%= content_for :page_tabs do %>
-  <%= nav_item(Spree.t(:api_keys), spree.admin_oauth_applications_path) if can?(:manage, Spree::OauthApplication) %>
-  <%= nav_item(Spree.t(:webhooks), spree.admin_webhooks_subscribers_path) if can?(:manage, Spree::Webhooks::Subscriber) %>
-<% end %>
+
+<%= render_tab_navigation(:developers_tabs) %>

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

@@ -1,11 +1,9 @@
 <div id="scroll-header"></div>
 
-<%= render 'spree/admin/shared/offcanvas_nav' %>
-
 <header id="header" class="sticky-top py-0">
   <nav class="navbar navbar-expand-lg p-0 d-flex align-items-center pr-3">
     <div class="d-lg-none pr-3 border-right">
-      <button type="button" class="btn btn-light pull-bs-canvas-left px-2 ml-3 text-decoration-none">
+      <button type="button" class="btn btn-light px-2 ml-3 text-decoration-none" data-action="click->sidebar#openMobile">
         <%= icon('menu-2', class: 'mr-0') %>
       </button>
     </div>
@@ -20,13 +18,13 @@
       <% end %>
     <% end %>
 
+    <button type="button" class="sidebar-toggle-btn ml-3 mr-3 d-none d-lg-block" data-action="click->sidebar#toggle" aria-label="<%= Spree.t('admin.expand_sidebar') %>">
+      <%= icon('layout-sidebar-left-collapse') %>
+    </button>
+
     <div class="d-none d-lg-block">
       <%= render 'spree/admin/shared/breadcrumbs' %>
     </div>
-
-    <div class="ml-auto d-flex align-items-center">
-      <%= render 'spree/admin/shared/user_dropdown' %>
-    </div>
   </nav>
 </header>
 

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

@@ -0,0 +1,5 @@
+<ul class="nav flex-column">
+  <% items.each do |item| %>
+    <%= render 'spree/admin/shared/navigation_item', item: item, context: context %>
+  <% end %>
+</ul>

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

@@ -0,0 +1,64 @@
+<%
+  # Resolve item properties (pass self as context for route helpers)
+  item_url = item.resolve_url(self)
+  item_label = item.resolve_label
+  badge_value = item.badge_value(self)
+  is_active = item.active?(request.path, self)
+  has_children = item.children.present?
+  tooltip_text = item.tooltip
+
+  # Build data attributes - only add tooltip controller if tooltip is present
+  data_attrs = item.data_attributes.dup
+  if tooltip_text.present?
+    data_attrs[:controller] = 'tooltip'
+  end
+
+  # Build additional HTML options (like target)
+  html_options = {}
+  html_options[:target] = item.target if item.target.present?
+  html_options[:id] = "nav-link-#{item.key}" if item.key.present?
+
+  # Build complete label with badge (like old menu pattern)
+  complete_label = item_label
+  if badge_value.present?
+    badge_class = item.badge_class.presence || 'badge-light'
+    complete_label += content_tag(:span, badge_value, class: "badge ml-auto #{badge_class}")
+  end
+  # Add tooltip if present
+  if tooltip_text.present?
+    complete_label += tooltip(tooltip_text)
+  end
+  complete_label = complete_label&.html_safe
+%>
+
+<% if item.section? %>
+  <%# Section header %>
+  <li class="nav-item nav-section-header mt-3 border-top pt-3 pl-2">
+    <span class="text-muted text-uppercase font-weight-light font-size-sm"><%= item.section_label %></span>
+  </li>
+<% else %>
+  <% if has_children %>
+    <%# Item with children (submenu shows when parent is active) %>
+    <%= nav_item(complete_label, item_url, icon: item.icon, active: is_active, data: data_attrs, **html_options) %>
+
+    <%# Submenu for expanded sidebar (only shown when active) %>
+    <ul class="nav-submenu <% unless is_active %>d-none<% end %>" id="nav-submenu-<%= item.key %>">
+      <% item.children.select { |child| child.visible?(self) }.each do |child_item| %>
+        <%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %>
+      <% end %>
+    </ul>
+
+    <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
+    <ul class="nav-submenu-dropdown d-none dropdown-container" id="nav-submenu-dropdown-<%= item.key %>">
+      <%# Add parent item as first item in dropdown %>
+      <%= nav_item(item_label, item_url, icon: nil) %>
+
+      <% item.children.select { |child| child.visible?(self) }.each do |child_item| %>
+        <%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %>
+      <% end %>
+    </ul>
+  <% else %>
+    <%# Regular item without children %>
+    <%= nav_item(complete_label, item_url, icon: item.icon, active: is_active, data: data_attrs, **html_options) %>
+  <% end %>
+<% end %>

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

@@ -1,4 +1,4 @@
-<%= dropdown do %>
+<%= dropdown id: 'new-item-dropdown' do %>
   <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
     <%= icon 'plus', class: 'mr-0' %>
   <% end %>

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

@@ -1,7 +1,4 @@
-<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 400, height: 128, auto_submit: true %>
+<%= f.spree_file_field :asset, width: 400, height: 128, auto_submit: true, label: Spree.t(:image) %>
 <% if f.object.has_preference?(:image_alt) %>
-  <div class="form-group">
-    <%= f.label :preferred_image_alt, Spree.t(:alt_text) %>
-    <%= f.text_field :preferred_image_alt, data: { action: 'auto-submit#submit' }, class: 'form-control' %>
-  </div>
+  <%= f.spree_text_field :preferred_image_alt, label: Spree.t(:alt_text), data: { action: 'auto-submit#submit' } %>
 <% end %>

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

@@ -1 +1 @@
-<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 400, height: 128, auto_submit: true %>
+<%= f.spree_file_field :asset, width: 400, height: 128, auto_submit: true, label: Spree.t(:logo) %>

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

@@ -2,9 +2,8 @@
   <%= Spree.t(:returns) %> & <%= Spree.t(:refunds) %>
 <% end %>
 
+<%= render_tab_navigation(:returns_tabs) %>
+
 <% content_for(:page_tabs) do %>
-  <%= nav_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can?(:manage, Spree::ReturnAuthorizationReason) %>
-  <%= nav_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can?(:manage, Spree::RefundReason) %>
-  <%= nav_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can?(:manage, Spree::ReimbursementType) %>
   <%= render_admin_partials(:returns_and_refunds_nav_partials) %>
 <% end %>

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

@@ -1,5 +1,6 @@
+<%= render_tab_navigation(:shipping_tabs) %>
+
 <%= content_for(:page_tabs) do %>
-  <%= nav_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path, active: controller_name == 'shipping_methods' && action_name == 'index') if can?(:manage, Spree::ShippingMethod) %>
-  <%= nav_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can?(:manage, Spree::ShippingCategory) %>
   <%= render_admin_partials(:shipping_nav_partials) %>
 <% end %>
+

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

@@ -1,7 +1,33 @@
-<aside id="main-sidebar" class="overflow-y-auto">
-  <% if defined?(current_vendor) && current_vendor.present? %>
-    <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
-  <% else %>
-    <%= render 'spree/admin/shared/sidebar/store_nav' %>
-  <% end %>
-</aside>
+<%# Desktop Sidebar %>
+<aside id="main-sidebar" class="overflow-y-auto" data-sidebar-target="desktop">
+  <div class="sidebar-content">
+    <% if defined?(current_vendor) && current_vendor.present? %>
+      <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
+    <% else %>
+      <%= render 'spree/admin/shared/sidebar/store_nav' %>
+    <% end %>
+  </div>
+
+  <%= render 'spree/admin/shared/user_dropdown' %>
+</aside>
+
+<%# Mobile Sidebar Overlay %>
+<div class="sidebar-mobile d-lg-none" data-sidebar-target="mobile">
+  <div class="sidebar-backdrop" data-action="click->sidebar#closeMobile"></div>
+  <div class="sidebar-panel">
+    <div class="sidebar-mobile-header">
+      <button type="button" class="btn btn-sm" data-action="click->sidebar#closeMobile" aria-label="<%= Spree.t('admin.close_sidebar') %>">
+        <%= icon('x') %>
+      </button>
+    </div>
+    <div class="sidebar-mobile-content">
+      <% if defined?(current_vendor) && current_vendor.present? %>
+        <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
+      <% else %>
+        <%= render 'spree/admin/shared/sidebar/store_nav' %>
+      <% end %>
+    </div>
+
+    <%= render 'spree/admin/shared/user_dropdown' %>
+  </div>
+</div>

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

@@ -1,3 +1,6 @@
-<%= nav_item(Spree.t(:stock_items), spree.admin_stock_items_path) if can?(:manage, Spree::StockItem) %>
-<%= nav_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can?(:manage, Spree::StockTransfer) %>
-<%= render_admin_partials(:stock_nav_partials) %>
+<%= render_tab_navigation(:stock_tabs) %>
+
+<%= content_for(:page_tabs) do %>
+  <%= render_admin_partials(:stock_nav_partials) %>
+<% end %>
+

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

@@ -1,5 +1,4 @@
+<%= render_tab_navigation(:tax_tabs) %>
 <%= content_for(:page_tabs) do %>
-  <%= nav_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can?(:manage, Spree::TaxRate) %>
-  <%= nav_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can?(:manage, Spree::TaxCategory) %>
   <%= render_admin_partials(:tax_nav_partials) %>
 <% end %>

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

@@ -1,9 +1,8 @@
 <% content_for :page_title, Spree.t(:users) %>
 
+<%= render_tab_navigation(:team_tabs) %>
+
 <%= content_for(:page_tabs) do %>
-  <%= nav_item(Spree.t(:users), spree.admin_admin_users_path) if can?(:manage, Spree.admin_user_class) %>
-  <%= nav_item(Spree.t(:invitations), spree.admin_invitations_path) if can?(:manage, Spree::Invitation) %>
-  <%= nav_item(Spree.t(:roles), spree.admin_roles_path) if can?(:manage, Spree::Role) %>
   <%= render_admin_partials(:team_nav_partials) %>
 <% end %>