spree_admin 5.2.0.rc2 → 5.2.0

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

@@ -15,7 +15,7 @@ module Spree
 
       private
 
-      def collection
+      def scope
         super.order_default
       end
 

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

@@ -15,16 +15,6 @@ module Spree
         spree.admin_stock_transfer_path(@object)
       end
 
-      def collection
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-
-        @search = super.accessible_by(current_ability, :index).ransack(params[:q])
-        @stock_transfers = @search.result.
-                           page(params[:page]).
-                           per(params[:per_page])
-      end
-
       def permitted_resource_params
         params.require(:stock_transfer).permit(permitted_stock_transfer_attributes)
       end

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

@@ -2,18 +2,10 @@ module Spree
   module Admin
     class StoreCreditError < StandardError; end
 
-    class StoreCreditsController < Spree::Admin::BaseController
-      before_action :load_user
-      before_action :load_store_credit, only: [:new, :edit, :update, :destroy]
+    class StoreCreditsController < Spree::Admin::ResourceController
+      before_action :set_breadcrumbs
+      before_action :set_user
       before_action :ensure_unused_store_credit, only: [:update]
-      helper_method :collection_url
-
-      def index
-        @store_credits = scope.includes(:created_by).order(created_at: :desc)
-        @store_credits = @store_credits.page(params[:page]).per(params[:per_page])
-
-        @collection = @store_credits
-      end
 
       def show
         @store_credit = scope.find(params[:id])
@@ -21,8 +13,8 @@ module Spree
       end
 
       def create
-        @store_credit = @user.store_credits.build(
-          permitted_store_credit_params.merge(
+        @store_credit = parent.store_credits.build(
+          permitted_resource_params.merge(
             created_by: try_spree_current_user,
             action_originator: try_spree_current_user,
             store: current_store
@@ -31,7 +23,7 @@ module Spree
 
         if @store_credit.save
           flash[:success] = flash_message_for(@store_credit, :successfully_created)
-          redirect_to spree.admin_user_path(@user)
+          redirect_to spree.admin_user_path(parent)
         else
           flash[:error] = Spree.t('store_credit.errors.unable_to_create')
           render :new, status: :unprocessable_entity
@@ -39,11 +31,11 @@ module Spree
       end
 
       def update
-        @store_credit.assign_attributes(permitted_store_credit_params)
+        @store_credit.assign_attributes(permitted_resource_params)
 
         if @store_credit.save
           flash[:success] = flash_message_for(@store_credit, :successfully_updated)
-          redirect_to spree.admin_user_store_credit_path(@user, @store_credit)
+          redirect_to spree.admin_user_store_credit_path(parent, @store_credit)
         else
           flash[:error] = Spree.t('store_credit.errors.unable_to_update')
           render :edit, status: :unprocessable_entity
@@ -59,37 +51,41 @@ module Spree
           flash[:error] = Spree.t('store_credit.errors.unable_to_delete')
         end
 
-        redirect_to spree.admin_user_path(@user)
+        redirect_to spree.admin_user_path(parent)
       end
 
       protected
 
-      def permitted_store_credit_params
-        params.require(:store_credit).permit(permitted_store_credit_attributes)
+      def parent
+        @parent ||= Spree.user_class.find_by(id: params[:user_id])
       end
 
-      private
+      def parent_data
+        {
+          model_name: 'spree/user',
+          model_class: Spree.user_class,
+          find_by: :id
+        }
+      end
 
-      def load_user
-        @user = Spree.user_class.find_by(id: params[:user_id])
+      def permitted_resource_params
+        params.require(:store_credit).permit(permitted_store_credit_attributes)
+      end
 
-        unless @user
-          flash[:error] = Spree.t(:user_not_found)
-          redirect_to spree.admin_path
-        end
+      private
 
-        @breadcrumb_icon = 'users'
-        add_breadcrumb Spree.t(:customers), :admin_users_path
-        add_breadcrumb @user.name, spree.admin_user_path(@user)
+      def set_user
+        @user = parent
       end
 
-      def load_store_credit
-        @store_credit = scope.find_by(id: params[:id]) || scope.new
-        @object = @store_credit
+      def object_url
+        spree.admin_user_store_credit_path(parent, @store_credit)
       end
 
-      def scope
-        current_store.store_credits.where(user: @user)
+      def set_breadcrumbs
+        @breadcrumb_icon = 'users'
+        add_breadcrumb Spree.t(:customers), :admin_users_path
+        add_breadcrumb parent.name, spree.admin_user_path(parent)
       end
 
       def ensure_unused_store_credit
@@ -99,7 +95,11 @@ module Spree
       end
 
       def collection_url
-        spree.admin_user_store_credits_path(@user)
+        spree.admin_user_store_credits_path(parent)
+      end
+
+      def update_turbo_stream_enabled?
+        true
       end
     end
   end

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

@@ -8,16 +8,6 @@ module Spree
 
       private
 
-      def collection
-        return @collection if @collection.present?
-
-        @collection = super
-
-        params[:q] ||= {}
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result.all
-      end
-
       def location_after_save
         spree.admin_taxonomy_path(@taxonomy)
       end

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/themes_controller.rb

@@ -70,8 +70,12 @@ module Spree
         true
       end
 
-      def collection
-        super.without_previews.order(default: :desc).includes(screenshot_attachment: :blob)
+      def scope
+        super.without_previews.order(default: :desc)
+      end
+
+      def collection_includes
+        { screenshot_attachment: :blob }
       end
 
       def permitted_resource_params

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/controllers/spree/admin/users_controller.rb

@@ -50,23 +50,13 @@ module Spree
 
       protected
 
-      def collection
-        return @collection if @collection.present?
-
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-        params[:q][:created_at_not_null] ||= 1
-
-        @collection = model_class.accessible_by(current_ability, :index)
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result(distinct: true).
-                      includes(
-                        addresses: [:country, :state],
-                        ship_address: [:country, :state],
-                        bill_address: [:country, :state],
-                        avatar_attachment: :blob
-                      ).
-                      page(params[:page]).per(params[:per_page])
+      def collection_includes
+        {
+          addresses: [:country, :state],
+          ship_address: [:country, :state],
+          bill_address: [:country, :state],
+          avatar_attachment: :blob
+        }
       end
 
       def find_resource

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

@@ -19,16 +19,6 @@ module Spree
         @resource ||= Spree::Admin::Resource.new 'spree/admin/webhooks/subscribers', 'subscribers', nil
       end
 
-      def collection
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-
-        @search = Webhooks::Subscriber.accessible_by(current_ability).ransack(params[:q])
-        @collection = @search.result.
-                      page(params[:page]).
-                      per(params[:per_page])
-      end
-
       def process_subscriptions
         return if params[:webhooks_subscriber].blank?
 

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

@@ -14,13 +14,6 @@ module Spree
         edit_object_url(@object, states_country_id: @selected_country&.id)
       end
 
-      def collection
-        params[:q] ||= {}
-        params[:q][:s] ||= 'name asc'
-        @search = super.ransack(params[:q])
-        @zones = @search.result.page(params[:page]).per(params[:per_page])
-      end
-
       def load_data
         @selected_country = if params[:states_country_id]
           Spree::Country.find_by(id: params[:states_country_id])

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

@@ -3,7 +3,31 @@ module Spree
     module DropdownHelper
       def dropdown(options = {}, &block)
         options[:class] = ['dropdown'] + Array(options[:class])
-        options[:data] = { controller: 'dropdown' }.merge(options[:data] || {})
+
+        # Extract direction option for backward compatibility and convert to Floating UI placement
+        placement = case options.delete(:direction)
+        when 'left'
+          'bottom-end'
+        when 'top'
+          'top-start'
+        when 'top-left'
+          'top-end'
+        else
+          options[:placement] || 'bottom-start'
+        end
+
+        # Extract portal option
+        portal = options.delete(:portal)
+
+        data_attrs = {
+          controller: 'dropdown',
+          dropdown_placement_value: placement
+        }
+
+        # 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
 
@@ -19,22 +43,8 @@ module Spree
 
       def dropdown_menu(options = {}, &block)
         options[:class] = ['dropdown-container hidden'] + Array(options[:class])
-
-        # Extract direction option for backward compatibility and convert to Floating UI placement
-        placement = case options.delete(:direction)
-        when 'left'
-          'bottom-end'
-        when 'top'
-          'top-start'
-        when 'top-left'
-          'top-end'
-        else
-          options[:placement] || 'bottom-start'
-        end
-
         options[:data] = {
-          dropdown_target: 'menu',
-          dropdown_placement_value: placement
+          dropdown_target: 'menu'
         }.merge(options[:data] || {})
 
         content_tag(:div, options, &block)

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
@@ -248,7 +248,7 @@ module Spree
         end
 
         link_to url, class: 'd-flex align-items-center text-decoration-none' do
-          content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover-gray px-2 d-flex align-items-center') +
+          content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover-gray shadow-none px-2 d-flex align-items-center shadow-none') +
             content_tag(:span, label, class: 'font-size-base text-black')
         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

@@ -2,6 +2,8 @@ module Spree
   module Admin
     module OrdersFiltersHelper
       def params_to_filters(search_params:, vendor: nil, user: nil)
+        return if search_params.blank?
+
         if search_params.is_a?(String)
           search_params = JSON.parse(search_params).deep_symbolize_keys
         end
@@ -68,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)