spree_admin 5.2.0.rc1 → 5.2.0.rc3

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

@@ -9,7 +9,7 @@
           <%= f.radio_button :multi_codes, false, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
           <%= f.label :multi_codes_false, class: 'custom-control-label' do %>
             One code for all customers
-            <span class="form-text font-weight-normal mr-1">
+            <span class="form-text font-weight-normal mr-1 mt-2">
               You can limit the number of times this code can be used.
             </span>
           <% end %>
@@ -22,7 +22,7 @@
           <%= f.radio_button :multi_codes, true, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
           <%= f.label :multi_codes_true, class: 'custom-control-label' do %>
             Generate unique codes
-            <span class="form-text font-weight-normal mr-1">
+            <span class="form-text font-weight-normal mr-1 mt-2">
               These codes are generated automatically and can be downloaded as a CSV file. Codes are unique and can only be used once.
             </span>
           <% end %>
@@ -30,7 +30,7 @@
         <div data-reveal-target="item" class="ml-3 mt-2 row <% unless @promotion.multi_codes? %>hidden<% end %>">
           <div class="col-6">
             <%= f.text_field :code_prefix, class: 'form-control text-uppercase', placeholder: 'Coupon Prefix (optional)' %>
-            <span class="form-text">
+            <span class="form-text mt-2">
               eg. <strong>ABC</strong>
             </span>
           </div>
@@ -38,7 +38,7 @@
             <% minimum_number_of_codes = @promotion.persisted? && @promotion.coupon_codes.count.positive? ? @promotion.coupon_codes.count : 1 %>
             <% maximum_number_of_codes = ENV.fetch('PROMOTION_MAX_NUMBER_OF_CODES', 5000) %>
             <%= f.number_field :number_of_codes, class: 'form-control', placeholder: 'Number of codes', min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %>
-            <span class="form-text">
+            <span class="form-text mt-2">
               How many codes you want to generate.
               <% if @promotion.persisted? %>
                 To add more codes just increase this number

data/app/views/spree/admin/refund_reasons/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:status) %></th>
   <th scope="col"><%= Spree.t(:mutable) %></th>
   <th scope="col"></th>

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

@@ -7,6 +7,7 @@
                 Spree::ReimbursementType::KINDS.map do |kind|
                   [kind.demodulize.titleize, kind]
                 end,
+                f.object.type
               ),
               { include_blank: false, label: Spree.t(:type), autocomplete: true } %>
 

data/app/views/spree/admin/reimbursement_types/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:type) %></th>
   <th scope="col"><%= Spree.t(:status) %></th>
   <th scope="col"><%= Spree.t(:mutable) %></th>

data/app/views/spree/admin/return_authorization_reasons/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:status) %></th>
   <th scope="col"></th>
 </tr>

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

@@ -13,7 +13,7 @@
       <table class="table">
         <thead>
           <tr>
-            <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+            <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
             <th scope="col"><%= Spree.t(:permissions) %></th>
             <th scope="col"></th>
           </tr>

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

@@ -7,7 +7,7 @@
 
 <% dropdown_direction ||= 'left' %>
 
-<%= dropdown 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' 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 direction: dropdown_direction, class: "pt-2 px-2 pb-1" do %>
+  <%= dropdown_menu class: "pt-2 px-2 pb-1" do %>
     <div data-calendar-range-target="picker" class="d-none"></div>
   <% end %>
 

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

@@ -27,7 +27,10 @@
             <%= icon 'dots-vertical', class: 'mr-0' %>
           <% end %>
           <%= dropdown_menu id: 'page_actions_dropdown_menu' do %>
-            <%= yield :page_actions_dropdown if content_for(:page_actions_dropdown) %>
+            <% if content_for?(:page_actions_dropdown) %>
+              <%= yield :page_actions_dropdown %>
+              <div class="dropdown-divider"></div>
+            <% end %>
             <% if record && record.persisted? %>
               <%= link_to_edit_metafields(record) %>
               <%= link_to_edit_translations(record) %>

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

@@ -1,13 +1,14 @@
 <% sortable = local_assigns[:sortable] %>
+<% frame_name = local_assigns[:frame_name] || controller_name %>
 
-<%= turbo_frame_tag controller_name, autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>
+<%= turbo_frame_tag frame_name, autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>
   <%= render 'spree/admin/shared/export_modal', export_type: export_type if local_assigns[:export_type] %>
   <div class="card-lg">
     <% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %>
       <%= render 'filters' %>
     <% end %>
 
-    <% if paginated_collection.any? %>
+    <% if @collection.any? %>
       <div class="<% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %>with-filters<% end %>" id="listing_<%= controller_name %>">
         <table class="table">
           <thead>
@@ -21,12 +22,12 @@
               data-sortable-response-kind-value="turbo-stream"
             <% end %>
           >
-            <%= render partial: 'table_row', collection: paginated_collection, as: controller_name.singularize %>
+            <%= render partial: 'table_row', collection: @collection, as: controller_name.singularize %>
           </tbody>
         </table>
       </div>
 
-      <%= render 'spree/admin/shared/index_table_options', collection: paginated_collection %>
+      <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
     <% else %>
       <%= render 'spree/admin/shared/no_resource_found', new_object_url: (new_object_url if can?(:create, model_class)) %>
     <% end %>

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

@@ -12,7 +12,7 @@
       <div class="d-none d-lg-block text-center text-muted">
         <%= page_entries_info(collection, entry_name: entry_name) %>
       </div>
-      <div class="text-right pr-lg-2">
+      <div class="text-right">
         <%= paginate collection, theme: 'admin-twitter-bootstrap-4' %>
       </div>
     </div>

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

@@ -2,7 +2,7 @@
   <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
     <%= icon 'plus', class: 'mr-0' %>
   <% end %>
-  <%= dropdown_menu direction: 'left' do %>
+  <%= dropdown_menu do %>
     <%= link_to_with_icon 'shopping-bag-plus', Spree.t(:new_order), spree.new_admin_order_path, class: "dropdown-item" if can?(:manage, Spree::Order)  %>
 
     <%= link_to spree.new_admin_product_path, class: 'dropdown-item' do %>

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

@@ -1,6 +1,6 @@
 <% if try_spree_current_user.present? %>
   <%= dropdown id: dom_id(try_spree_current_user, 'account-dropdown') do %>
-    <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0' do %>
+    <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0 shadow-none' do %>
       <%= render_avatar(try_spree_current_user, width: 32, height: 32) %>
     <% end %>
     <%= dropdown_menu class: 'dropdown-menu-right', style: 'min-width: 250px;' do %>
@@ -29,8 +29,9 @@
         <h6 class="dropdown-header mt-2">
           <%= Spree.t(:support) %>
         </h6>
-        <%= external_link_to Spree.t(:help_center), 'https://spreecommerce.org/docs/user', class: 'dropdown-item justify-content-between', target: '_blank' %>
-        <%= external_link_to Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item justify-content-between', target: '_blank' %>
+        <%= link_to_with_icon 'book',  Spree.t('admin.documentation'), 'https://spreecommerce.org/docs', class: 'dropdown-item', target: '_blank' %>
+        <%= link_to_with_icon 'brand-slack', Spree.t('admin.slack'), 'https://slack.spreecommerce.org/', class: 'dropdown-item', target: '_blank' %>
+        <%= link_to_with_icon 'message', Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item', target: '_blank' %>
       <% end %>
 
       <div class="dropdown-divider"></div>

data/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb

@@ -4,7 +4,7 @@
       <%= store_admin_icon(current_store, height: 32, width: 32) %>
       <%= truncate(current_store.name, length: 10) %>
     <% end %>
-    <%= dropdown_menu class: 'ml-2', direction: 'left' do %>
+    <%= dropdown_menu class: 'ml-2' do %>
       <%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %>
         <%= icon 'eye' %>
         <%= Spree.t(:view_store) %>

data/app/views/spree/admin/shipping_categories/_table_header.html.erb

@@ -1,4 +1,4 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"></th>
 </tr>

data/app/views/spree/admin/shipping_methods/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:zone) %></th>
   <th scope="col"><%= Spree.t(:estimated_delivery_time) %></th>
   <th scope="col"><%= Spree.t(:amount) %></th>

data/app/views/spree/admin/stock_locations/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%= sort_link search_collection, :country, Spree.t(:country) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :country, Spree.t(:country) %></th>
   <th scope="col"><%= Spree.t(:active) %>?</th>
   <% if can?(:mark_as_default, Spree::StockLocation) %>
     <th scope="col"><%= Spree.t(:default) %>?</th>

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

@@ -15,7 +15,7 @@
       <table class="table">
         <thead>
           <tr>
-            <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+            <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
             <th scope="col"></th>
           </tr>
         </thead>

data/app/views/spree/admin/store_credits/_list.html.erb

@@ -1,4 +1,4 @@
-<% if @store_credits.any? %>
+<% if @collection.any? %>
   <div class="table-responsive">
     <table class="table">
       <thead>
@@ -11,11 +11,11 @@
         <th scope="col"><%= Spree.t(:issued_on) %></th>
       </thead>
       <tbody>
-        <%= render partial: 'spree/admin/store_credits/store_credit', collection: @store_credits, as: :store_credit, cached: spree_base_cache_scope %>
+        <%= render partial: 'spree/admin/store_credits/store_credit', collection: @collection, as: :store_credit, cached: spree_base_cache_scope %>
       </tbody>
     </table>
   </div>
-  <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @store_credits } %>
+  <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
 <% else %>
   <%= render 'spree/admin/shared/no_resource_found', model_class: Spree::StoreCredit, new_object_url: spree.new_admin_user_store_credit_path(@user) %>
 <% end %>

data/app/views/spree/admin/stores/form/_checkout.html.erb

@@ -9,10 +9,10 @@
 
   <div class="card-body">
     <%= f.spree_select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { label: Spree.t(:shipping_zone), autocomplete: true } %>
-    <small class="form-text mb-3">
+    <span class="form-text mb-3">
       <%= Spree.t(:shipping_zone_help) %>
       <%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %>
-    </small>
+    </span>
 
     <%= f.spree_select :default_country_iso, Spree::Country.pluck(:name, :iso), { include_blank: false, label: Spree.t(:default_country), autocomplete: true, help: Spree.t(:default_country_help) } %>
 

data/app/views/spree/admin/stores/form/_checkout_links.html.erb

@@ -11,7 +11,7 @@
         >
           <%= turbo_frame_tag spree_dom_id(link), class: 'd-flex align-items-center w-100 py-2 pl-3 pr-2' do %>
             <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'd-block text-dark flex-fill' %>
-            <button class="btn btn-sm pr-0 handle hover-gray h-100 px-1">
+            <button class="btn btn-sm pr-0 handle shadow-none hover-gray-200 px-1">
               <%= icon 'grip-vertical', class: 'mr-0' %>
             </button>
           <% end %>

data/app/views/spree/admin/stores/form/_policies.html.erb

@@ -14,7 +14,7 @@
     <p class="text-muted">
       Customers will need to accept these terms of service during signup.
     </p>
-    <%= f.spree_rich_text_area :customer_terms_of_service, style: 'height: 300px', label: Spree.t(:terms_of_service) %>
+    <%= f.spree_rich_text_area :customer_terms_of_service, label: Spree.t(:terms_of_service) %>
   </div>
 </div>
 
@@ -26,7 +26,7 @@
     <p class="text-muted">
       Customers will need to accept these privacy policy during signup.
     </p>
-    <%= f.spree_rich_text_area :customer_privacy_policy, style: 'height: 300px', label: Spree.t(:privacy_policy) %>
+    <%= f.spree_rich_text_area :customer_privacy_policy, label: Spree.t(:privacy_policy) %>
   </div>
 </div>
 
@@ -38,7 +38,7 @@
     <p class="text-muted">
       Please provide your customers with a clear and transparent returns policy.
     </p>
-    <%= f.spree_rich_text_area :customer_returns_policy, style: 'height: 300px', label: Spree.t(:returns_policy) %>
+    <%= f.spree_rich_text_area :customer_returns_policy, label: Spree.t(:returns_policy) %>
   </div>
 </div>
 
@@ -50,7 +50,7 @@
     <p class="text-muted">
       Please provide your customers with a clear and transparent shipping policy.
     </p>
-    <%= f.spree_rich_text_area :customer_shipping_policy, style: 'height: 300px', label: Spree.t(:shipping_policy) %>
+    <%= f.spree_rich_text_area :customer_shipping_policy, label: Spree.t(:shipping_policy) %>
   </div>
 </div>
 
@@ -63,7 +63,7 @@
       <p class="text-muted">
         Vendors you invite will need to accept these terms of service during their onboarding process.
       </p>
-      <%= f.spree_rich_text_area :partners_terms_of_service, style: 'height: 300px', label: Spree.t(:terms_of_service) %>
+      <%= f.spree_rich_text_area :partners_terms_of_service, label: Spree.t(:terms_of_service) %>
     </div>
   </div>
 <% end %>

data/app/views/spree/admin/tax_categories/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%= sort_link search_collection, :tax_code, Spree.t(:tax_code) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :tax_code, Spree.t(:tax_code) %></th>
   <th scope="col"><%= Spree.t(:description) %></th>
   <th scope="col"><%= Spree.t(:default) %></th>
   <th scope="col"></th>

data/app/views/spree/admin/tax_rates/_table_header.html.erb

@@ -1,8 +1,8 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:tax_category) %></th>
   <th scope="col"><%= Spree.t(:zone) %></th>
-  <th scope="col"><%= sort_link search_collection, :amount, Spree.t(:amount) %></th>
+  <th scope="col"><%= sort_link @search, :amount, Spree.t(:amount) %></th>
   <th scope="col"><%= Spree.t(:included_in_price) %></th>
   <th scope="col"><%= Spree.t(:show_rate_in_label) %></th>
   <th scope="col"></th>

data/app/views/spree/admin/taxonomies/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr data-hook="listing_taxonomies_header">
   <th class="no-border handel-head"></th>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:taxons) %></th>
   <th scope="col"></th>
 </tr>

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

@@ -2,6 +2,12 @@
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
 
+    <%= 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) %>
+
     <%= render 'spree/admin/shared/filters_button' %>
   </div>
   <div data-dropdown-target="menu" id="table-filter" class="hidden">
@@ -16,7 +22,7 @@
     <div class="form-group">
       <%= f.label :addresses_country_name_eq, Spree.t(:location) %>
       <%= tom_select_tag "q[addresses_country_name_eq]",
-      active_option: params[:q][:addresses_country_name_eq],
+      active_option: params.dig(:q, :addresses_country_name_eq),
       options: Spree::Country.all.to_tom_select_json,
       value_field: :name,
       select_class: "w-100",
@@ -27,7 +33,7 @@
     <div class="form-group">
       <%= f.label :tags_name_in, Spree.t(:tags) %>
       <%= tom_select_tag "q[tags_name_in]",
-      active_option: params[:q][:tags_name_in],
+      active_option: params.dig(:q, :tags_name_in),
       options: user_tags_json_array,
       multiple: true,
       value_field: :name,
@@ -39,7 +45,7 @@
     <div class="form-group">
       <%= f.label :accepts_email_marketing_eq, Spree.t(:accepts_email_marketing) %>
       <%= f.select :accepts_email_marketing_eq,
-                options_for_select([["Yes", true], ["No", false]], params[:q][:accepts_email_marketing_eq]),
+                options_for_select([["Yes", true], ["No", false]], params.dig(:q, :accepts_email_marketing_eq)),
                 { include_blank: true },
                 { class: "custom-select", data: { filters_target: :input } } %>
     </div>

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

@@ -63,7 +63,7 @@
           </div>
         <% end %>
       </div>
-      <%= render "spree/admin/shared/index_table_options", collection: @collection if @collection.any? %>
+      <%= render "spree/admin/shared/index_table_options", collection: @collection %>
     <% else %>
       <%= render "spree/admin/shared/no_resource_found" %>
     <% end %>

data/config/importmap.rb

@@ -27,7 +27,6 @@ pin 'hotkeys-js', preload: ['application-spree-admin'] # @3.13.9
 pin 'stimulus-use', preload: ['application-spree-admin'] # @0.51.3
 pin 'stimulus-checkbox-select-all', preload: ['application-spree-admin'] # @5.3.0
 pin 'stimulus-clipboard', preload: ['application-spree-admin'] # @4.0.1
-pin "@stimulus-components/dropdown", to: "@stimulus-components--dropdown.js", preload: ['application-spree-admin'] # @3.0.0
 pin "@stimulus-components/dialog", to: "@stimulus-components--dialog.js", preload: ['application-spree-admin'] # @1.0.1
 
 # We can't vendor some of the javascript libraries

data/config/locales/en.yml

@@ -67,6 +67,7 @@ en:
         back_end: Only on admin panel
         both: On both admin panel & storefront
         front_end: Only on storefront
+      documentation: Documentation
       edit_billing_address: Edit billing address
       edit_contact_information: Edit contact information
       edit_profile: Edit Profile
@@ -228,6 +229,7 @@ en:
       shipment_transfer:
         wrong_destination: Wrong destination
       show_json: Show JSON
+      slack: Slack
       stock_transfers:
         add_products_tip: You need to select a destination location first
       store_credit:

data/lib/generators/spree/admin/devise/devise_generator.rb

@@ -0,0 +1,33 @@
+require 'rails/generators'
+
+module Spree
+  module Admin
+    module Generators
+      class DeviseGenerator < Rails::Generators::Base
+        desc 'Installs Spree Admin Devise controllers'
+
+        def install
+          # add devise routes
+          insert_into_file 'config/routes.rb', after: "Rails.application.routes.draw do\n" do
+            <<-ROUTES.strip_heredoc.indent!(2)
+              Spree::Core::Engine.add_routes do
+                # Admin authentication
+                devise_for(
+                  Spree.admin_user_class.model_name.singular_route_key,
+                  class_name: Spree.admin_user_class.to_s,
+                  controllers: {
+                    sessions: 'spree/admin/user_sessions',
+                    passwords: 'spree/admin/user_passwords'
+                  },
+                  skip: :registrations,
+                  path: :admin_user,
+                  router_name: :spree
+                )
+              end
+            ROUTES
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt

@@ -1,4 +1,4 @@
-<%%= search_form_for [:admin, search_collection], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %>
+<%%= 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_i_cont, label: Spree.t(:name) %>
     <%%= render 'spree/admin/shared/filters_button' %>

data/lib/generators/spree/admin/scaffold/templates/views/_table_header.html.erb.tt

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%%= sort_link search_collection, :created_at, Spree.t(:created_at) %></th>
+  <th scope="col"><%%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
   <th scope="col"></th>
 </tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc1
+  version: 5.2.0.rc3
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-04 00:00:00.000000000 Z
+date: 2025-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -448,6 +448,7 @@ files:
 - app/javascript/spree/admin/controllers/codemirror_controller.js
 - app/javascript/spree/admin/controllers/color_palette_controller.js
 - app/javascript/spree/admin/controllers/color_picker_controller.js
+- app/javascript/spree/admin/controllers/dropdown_controller.js
 - app/javascript/spree/admin/controllers/filters_controller.js
 - app/javascript/spree/admin/controllers/font_picker_controller.js
 - app/javascript/spree/admin/controllers/highlight_controller.js
@@ -1192,6 +1193,7 @@ files:
 - config/initializers/ransack.rb
 - config/locales/en.yml
 - config/routes.rb
+- lib/generators/spree/admin/devise/devise_generator.rb
 - lib/generators/spree/admin/install/install_generator.rb
 - lib/generators/spree/admin/install/templates/dev
 - lib/generators/spree/admin/scaffold/scaffold_generator.rb
@@ -1240,7 +1242,6 @@ files:
 - vendor/javascript/@rails--actiontext@7.2.201.js
 - vendor/javascript/@simonwep--pickr.js
 - vendor/javascript/@stimulus-components--dialog.js
-- vendor/javascript/@stimulus-components--dropdown.js
 - vendor/javascript/@stimulus-components--rails-nested-form.js
 - vendor/javascript/bootstrap--dist--js--bootstrap.bundle.min.js.js
 - vendor/javascript/codemirror.js
@@ -1266,9 +1267,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.2.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0.rc3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc3
 post_install_message:
 rdoc_options: []
 require_paths:

data/vendor/javascript/@stimulus-components--dropdown.js

@@ -1,4 +0,0 @@
-// @stimulus-components/dropdown@3.0.0 downloaded from https://ga.jspm.io/npm:@stimulus-components/dropdown@3.0.0/dist/stimulus-dropdown.mjs
-
-import{Controller as t}from"@hotwired/stimulus";import{useTransition as e}from"stimulus-use";const s=class _Dropdown extends t{connect(){e(this,{element:this.menuTarget})}toggle(){this.toggleTransition()}hide(t){!this.element.contains(t.target)&&!this.menuTarget.classList.contains("hidden")&&this.leave()}};s.targets=["menu"];let i=s;export{i as default};
-