spree_admin 5.3.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5563fe644b860f13ec2dbbe7f1becacbbdc98c0155fc96613df511ad5210c6
-  data.tar.gz: b1d9bab21c05510f2c8a2a3a82c1c97e90b92853a91f46abbae29980428d32d9
+  metadata.gz: 4946aeaa86aa1e2c96735cda6cce989be4b24ae48ee0da8fb818a2ecc6629ab6
+  data.tar.gz: 3ad2307712a9587dcf81f83fb6c315bca28cb157a7be773a45b7a39b2b611566
 SHA512:
-  metadata.gz: 5cee25a742f215c4f66aefeec9ae5402ffd46cbb91715a90cbed7dcfaff2970719fae39f81a9dcfcfcd9ee63cceca906549ace8fc26a76080f3f7734615d391e
-  data.tar.gz: 1098481f56d76418a17dfff7806e4b64527ef2be597e11800992ad4393617aa66c6a5f54cae85d329315d3cd2f92af414ffe86c165ae2a4f6fc9c8c03f8bec6f
+  metadata.gz: 6ec39dcde0b0523fd504293103e50e34010d6c3046056bb89764740f38eee913bdc40a569992327475987e45dcba66ef37d8c08e442bd3421d4ecc68f3e10d27
+  data.tar.gz: bd648240f8c15a8b119df6e267772df73cbe6db8ddfeddce1da6861bc2d745271ac8c1fe9663be19e75188c87ed278c7aff31f3f92ef9f12e99eb498a72ef6bb

data/app/helpers/spree/admin/navigation_helper.rb

@@ -323,10 +323,7 @@ module Spree
         items = navigation_items(context)
         return '' if items.empty?
 
-        render 'spree/admin/shared/navigation',
-               items: items,
-               context: context,
-               **options
+        render_navigation_items(items, context)
       end
 
       # Get navigation items for the given context
@@ -337,6 +334,51 @@ module Spree
         Spree.admin.navigation.send(context)&.visible_items(self) || []
       end
 
+      # Renders navigation items as an unordered list
+      # @param items [Array<Spree::Admin::Navigation::Item>] navigation items to render
+      # @param context [Symbol] the navigation context
+      # @return [SafeBuffer] the rendered HTML
+      def render_navigation_items(items, context)
+        return ''.html_safe if items.empty?
+
+        content_tag :ul, class: 'nav flex-col' do
+          safe_join(items.map { |item| render_navigation_item(item, context) })
+        end
+      end
+
+      # Renders a single navigation item
+      # @param item [Spree::Admin::Navigation::Item] the navigation item
+      # @param context [Symbol] the navigation context
+      # @return [SafeBuffer] the rendered HTML
+      def render_navigation_item(item, context)
+        return render_nav_section_header(item) if item.section?
+
+        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
+        data_attrs = item.data_attributes.dup
+        data_attrs[:controller] = 'tooltip' if tooltip_text.present?
+
+        # Build HTML options
+        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 and tooltip
+        complete_label = build_nav_label(item_label, badge_value, item.badge_class, tooltip_text)
+
+        if has_children
+          render_nav_item_with_children(item, complete_label, item_url, item_label, is_active, data_attrs, html_options, context)
+        else
+          nav_item(complete_label, item_url, icon: item.icon, active: is_active, data: data_attrs, **html_options)
+        end
+      end
+
       # Renders page tab navigation for the given context
       # @param context [Symbol] the navigation context (:tax_tabs, :shipping_tabs, etc.)
       # @param options [Hash] additional options for rendering
@@ -355,6 +397,54 @@ module Spree
           end.join.html_safe
         end
       end
+
+      private
+
+      # Builds navigation label with optional badge and tooltip
+      # @return [SafeBuffer] the label HTML
+      def build_nav_label(label, badge_value, badge_class, tooltip_text)
+        result = label.to_s
+        if badge_value.present?
+          css_class = badge_class.presence || 'badge-light'
+          result += content_tag(:span, badge_value, class: "badge ml-auto #{css_class}")
+        end
+        if tooltip_text.present?
+          result += tooltip(tooltip_text)
+        end
+        result.html_safe
+      end
+
+      # Renders a section header
+      # @return [SafeBuffer] the section header HTML
+      def render_nav_section_header(item)
+        content_tag :li, class: 'nav-item nav-section-header mt-4 border-t pt-4 pl-2' do
+          content_tag :span, item.section_label, class: 'text-gray-600 uppercase font-light text-sm'
+        end
+      end
+
+      # Renders a nav item that has children (with submenu)
+      # @return [SafeBuffer] the nav item with submenu HTML
+      def render_nav_item_with_children(item, complete_label, item_url, item_label, is_active, data_attrs, html_options, context)
+        visible_children = item.children.select { |child| child.visible?(self) }
+
+        # Main nav item
+        main_item = 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)
+        submenu = content_tag :ul, class: "nav-submenu#{' hidden' unless is_active}", id: "nav-submenu-#{item.key}" do
+          safe_join(visible_children.map { |child| render_navigation_item(child, context) })
+        end
+
+        # Dropdown submenu for collapsed sidebar (shown on hover)
+        dropdown = content_tag :ul, class: 'nav-submenu-dropdown hidden dropdown-container', id: "nav-submenu-dropdown-#{item.key}" do
+          # Parent item as first dropdown item
+          parent_link = nav_item(item_label, item_url, icon: nil)
+          children_items = safe_join(visible_children.map { |child| render_navigation_item(child, context) })
+          parent_link + children_items
+        end
+
+        main_item + submenu + dropdown
+      end
     end
   end
 end

data/app/views/layouts/spree/admin.html.erb

@@ -13,7 +13,7 @@
 
     <%= render "spree/admin/shared/header" %>
     <%= render "spree/admin/shared/sidebar" %>
-    <main id="content" data-controller=" export-dialog">
+    <main id="content" data-controller="export-dialog">
       <%= render "spree/admin/shared/content_header" %>
       <%= render "spree/admin/shared/page_tabs" %>
       <%= render "spree/admin/shared/page_alerts" %>

data/app/views/spree/admin/tables/_table.html.erb

@@ -22,7 +22,8 @@
                                    params.dig(:q, search_param),
                                    class: "outline-none border-0 h-full focus:border-0 focus:ring-0 p-0 text-base w-full",
                                    placeholder: search_placeholder,
-                                   data: { action: 'input->auto-submit#submit input->search-clear#toggleClearButton search->auto-submit#submit', search_clear_target: 'input' } %>
+                                   id: "#{frame_name}-table-search-input",
+                                   data: { "turbo-permanent": true, action: 'input->auto-submit#submit input->search-clear#toggleClearButton search->auto-submit#submit', search_clear_target: 'input' } %>
               <button type="button" class="<%= 'hidden' if params.dig(:q, search_param).blank? %> p-1 text-gray-400 hover:text-gray-600 shrink-0" data-search-clear-target="clear" data-action="search-clear#clear">
                 <%= icon 'x', class: 'w-4 h-4' %>
               </button>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.2
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: 5.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: 5.3.2
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -937,8 +937,6 @@ files:
 - app/views/spree/admin/shared/_media_form.html.erb
 - app/views/spree/admin/shared/_modal.html.erb
 - app/views/spree/admin/shared/_multi_product_picker.html.erb
-- app/views/spree/admin/shared/_navigation.html.erb
-- app/views/spree/admin/shared/_navigation_item.html.erb
 - app/views/spree/admin/shared/_new_item_dropdown.html.erb
 - app/views/spree/admin/shared/_new_resource.html.erb
 - app/views/spree/admin/shared/_new_resource_links.html.erb
@@ -1255,9 +1253,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.3.1
+  source_code_uri: https://github.com/spree/spree/tree/v5.3.2
 rdoc_options: []
 require_paths:
 - lib

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

@@ -1,3 +0,0 @@
-<ul class="nav flex-col">
-  <%= render collection: items, partial: 'spree/admin/shared/navigation_item', as: :item, locals: { context: context } %>
-</ul>

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

@@ -1,60 +0,0 @@
-<%
-  # 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-4 border-t pt-4 pl-2">
-    <span class="text-gray-600 uppercase font-light text-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 %>hidden<% end %>" id="nav-submenu-<%= item.key %>">
-      <%= render collection: item.children.select { |child| child.visible?(self) }, partial: 'spree/admin/shared/navigation_item', as: :item, locals: { context: context } %>
-    </ul>
-
-    <%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
-    <ul class="nav-submenu-dropdown hidden dropdown-container" id="nav-submenu-dropdown-<%= item.key %>">
-      <%# Add parent item as first item in dropdown %>
-      <%= nav_item(item_label, item_url, icon: nil) %>
-
-      <%= render collection: item.children.select { |child| child.visible?(self) }, partial: 'spree/admin/shared/navigation_item', as: :item, locals: { context: context } %>
-    </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 %>