spree_admin 5.2.0.rc3 → 5.2.0

data/app/assets/stylesheets/spree/admin/views/_dashboard.scss

@@ -31,4 +31,18 @@
       display: flex;
     }
   }
+}
+
+#updater-notice {
+  background-color: $white;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  gap: 1rem;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 0.5rem 0.5rem;
+  border: 1px solid $border-color;
+  border-radius: $border-radius-lg;
+  box-shadow: $box-shadow-xs;
 }

data/app/controllers/spree/admin/integrations_controller.rb

@@ -16,7 +16,7 @@ module Spree
       private
 
       def allowed_integration_types
-        @allowed_integration_types ||= Rails.application.config.spree.integrations.map { |klass| [klass.to_s, klass] }.to_h
+        @allowed_integration_types ||= Spree.integrations.map { |klass| [klass.to_s, klass] }.to_h
       end
 
       def require_integration_type

data/app/controllers/spree/admin/metafields_controller.rb

@@ -28,7 +28,7 @@ module Spree
       end
 
       def allowed_model_classes
-        @allowed_model_classes ||= Rails.application.config.spree.metafield_enabled_resources
+        @allowed_model_classes ||= Spree.metafields.enabled_resources
       end
 
       def update_turbo_stream_enabled?

data/app/controllers/spree/admin/page_blocks_controller.rb

@@ -40,7 +40,7 @@ module Spree
 
       def allowed_types
         [
-          *Rails.application.config.spree.page_blocks,
+          *Spree.page_builder.page_blocks,
           *parent&.available_blocks_to_add
         ].uniq.sort_by(&:name)
       end

data/app/controllers/spree/admin/payment_methods_controller.rb

@@ -33,7 +33,7 @@ module Spree
       def allowed_payment_types
         # We need to map to strings, otherwise some weird things happen with STI
         # where Rails can't find the ancestor class when we try to save the payment method.
-        Rails.application.config.spree.payment_methods.map(&:to_s)
+        Spree.payment_methods.map(&:to_s)
       end
 
       def permitted_resource_params

data/app/controllers/spree/admin/promotion_actions_controller.rb

@@ -30,7 +30,7 @@ module Spree
       end
 
       def allowed_action_types
-        Rails.application.config.spree.promotions.actions
+        Spree.promotions.actions
       end
 
       def location_after_save

data/app/controllers/spree/admin/promotion_rules_controller.rb

@@ -28,7 +28,7 @@ module Spree
       end
 
       def allowed_rule_types
-        Rails.application.config.spree.promotions.rules
+        Spree.promotions.rules
       end
 
       def location_after_save

data/app/controllers/spree/admin/promotions_controller.rb

@@ -28,7 +28,7 @@ module Spree
       end
 
       def load_form_data
-        @promotion_rules = Rails.application.config.spree.promotions.rules
+        @promotion_rules = Spree.promotions.rules
         @rule_types = @promotion_rules.map do |promotion_rule|
           [Spree.t("promotion_rule_types.#{promotion_rule.to_s.demodulize.underscore}.name"), promotion_rule.to_s]
         end

data/app/controllers/spree/admin/reports_controller.rb

@@ -54,7 +54,7 @@ module Spree
       end
 
       def allowed_report_types
-        Rails.application.config.spree.reports.map(&:to_s)
+        Spree.reports.map(&:to_s)
       end
 
       def permitted_resource_params

data/app/controllers/spree/admin/taxons_controller.rb

@@ -97,7 +97,7 @@ module Spree
       end
 
       def load_form_data
-        @taxon_rules = Rails.application.config.spree.taxon_rules
+        @taxon_rules = Spree.taxon_rules
         @rule_types = @taxon_rules.map do |taxon_rule|
           [Spree.t("admin.taxon_rules.#{taxon_rule.to_s.demodulize.underscore}"), taxon_rule.to_s]
         end

data/app/controllers/spree/admin/translations_controller.rb

@@ -42,7 +42,7 @@ module Spree
 
       # Allowed translatable resources configured in Spree
       def allowed_model_classes
-        Rails.application.config.spree.translatable_resources
+        Spree.translatable_resources
       end
 
       # Determine the translation locale to use

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

@@ -4,7 +4,7 @@ module Spree
       include Spree::ImagesHelper
 
       def render_admin_partials(section, options = {})
-        Rails.application.config.spree_admin.send(section).map do |partial|
+        Spree.admin.partials.send(section.to_s.gsub('_partials', '').to_sym).map do |partial|
           render partial, options
         end.join.html_safe
       end

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

@@ -1,18 +1,18 @@
 module Spree
   module Admin
     module DrawerHelper
-      def drawer_header(title)
+      def drawer_header(title, controller_name = 'drawer')
         content_tag(:div, class: 'drawer-header') do
-          content_tag(:h5, title, class: 'drawer-title') + drawer_close_button
+          content_tag(:h5, title, class: 'drawer-title') + drawer_close_button(controller_name)
         end.html_safe
       end
 
-      def drawer_close_button
-        button_tag('', type: 'button', class: 'btn-close', data: { action: 'drawer#close', dismiss: 'drawer', aria_label: Spree.t(:close) }).html_safe
+      def drawer_close_button(controller_name = 'drawer')
+        button_tag('', type: 'button', class: 'btn-close', data: { action: "#{controller_name}#close", dismiss: controller_name, aria_label: Spree.t(:close) }).html_safe
       end
 
-      def drawer_discard_button
-        button_tag(type: 'button', class: 'btn btn-light', data: { action: 'drawer#close', dismiss: 'drawer' }) do
+      def drawer_discard_button(controller_name = 'drawer')
+        button_tag(type: 'button', class: 'btn btn-light', data: { action: "#{controller_name}#close", dismiss: controller_name }) do
           Spree.t('actions.discard')
         end.html_safe
       end

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

@@ -16,10 +16,18 @@ module Spree
           options[:placement] || 'bottom-start'
         end
 
-        options[:data] = {
+        # Extract portal option
+        portal = options.delete(:portal)
+
+        data_attrs = {
           controller: 'dropdown',
           dropdown_placement_value: placement
-        }.merge(options[:data] || {})
+        }
+
+        # Add portal value if explicitly set
+        data_attrs[:dropdown_portal_value] = portal unless portal.nil?
+
+        options[:data] = data_attrs.merge(options[:data] || {})
         content_tag(:div, options, &block)
       end
 

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

@@ -5,6 +5,8 @@ module Spree
       # @param title [String, Proc] the title of the modal
       # @return [String]
       def modal_header(title)
+        Spree::Deprecation.warn('Bootstrap modals are deprecated and will be removed in Spree 6. Please use native dialogs with `dialog_header` helper.')
+
         title = capture(&title) if block_given?
         content_tag(:div, class: 'modal-header') do
           content_tag(:h5, title, class: 'modal-title') + modal_close_button

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

@@ -7,15 +7,15 @@ module Spree
       # @param [String, nil] icon Optional icon name to prepend to the label
       # @param [Boolean, nil] active Whether the link should be marked as active
       # @return [SafeBuffer] The navigation item HTML
-      def nav_item(label = nil, url, icon: nil, active: nil, data: {})
+      def nav_item(label = nil, url, icon: nil, active: nil, data: {}, **options)
         content_tag :li, class: 'nav-item', role: 'presentation' do
           if block_given?
-            active_link_to url, class: 'nav-link', active: active, data: data do
+            active_link_to url, class: 'nav-link', active: active, data: data, **options do
               yield
             end
           else
             label = icon(icon) + label if icon.present? && label.present?
-            active_link_to label, url, class: 'nav-link', active: active, data: data
+            active_link_to label, url, class: 'nav-link', active: active, data: data, **options
           end
         end
       end
@@ -312,6 +312,49 @@ module Spree
           icon(@breadcrumb_icon)
         end
       end
+
+      # Renders the navigation for the given context
+      # @param context [Symbol] the navigation context (:sidebar, :settings, etc.)
+      # @param options [Hash] additional options for rendering
+      # @return [String] the rendered navigation HTML
+      def render_navigation(context = :sidebar, **options)
+        return '' if Spree::Admin::RuntimeConfig.legacy_sidebar_navigation
+
+        items = navigation_items(context)
+        return '' if items.empty?
+
+        render 'spree/admin/shared/navigation',
+               items: items,
+               context: context,
+               **options
+      end
+
+      # Get navigation items for the given context
+      # @param context [Symbol] the navigation context
+      # @return [Array<Spree::Admin::Navigation::Item>] the visible navigation items
+      def navigation_items(context = :sidebar)
+        # Pass the view context (self) so that can? and other helpers are available
+        Spree.admin.navigation.send(context)&.visible_items(self) || []
+      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
+      # @return [String] the rendered tab navigation HTML wrapped in content_for(:page_tabs)
+      def render_tab_navigation(context, **options)
+        items = navigation_items(context)
+        return '' if items.empty?
+
+        content_for :page_tabs do
+          items.map do |item|
+            item_url = item.resolve_url(self)
+            item_label = item.resolve_label
+            is_active = item.active?(request.path, self)
+
+            nav_item(item_label, item_url, active: is_active)
+          end.join.html_safe
+        end
+      end
     end
   end
 end

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

@@ -70,6 +70,7 @@ module Spree
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
         # see https://github.com/spree/spree/pull/3919
         @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_orders_per_page)
+        @collection = @orders
       end
 
       def load_user

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

@@ -3,7 +3,7 @@ module Spree
     module PromotionActionsHelper
       def options_for_promotion_action_types(promotion)
         existing = promotion.actions.pluck(:type)
-        Rails.application.config.spree.promotions.actions.map(&:name).reject { |r| existing.include? r }
+        Spree.promotions.actions.map(&:name).reject { |r| existing.include? r }
       end
     end
   end

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

@@ -3,7 +3,7 @@ module Spree
     module PromotionRulesHelper
       def options_for_promotion_rule_types(promotion)
         existing = promotion.rules.pluck(:type)
-        Rails.application.config.spree.promotions.rules.map(&:name).reject { |r| existing.include? r }
+        Spree.promotions.rules.map(&:name).reject { |r| existing.include? r }
       end
 
       def active_options_for_option_value_promotion_rule(promotion_rule)

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     module TranslationsHelper
       def link_to_edit_translations(resource, options = {})
-        return unless Rails.application.config.spree.translatable_resources.map(&:name).include?(resource.class.name)
+        return unless Spree.translatable_resources.map(&:name).include?(resource.class.name)
         return unless can?(:update, resource)
         return unless can?(:update, :translations)
 

data/app/javascript/spree/admin/application.js

@@ -15,7 +15,6 @@ import "mapkick/bundle"
 
 // Helpers
 import 'spree/admin/helpers/tinymce'
-import 'spree/admin/helpers/canvas'
 import 'spree/admin/helpers/trix/video_embed'
 import 'spree/admin/helpers/bootstrap'
 
@@ -76,6 +75,7 @@ import SearchPickerController from 'spree/admin/controllers/search_picker_contro
 import SectionFormController from 'spree/admin/controllers/section_form_controller'
 import SelectController from 'spree/admin/controllers/select_controller'
 import SeoFormController from 'spree/admin/controllers/seo_form_controller'
+import SidebarController from 'spree/admin/controllers/sidebar_controller'
 import SlugFormController from 'spree/admin/controllers/slug_form_controller'
 import StickyController from 'spree/admin/controllers/sticky_controller'
 import SortableAutoSubmit from 'spree/admin/controllers/sortable_auto_submit_controller'
@@ -141,6 +141,7 @@ application.register('search-picker', SearchPickerController)
 application.register('section-form', SectionFormController)
 application.register('select', SelectController)
 application.register('seo-form', SeoFormController)
+application.register('sidebar', SidebarController)
 application.register('slug-form', SlugFormController)
 application.register('sticky', StickyController)
 application.register('sortable', Sortable)

data/app/javascript/spree/admin/controllers/dropdown_controller.js

@@ -9,24 +9,44 @@ import {
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["menu", "toggle"]
   static values = {
     placement: { type: String, default: "bottom-start" },
     offset: { type: Number, default: 4 },
+    portal: { type: Boolean, default: true },
   }
 
   connect() {
+    // Find menu and toggle elements by CSS class instead of Stimulus target
+    // Try both .dropdown-menu and .dropdown-container for backward compatibility
+    this.menu = this.element.querySelector('.dropdown-menu') ||
+                this.element.querySelector('.dropdown-container')
+    this.toggleBtn = this.element.querySelector('.dropdown-toggle')
+
+    // Early return if no menu element exists
+    if (!this.menu) {
+      return
+    }
+
     this._cleanup = null
     this.boundUpdate = this.update.bind(this)
     this._isOpen = false
     this._toggleElement = null
+    this._originalParent = null
+    this._originalNextSibling = null
+    this._movedToBody = false
   }
 
   disconnect() {
+    if (!this.menu) return
     this.stopAutoUpdate()
+    this.restoreMenuPosition()
   }
 
   toggle(event) {
+    if (!this.menu) {
+      return
+    }
+
     event.preventDefault()
     event.stopPropagation()
 
@@ -41,9 +61,19 @@ export default class extends Controller {
   }
 
   open() {
-    if (this._isOpen) return
+    if (!this.menu || this._isOpen) {
+      return
+    }
 
-    this.menuTarget.classList.remove("hidden")
+    // Move menu to body on first open to prevent clipping by sidebar overflow
+    // Skip if portal is disabled or if inside bulk panel (to preserve Stimulus controller context)
+    if (!this._movedToBody && this.shouldPortalToBody()) {
+      this.moveMenuToBody()
+      this._movedToBody = true
+    }
+
+    this.menu.classList.remove("hidden")
+    this.menu.style.display = "block"
     this._isOpen = true
 
     // Start automatic positioning
@@ -59,9 +89,10 @@ export default class extends Controller {
   }
 
   close() {
-    if (!this._isOpen) return
+    if (!this.menu || !this._isOpen) return
 
-    this.menuTarget.classList.add("hidden")
+    this.menu.classList.add("hidden")
+    this.menu.style.display = ""
     this._isOpen = false
 
     // Stop automatic positioning
@@ -101,11 +132,11 @@ export default class extends Controller {
   }
 
   startAutoUpdate() {
-    if (!this._cleanup) {
-      const referenceElement = this.hasToggleTarget ? this.toggleTarget : (this._toggleElement || this.element)
+    if (!this._cleanup && this.menu) {
+      const referenceElement = this.toggleBtn || this._toggleElement || this.element
       this._cleanup = autoUpdate(
         referenceElement,
-        this.menuTarget,
+        this.menu,
         this.boundUpdate,
       )
     }
@@ -119,10 +150,12 @@ export default class extends Controller {
   }
 
   update() {
-    // Use the toggle target if available, or the stored toggle element, or fall back to the controller element
-    const referenceElement = this.hasToggleTarget ? this.toggleTarget : (this._toggleElement || this.element)
+    if (!this.menu) return
+
+    // Use the toggle button if available, or the stored toggle element, or fall back to the controller element
+    const referenceElement = this.toggleBtn || this._toggleElement || this.element
 
-    computePosition(referenceElement, this.menuTarget, {
+    computePosition(referenceElement, this.menu, {
       placement: this.placementValue,
       middleware: [
         offset(this.offsetValue),
@@ -133,9 +166,18 @@ export default class extends Controller {
         shift({ padding: 8 }),
         size({
           apply({ availableWidth, availableHeight, elements }) {
-            // Ensure dropdown doesn't exceed viewport
+            // Get the element's computed max-width
+            const computedStyle = window.getComputedStyle(elements.floating)
+            const originalMaxWidth = parseFloat(computedStyle.maxWidth)
+
+            // Use the smaller of availableWidth or original max-width
+            const maxWidth = originalMaxWidth && !isNaN(originalMaxWidth)
+              ? Math.min(availableWidth, originalMaxWidth)
+              : availableWidth
+
+            // Ensure dropdown doesn't exceed viewport or original constraints
             Object.assign(elements.floating.style, {
-              maxWidth: `${availableWidth}px`,
+              maxWidth: `${maxWidth}px`,
               maxHeight: `${availableHeight}px`,
               overflow: "auto",
             })
@@ -144,11 +186,40 @@ export default class extends Controller {
         }),
       ],
     }).then(({ x, y }) => {
-      Object.assign(this.menuTarget.style, {
+      Object.assign(this.menu.style, {
         left: `${x}px`,
         top: `${y}px`,
         position: "absolute",
       })
     })
   }
+
+  shouldPortalToBody() {
+    // Don't portal if explicitly disabled via data attribute
+    return this.portalValue
+  }
+
+  moveMenuToBody() {
+    if (this.menu && this.menu.parentNode !== document.body) {
+      // Save original position for restoration
+      this._originalParent = this.menu.parentNode
+      this._originalNextSibling = this.menu.nextSibling
+
+      // Move menu to body to prevent clipping by sidebar overflow
+      document.body.appendChild(this.menu)
+    }
+  }
+
+  restoreMenuPosition() {
+    if (this.menu && this._originalParent) {
+      // Restore menu to original position
+      if (this._originalNextSibling) {
+        this._originalParent.insertBefore(this.menu, this._originalNextSibling)
+      } else {
+        this._originalParent.appendChild(this.menu)
+      }
+      this._originalParent = null
+      this._originalNextSibling = null
+    }
+  }
 }