spree_admin 5.2.0.rc3 → 5.2.0

data/app/models/spree/admin/navigation/builder.rb

@@ -0,0 +1,82 @@
+module Spree
+  module Admin
+    class Navigation
+      class Builder
+        attr_reader :registry, :parent_item
+
+        def initialize(registry, parent_item = nil)
+          @registry = registry
+          @parent_item = parent_item
+        end
+
+        # Add a navigation item
+        # If parent_item is set, the item becomes a child
+        def add(key, **options, &block)
+          # If we have a parent item, set it in the options
+          if parent_item
+            options[:parent] = parent_item.key
+            # Adjust position to be relative to parent
+            options[:position] ||= parent_item.children.size * 10
+          end
+
+          item = registry.add(key, **options, &block)
+          item
+        end
+
+        # Add a section (group of items)
+        def section(key, label: nil, &block)
+          section_item = add(key, section_label: label || key.to_s.humanize)
+
+          if block_given?
+            builder = self.class.new(registry, section_item)
+            # Support both block styles: |nav| nav.add or just add
+            if block.arity > 0
+              # Block expects parameter: do |nav| nav.add ... end
+              block.call(builder)
+            else
+              # Block uses implicit self: do add ... end
+              builder.instance_eval(&block)
+            end
+          end
+
+          section_item
+        end
+
+        # Remove an item
+        def remove(key)
+          registry.remove(key)
+        end
+
+        # Update an item
+        def update(key, **options)
+          registry.update(key, **options)
+        end
+
+        # Insert before another item
+        def insert_before(target_key, new_key, **options)
+          registry.insert_before(target_key, new_key, **options)
+        end
+
+        # Insert after another item
+        def insert_after(target_key, new_key, **options)
+          registry.insert_after(target_key, new_key, **options)
+        end
+
+        # Move an item
+        def move(key, **position_options)
+          registry.move(key, **position_options)
+        end
+
+        # Replace an item
+        def replace(key, **options, &block)
+          registry.replace(key, **options, &block)
+        end
+
+        # Reorder items with a block
+        def reorder(&block)
+          instance_eval(&block) if block_given?
+        end
+      end
+    end
+  end
+end

data/app/models/spree/admin/navigation/item.rb

@@ -0,0 +1,177 @@
+module Spree
+  module Admin
+    class Navigation
+      class Item
+        attr_accessor :key, :label, :url, :icon, :position, :parent_key,
+                      :condition, :badge, :badge_class, :tooltip, :target, :data_attributes, :children, :section_label, :active_condition
+
+        def initialize(key, **options)
+          @key = key.to_sym
+          @label = options[:label]
+          @url = options[:url]
+          @icon = options[:icon]
+          @position = options[:position] || 999
+          @parent_key = options[:parent]
+          @active_condition = options[:active]
+          @condition = options.key?(:if) ? options[:if] : options[:condition]
+          @badge = options[:badge]
+          @badge_class = options[:badge_class]
+          @tooltip = options[:tooltip]
+          @target = options[:target]
+          @data_attributes = options[:data_attributes] || {}
+          @section_label = options[:section_label]
+          @children = []
+        end
+
+        # Check if this item should be visible for the given user/context
+        # @param user_or_context [Object] Either a user object or a view context
+        def visible?(user_or_context = nil)
+          return true if condition.nil?
+
+          if condition.respond_to?(:call)
+            # If we have a view context with instance_exec, use it to evaluate the condition
+            # This allows access to can? and other helper methods
+            if user_or_context.respond_to?(:instance_exec)
+              user_or_context.instance_exec(&condition)
+            else
+              # Otherwise, call with the user object
+              condition.call(user_or_context)
+            end
+          else
+            condition
+          end
+        end
+
+        # Check if this item is active based on current path
+        # @param current_path [String] The current request path
+        # @param context [Object] View context with access to route helpers
+        def active?(current_path, context = nil)
+          # Use custom active condition if provided (most flexible)
+          if active_condition.respond_to?(:call)
+            if context&.respond_to?(:instance_exec)
+              return context.instance_exec(&active_condition)
+            else
+              return active_condition.call
+            end
+          end
+
+          # Match exact path
+          item_url = resolve_url(context)
+          return true if item_url && current_path == item_url
+
+          # Check if any child item is active
+          return true if children.any? { |child| child.active?(current_path, context) }
+
+          # Default: match if path starts with url (handled by active_link_to)
+          if item_url
+            current_path.start_with?(item_url)
+          else
+            false
+          end
+        end
+
+        # Resolve URL (handles symbols, procs, and strings)
+        # @param context [Object] View context with access to route helpers
+        def resolve_url(context = nil)
+          case url
+          when Symbol
+            # Try to call the route helper on the context (which has spree routes)
+            if context&.respond_to?(url)
+              context.send(url)
+            elsif context&.respond_to?(:spree)
+              context.spree.send(url) rescue url.to_s
+            else
+              url.to_s
+            end
+          when Proc
+            # Evaluate proc in the context where route helpers are available
+            if context&.respond_to?(:instance_exec)
+              context.instance_exec(&url)
+            else
+              url.call
+            end
+          else
+            url
+          end
+        end
+
+        # Resolve label (handles i18n keys)
+        def resolve_label
+          return label unless label.is_a?(String) || label.is_a?(Symbol)
+
+          # Use Spree.t for translation which handles the spree namespace
+          Spree.t(label, default: label.to_s.humanize)
+        end
+
+        # Compute badge value
+        # @param view_context [Object] View context with access to helper methods
+        def badge_value(view_context = nil)
+          return nil unless badge
+
+          if badge.respond_to?(:call)
+            # Evaluate badge in view context if available (for access to helpers)
+            if view_context&.respond_to?(:instance_exec)
+              view_context.instance_exec(&badge)
+            else
+              badge.call
+            end
+          else
+            badge
+          end
+        end
+
+        # Check if this is a section header
+        def section?
+          section_label.present?
+        end
+
+        # Add a child item
+        def add_child(item)
+          children << item
+          item.parent_key = key
+          sort_children!
+        end
+
+        # Remove a child item
+        def remove_child(key)
+          children.reject! { |child| child.key == key }
+        end
+
+        # Sort children by position
+        def sort_children!
+          children.sort_by! { |child| [child.position, child.key.to_s] }
+        end
+
+        # Deep clone for modifications
+        def deep_clone
+          cloned = self.class.new(key, to_h)
+          cloned.children = children.map(&:deep_clone)
+          cloned
+        end
+
+        # Convert to hash
+        def to_h
+          {
+            label: label,
+            url: url,
+            icon: icon,
+            position: position,
+            parent: parent_key,
+            active: active_condition,
+            condition: condition,
+            badge: badge,
+            badge_class: badge_class,
+            tooltip: tooltip,
+            target: target,
+            data_attributes: data_attributes,
+            section_label: section_label
+          }
+        end
+
+        def inspect
+          "#<Spree::Admin::Navigation::Item key=#{key} label=#{label} children=#{children.size}>"
+        end
+      end
+    end
+  end
+end

data/app/models/spree/admin/navigation.rb

@@ -0,0 +1,193 @@
+module Spree
+  module Admin
+    class Navigation
+      attr_reader :items, :context
+
+      def initialize(context)
+        @context = context
+        @items = {}
+      end
+
+      # Add a navigation item
+      def add(key, **options, &block)
+        key = key.to_sym
+        item = Item.new(key, **options)
+
+        @items[key] = item
+
+        # If block provided, it's for children
+        if block_given?
+          builder = Builder.new(self, item)
+          # Support both block styles: |nav| nav.add or just add
+          if block.arity > 0
+            # Block expects parameter: do |nav| nav.add ... end
+            block.call(builder)
+          else
+            # Block uses implicit self: do add ... end
+            builder.instance_eval(&block)
+          end
+        end
+
+        sort_items!
+        item
+      end
+
+      # Remove a navigation item
+      def remove(key)
+        key = key.to_sym
+        removed = @items.delete(key)
+
+        # Also remove from any parent's children
+        @items.each_value do |item|
+          item.remove_child(key)
+        end
+
+        removed
+      end
+
+      # Update an existing navigation item
+      def update(key, **options)
+        key = key.to_sym
+        item = @items[key]
+
+        return nil unless item
+
+        options.each do |attr, value|
+          item.send("#{attr}=", value) if item.respond_to?("#{attr}=")
+        end
+
+        sort_items!
+        item
+      end
+
+      # Find a navigation item
+      def find(key)
+        @items[key.to_sym]
+      end
+
+      # Check if item exists
+      def exists?(key)
+        @items.key?(key.to_sym)
+      end
+
+      # Insert item before another item
+      def insert_before(target_key, new_key, **options)
+        target = find(target_key)
+        return nil unless target
+
+        new_position = target.position - 1
+        add(new_key, **options.merge(position: new_position))
+      end
+
+      # Insert item after another item
+      def insert_after(target_key, new_key, **options)
+        target = find(target_key)
+        return nil unless target
+
+        new_position = target.position + 1
+        add(new_key, **options.merge(position: new_position))
+      end
+
+      # Move item to a new position
+      def move(key, position: nil, before: nil, after: nil)
+        item = find(key)
+        return nil unless item
+
+        if before
+          target = find(before)
+          item.position = target.position - 1 if target
+        elsif after
+          target = find(after)
+          item.position = target.position + 1 if target
+        elsif position == :first
+          item.position = -999
+        elsif position == :last
+          item.position = 999
+        elsif position.is_a?(Integer)
+          item.position = position
+        end
+
+        sort_items!
+        item
+      end
+
+      # Replace an item
+      def replace(key, **options, &block)
+        remove(key)
+        add(key, **options, &block)
+      end
+
+      # Get all root items (items without a parent)
+      def root_items
+        @items.values.select { |item| item.parent_key.nil? }.sort_by { |item| [item.position, item.key.to_s] }
+      end
+
+      # Get all items that are visible to the user
+      def visible_items(user = nil, parent_key = nil)
+        items_to_filter = if parent_key
+                            find(parent_key)&.children || []
+                          else
+                            root_items
+                          end
+
+        items_to_filter.select { |item| item.visible?(user) }
+      end
+
+      # Build tree structure
+      def build_tree
+        # First, clear all children
+        @items.each_value { |item| item.children.clear }
+
+        # Then rebuild the tree
+        @items.each_value do |item|
+          if item.parent_key && (parent = @items[item.parent_key])
+            parent.add_child(item)
+          end
+        end
+
+        root_items
+      end
+
+      # Clear all items
+      def clear
+        @items.clear
+      end
+
+      # Get all registered paths (for settings_area? detection)
+      def registered_paths(context = nil)
+        @items.values.map { |item| item.resolve_url(context) }.compact
+      end
+
+      # Add a section
+      def section(key, label: nil, &block)
+        # Create a section header item
+        section_item = add(key, section_label: label || key.to_s.humanize, position: @items.size * 100)
+
+        if block_given?
+          builder = Builder.new(self, section_item)
+          builder.instance_eval(&block)
+        end
+
+        section_item
+      end
+
+      # Deep clone the registry
+      def deep_clone
+        cloned = self.class.new(context)
+        @items.each do |key, item|
+          cloned.items[key] = item.deep_clone
+        end
+        cloned.build_tree
+        cloned
+      end
+
+      private
+
+      def sort_items!
+        # Sort items by position, then rebuild tree
+        @items = @items.sort_by { |_key, item| [item.position, item.key.to_s] }.to_h
+        build_tree
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@
   </head>
 
   <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>"
-    data-controller="admin"
+    data-controller="admin sidebar"
     data-action="keydown.ctrl+s->admin#save keydown.meta+s->admin#save"
   >
     <%= render_admin_partials(:body_start_partials) %>

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

@@ -2,7 +2,7 @@
   <%= dialog_header(Spree.t(:edit) + ' ' + Spree.t(:image)) %>
   <%= form_with model: @asset, url: spree.admin_asset_path(@asset), method: :put, scope: :asset do |f| %>
     <div class="dialog-body pb-0" data-turbo-permanent id="asset-<%= @asset.key.parameterize %>">
-      <%= render 'active_storage/upload_form', form: f, field_name: :attachment, width: 200, height: 200, can_delete: false %>
+      <%= f.spree_file_field :attachment, width: 200, height: 200, can_delete: false, label: Spree.t(:image) %>
     </div>
     <div class="dialog-body" style="min-height: 200px">
       <%= f.spree_text_area :alt, label: Spree.t(:alt_text), rows: 4 %>

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

@@ -1,19 +1,7 @@
 <div class="card mb-3">
   <div class="card-body">
-    <div class="form-group">
-      <%= f.label :url, Spree.t(:domain) %>
-      <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border">
-        <span class="text-muted">https://</span>
-        <%= f.text_field :url, class: 'form-control-plaintext pr-0 pl-1', autofocus: f.object.new_record?, required: true %>
-      </div>
-      <%= f.error_message_on :url %>
-    </div>
+    <%= f.spree_text_field :url, label: Spree.t(:domain), prepend: 'https://', autofocus: f.object.new_record?, required: true %>
 
-    <div class="custom-control custom-checkbox">
-      <%= f.check_box :default, class: 'custom-control-input' %>
-      <%= f.label :default, class: 'custom-control-label font-weight-semibold' %>
-      <p class="form-text mb-0">We will use this domain in emails to customers.</p>
-      <%= f.error_message_on :default %>
-    </div>
+    <%= f.spree_check_box :default, help: 'We will use this domain in emails to customers.' %>
   </div>
 </div>

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

@@ -5,18 +5,23 @@
   url: filter_form_url,
   class: "filter-wrap",
   data: {
-    controller: "filters dropdown",
-    filters_url_value: request.url,
-    dropdown_placement_value: "bottom-end"
+    controller: "filters dialog",
+    filters_url_value: request.url
   } do |f| %>
-  <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+    <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 
-  <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
-    <%= render "table_filter_dropdown" %>
-    <%= render "spree/admin/shared/filters_button" %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
+      <%= render "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>
+
+  <dialog class="drawer" data-dialog-target="dialog" id="gift-card-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <% if params[:user_id].blank? %>
       <div class="form-group">
         <%= f.label :users_email_eq, Spree.t(:email) %>
@@ -30,16 +35,19 @@
     </div>
 
     <%= render_admin_partials(:gift_cards_filters_partials, f: f) %>
-
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
     </div>
-  </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <div class="form-actions">
+        <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+          <%= icon("search") %>
+          <%= Spree.t(:filter_results) %>
+        <% end %>
+      </div>
+    </div>
+  </dialog>
 
-   <%= render "spree/admin/shared/filter_badge_template" %>
+  <%= render "spree/admin/shared/filter_badge_template" %>
 
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
 <% end %>

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

@@ -12,7 +12,7 @@
         <%= icon 'plus' %>
         <%= Spree.t(:new_gift_card) %>
       <% end %>
-      <%= dropdown_menu class: 'dropdown-menu-right' do %>
+      <%= dropdown_menu do %>
         <%= link_to spree.new_admin_gift_card_path,
               class: 'text-left dropdown-item'  do %>
           <%= icon 'add' %>

data/app/views/spree/admin/orders/_customer.html.erb

@@ -4,11 +4,11 @@
       <%= Spree.t(:customer) %>
     </h5>
     <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
-      <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto' do %>
+      <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto', portal: false do %>
         <%= dropdown_toggle class: 'btn-light btn-sm px-1', data: { test_id: 'dropdown-toggle' } do %>
           <%= icon 'dots-vertical', class: 'mr-0' %>
         <% end %>
-        <%= dropdown_menu class: 'dropdown-menu-right' do %>
+        <%= dropdown_menu do %>
           <% if can?(:update_customer, @order) && !@order.user.present? %>
             <%= link_to Spree.t('admin.edit_contact_information'), spree.edit_admin_order_contact_information_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
           <% end %>

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

@@ -14,33 +14,38 @@
   url: search_form_path,
   class: "filter-wrap",
   data: {
-    controller: "filters dropdown",
-    filters_url_value: request.url,
-    dropdown_placement_value: "bottom-end"
+    controller: "filters dialog",
+    filters_url_value: request.url
   } do |f| %>
-  <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+    <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 
-  <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
 
-    <% if controller_name == 'checkouts' %>
-      <%= render "spree/admin/shared/calendar_range_picker",
-      date_from_input_name: "q[created_at_gt]",
-      date_to_input_name: "q[created_at_lt]",
-      date_from_value: params.dig(:q, :created_at_gt),
-      date_to_value: params.dig(:q, :created_at_lt) %>
-    <% else %>
-      <%= render "spree/admin/shared/calendar_range_picker",
-      date_from_input_name: "q[completed_at_gt]",
-      date_to_input_name: "q[completed_at_lt]",
-      date_from_value: params.dig(:q, :completed_at_gt),
-      date_to_value: params.dig(:q, :completed_at_lt) %>
-    <% end %>
+      <% if controller_name == 'checkouts' %>
+        <%= render "spree/admin/shared/calendar_range_picker",
+        date_from_input_name: "q[created_at_gt]",
+        date_to_input_name: "q[created_at_lt]",
+        date_from_value: params.dig(:q, :created_at_gt),
+        date_to_value: params.dig(:q, :created_at_lt) %>
+      <% else %>
+        <%= render "spree/admin/shared/calendar_range_picker",
+        date_from_input_name: "q[completed_at_gt]",
+        date_to_input_name: "q[completed_at_lt]",
+        date_from_value: params.dig(:q, :completed_at_gt),
+        date_to_value: params.dig(:q, :completed_at_lt) %>
+      <% end %>
+
+      <%= render "spree/admin/orders/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 "spree/admin/orders/table_filter_dropdown" %>
-    <%= render 'spree/admin/shared/filters_button' %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+  <dialog class="drawer" data-dialog-target="dialog" id="order-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %>
     <%= f.hidden_field :state_not_eq, value: params.dig(:q, :state_not_eq) %>
     <%= f.hidden_field :user_id_eq, value: @user.try(:id) %>
@@ -99,8 +104,12 @@
     </div>
 
     <%= render_admin_partials(:orders_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" %>
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>

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

@@ -6,7 +6,7 @@
       </span>
       <%= order_filter_dropdown_value %>
     <% end %>
-    <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %>
+    <%= dropdown_menu do %>
       <%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %>
       <%= link_to params.to_unsafe_h.deep_merge({q: {shipment_state_not_in: [:shipped, :canceled], shipment_state_eq: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),
                   class: "dropdown-item d-flex align-items-center justify-content-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>

data/app/views/spree/admin/page_blocks/forms/_image.html.erb

@@ -1,8 +1,5 @@
-<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 512, height: 512, auto_submit: true %>
-<div class="mt-2 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_file_field :asset, width: 512, height: 512, auto_submit: true %>
+<%= f.spree_text_field :preferred_image_alt, label: Spree.t(:alt_text), data: { action: 'auto-submit#submit' } %>
 <% content_for(:design_tab) do %>
   <%= render 'spree/admin/page_builder/labeled_range_input',
     f: f, field: :preferred_height, min: 1, max: 1024, unit: 'px', _label: 'Max image height on desktop'