spree_admin 5.2.0.rc1 → 5.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22556fbb3d151c7c2b05dab509022275e6c59f8de4adb4896bcdf5bc48f8f0d
-  data.tar.gz: f4dd860a86b552d8fbdd6d5e6492d94d46a9ce125a6fc4a9fa0748cebf5a657e
+  metadata.gz: 57e59ddd5613ed6add9a0bc7b66e9effa39e85f763750a3b4e2bede3e8f203da
+  data.tar.gz: bf9a3fc04741c70271817e9c81e1709e3a8de2a80f34771a3ce701391c5911d7
 SHA512:
-  metadata.gz: 649ede281c65678902ee006fbe831f456aaac7de23d72657009125c9281fd0231f586de5d951c67114c40095bc47d7a96b25f25c4e529b10300b7f0aac8f8dac
-  data.tar.gz: 70808fb3caba9f95df1108d70e14625e8d9f3f6bd3e8a2495cdf4034720fd4d18f34428ab8931c225e3157b788f2e1c7189592b732f9e9fac372565304aa07d7
+  metadata.gz: f513a0d0377068700800f84a23bb46eb61447252dddf16a78bda9deba79a9574c0499b562138c6c9cab7c72c98c733c81a4f1512c695aeb55f023fe2b2e58211
+  data.tar.gz: 21d4d0fcaf4029d2c5686dc73627aad315e5167b4c7d30a065bddd9f641f6bfd1dc74c780f8ec8695bb2ba0c748f30c10d997c948e934a0176b1703432bfb5c1

data/app/assets/stylesheets/spree/admin/components/_dropdowns.scss

@@ -108,20 +108,18 @@
 }
 // new non-bootstrap dropdowns
 .dropdown-container {
+  // Position is handled by Floating UI via inline styles
+  // Keep position: absolute but let Floating UI set top/left/right/bottom
   position: absolute;
-  top: 100%;
-  right: 0;
   animation: fadeIn 0.15s ease-in-out;
-  transform-origin: top right;
 
+  // Legacy classes kept for backward compatibility but no longer apply positioning
+  // Floating UI handles all positioning automatically
   &.dropdown-container-left {
-    left: 0;
-    right: auto;
+    // No longer needed - Floating UI handles placement
   }
   &.dropdown-container-top {
-    top: auto;
-    bottom: 100%;
-    height: auto;
+    // No longer needed - Floating UI handles placement
   }
 }
 

data/app/assets/stylesheets/spree/admin/components/_filters.scss

@@ -31,6 +31,8 @@
   animation: fadeIn 0.2s ease-in-out;
   width: 100%;
   z-index: $zindex-dropdown;
+  max-height: calc(100vh - #{$header-height} - 4rem);
+  overflow-y: auto;
 
   @include media-breakpoint-up(md) {
     width: 50%;

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

@@ -14,6 +14,7 @@ module Spree
       helper 'spree/integrations'
 
       before_action :authorize_admin
+      after_action :set_return_to, only: [:index]
 
       protected
 

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

@@ -4,7 +4,6 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class, :search_collection, :paginated_collection
   before_action :load_resource
   before_action :set_currency, :set_current_store, only: [:new, :create]
-  after_action :set_return_to, only: [:index]
 
   rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
 

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

@@ -10,21 +10,33 @@ module Spree
       def dropdown_toggle(options = {}, &block)
         options[:type] = 'button'
         options[:class] = ['btn'] + Array(options[:class])
-        options[:data] = { action: 'dropdown#toggle click@window->dropdown#hide' }.merge(options[:data] || {})
+        options[:data] = {
+          action: 'dropdown#toggle click@window->dropdown#hide',
+          dropdown_target: 'toggle'
+        }.merge(options[:data] || {})
         button_tag(options, &block)
       end
 
       def dropdown_menu(options = {}, &block)
         options[:class] = ['dropdown-container hidden'] + Array(options[:class])
 
-        if options[:direction] == 'left'
-          options[:class] << 'dropdown-container-left'
-        elsif options[:direction] == 'top'
-          options[:class] << 'dropdown-container-top'
-        elsif options[:direction] == 'top-left'
-          options[:class] << 'dropdown-container-top dropdown-container-left'
+        # 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' }.merge(options[:data] || {})
+
+        options[:data] = {
+          dropdown_target: 'menu',
+          dropdown_placement_value: placement
+        }.merge(options[:data] || {})
+
         content_tag(:div, options, &block)
       end
     end

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

@@ -35,7 +35,6 @@ if (typeof Stimulus === 'undefined') {
 import AutoSubmit from '@stimulus-components/auto-submit'
 import CheckboxSelectAll from 'stimulus-checkbox-select-all'
 import Dialog from "@stimulus-components/dialog"
-import Dropdown from '@stimulus-components/dropdown'
 import TextareaAutogrow from 'stimulus-textarea-autogrow'
 import Notification from 'stimulus-notification'
 import PasswordVisibility from 'stimulus-password-visibility'
@@ -56,6 +55,7 @@ import Clipboard from 'spree/admin/controllers/clipboard_controller'
 import CodeMirrorController from 'spree/admin/controllers/codemirror_controller'
 import ColorPaletteController from 'spree/admin/controllers/color_palette_controller'
 import ColorPickerController from 'spree/admin/controllers/color_picker_controller'
+import DropdownController from 'spree/admin/controllers/dropdown_controller'
 import FiltersController from 'spree/admin/controllers/filters_controller'
 import FontPickerController from 'spree/admin/controllers/font_picker_controller'
 import HighlightController from 'spree/admin/controllers/highlight_controller'
@@ -114,7 +114,7 @@ application.register('color-picker', ColorPickerController)
 application.register('dialog', Dialog)
 application.register('drawer', Dialog)
 application.register('disable-submit-button', DisableSubmitButtonController)
-application.register('dropdown', Dropdown)
+application.register('dropdown', DropdownController)
 application.register('enable-button', EnableButtonController)
 application.register('export-dialog', Dialog)
 application.register('filters', FiltersController)

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

@@ -0,0 +1,154 @@
+import {
+  autoUpdate,
+  computePosition,
+  flip,
+  offset,
+  shift,
+  size,
+} from "@floating-ui/dom"
+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 },
+  }
+
+  connect() {
+    this._cleanup = null
+    this.boundUpdate = this.update.bind(this)
+    this._isOpen = false
+    this._toggleElement = null
+  }
+
+  disconnect() {
+    this.stopAutoUpdate()
+  }
+
+  toggle(event) {
+    event.preventDefault()
+    event.stopPropagation()
+
+    // Store the toggle element that triggered this action
+    this._toggleElement = event.currentTarget
+
+    if (this._isOpen) {
+      this.close()
+    } else {
+      this.open()
+    }
+  }
+
+  open() {
+    if (this._isOpen) return
+
+    this.menuTarget.classList.remove("hidden")
+    this._isOpen = true
+
+    // Start automatic positioning
+    this.startAutoUpdate()
+
+    // Add event listener to close on outside click
+    this._outsideClickHandler = this.handleOutsideClick.bind(this)
+    document.addEventListener("click", this._outsideClickHandler)
+
+    // Add event listener to close on escape key
+    this._escapeHandler = this.handleEscape.bind(this)
+    document.addEventListener("keydown", this._escapeHandler)
+  }
+
+  close() {
+    if (!this._isOpen) return
+
+    this.menuTarget.classList.add("hidden")
+    this._isOpen = false
+
+    // Stop automatic positioning
+    this.stopAutoUpdate()
+
+    // Remove event listeners
+    if (this._outsideClickHandler) {
+      document.removeEventListener("click", this._outsideClickHandler)
+      this._outsideClickHandler = null
+    }
+
+    if (this._escapeHandler) {
+      document.removeEventListener("keydown", this._escapeHandler)
+      this._escapeHandler = null
+    }
+  }
+
+  hide(event) {
+    // This method is called from the action: click@window->dropdown#hide
+    // Only close if clicking outside the dropdown element
+    if (!this.element.contains(event.target)) {
+      this.close()
+    }
+  }
+
+  handleOutsideClick(event) {
+    // Close dropdown if clicking outside
+    if (!this.element.contains(event.target)) {
+      this.close()
+    }
+  }
+
+  handleEscape(event) {
+    if (event.key === "Escape") {
+      this.close()
+    }
+  }
+
+  startAutoUpdate() {
+    if (!this._cleanup) {
+      const referenceElement = this.hasToggleTarget ? this.toggleTarget : (this._toggleElement || this.element)
+      this._cleanup = autoUpdate(
+        referenceElement,
+        this.menuTarget,
+        this.boundUpdate,
+      )
+    }
+  }
+
+  stopAutoUpdate() {
+    if (this._cleanup) {
+      this._cleanup()
+      this._cleanup = null
+    }
+  }
+
+  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)
+
+    computePosition(referenceElement, this.menuTarget, {
+      placement: this.placementValue,
+      middleware: [
+        offset(this.offsetValue),
+        flip({
+          fallbackAxisSideDirection: "start",
+          padding: 8,
+        }),
+        shift({ padding: 8 }),
+        size({
+          apply({ availableWidth, availableHeight, elements }) {
+            // Ensure dropdown doesn't exceed viewport
+            Object.assign(elements.floating.style, {
+              maxWidth: `${availableWidth}px`,
+              maxHeight: `${availableHeight}px`,
+              overflow: "auto",
+            })
+          },
+          padding: 8,
+        }),
+      ],
+    }).then(({ x, y }) => {
+      Object.assign(this.menuTarget.style, {
+        left: `${x}px`,
+        top: `${y}px`,
+        position: "absolute",
+      })
+    })
+  }
+}

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

@@ -37,8 +37,8 @@ module Spree
 
           JSON.parse(response.body)
         end
-      rescue Net::OpenTimeout, Net::ReadTimeout, SocketError, Errno::ECONNREFUSED, JSON::ParserError => e
-        Rails.logger.error("Failed to fetch Spree updates: #{e.message}")
+      rescue StandardError => e
+        Rails.error.report(e)
         {}
       end
     end

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

@@ -13,12 +13,10 @@
 
         <%= f.spree_rich_text_area :content,
               help_bubble: 'Add a summary of the post',
-              style: 'height: 300px',
               data: { seo_form_target: 'sourceDescriptionInput' } %>
 
         <%= f.spree_rich_text_area :excerpt,
               help_bubble: 'Add a summary of the post',
-              style: 'height: 100px',
               data: { seo_form_target: 'sourceExcerptInput' } %>
       </div>
     </div>

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/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/users/_filters.html.erb

@@ -2,6 +2,13 @@
   <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),
+          dropdown_direction: "right" %>
+
     <%= render 'spree/admin/shared/filters_button' %>
   </div>
   <div data-dropdown-target="menu" id="table-filter" class="hidden">

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/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

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.rc2
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-04 00:00:00.000000000 Z
+date: 2025-11-09 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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
 - !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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.rc1
+        version: 5.2.0.rc2
 - !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.rc2
   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.rc2
 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};
-