spree_admin 5.2.6 → 5.3.0.rc1

data/lib/spree/admin/runtime_configuration.rb

@@ -1,15 +1,16 @@
 require 'spree/core/preferences/runtime_configuration'
-require 'kaminari'
 
 module Spree
   module Admin
     class RuntimeConfiguration < ::Spree::Preferences::RuntimeConfiguration
+      DEFAULT_PER_PAGE = 25
+
       preference :admin_path, :string, default: '/admin'
       preference :admin_updater_enabled, :boolean, default: true
 
-      preference :admin_records_per_page, :integer, default: Kaminari.config.default_per_page
-      preference :admin_products_per_page, :integer, default: Kaminari.config.default_per_page
-      preference :admin_orders_per_page, :integer, default: Kaminari.config.default_per_page
+      preference :admin_records_per_page, :integer, default: DEFAULT_PER_PAGE
+      preference :admin_products_per_page, :integer, default: DEFAULT_PER_PAGE
+      preference :admin_orders_per_page, :integer, default: DEFAULT_PER_PAGE
 
       preference :include_application_importmap, :boolean, default: false
       preference :legacy_sidebar_navigation, :boolean, default: false

data/lib/spree/admin/tailwind_helper.rb

@@ -0,0 +1,33 @@
+module Spree
+  module Admin
+    module TailwindHelper
+      class << self
+        def input_path
+          Rails.root.join("app/assets/tailwind/spree_admin.css")
+        end
+
+        def output_path
+          Rails.root.join("app/assets/builds/spree/admin/application.css")
+        end
+
+        def resolved_input_path
+          Rails.root.join("tmp/tailwind/spree_admin_resolved.css")
+        end
+
+        def engine_css_path
+          Spree::Admin::Engine.root.join("app/assets/tailwind")
+        end
+
+        def resolved_input_css
+          File.read(input_path).gsub("$SPREE_ADMIN_PATH", Spree::Admin::Engine.root.to_s)
+        end
+
+        def write_resolved_css
+          FileUtils.mkdir_p(resolved_input_path.dirname)
+          File.write(resolved_input_path, resolved_input_css)
+          resolved_input_path
+        end
+      end
+    end
+  end
+end

data/lib/spree/admin/testing_support/capybara_utils.rb

@@ -54,6 +54,47 @@ module Spree
           # The old headless mode is better but still needs a brief render pause
           sleep 0.3
         end
+
+        # Handles the custom turbo confirm dialog
+        # Replaces accept_confirm for elements using data-turbo-confirm
+        #
+        # @example
+        #   accept_turbo_confirm { click_on 'Delete' }
+        #
+        # @param timeout [Integer] seconds to wait for the dialog
+        # @yield the block containing the action that triggers the confirm dialog
+        def accept_turbo_confirm(timeout: 5, &block)
+          yield
+
+          # Wait for the confirm dialog to open
+          dialog_selector = '#turbo-confirm-dialog'
+          has_css?("#{dialog_selector}[open]", visible: :all, wait: timeout)
+
+          # Click the confirm button
+          within(dialog_selector) do
+            click_button 'turbo-confirm-button'
+          end
+        end
+
+        # Dismisses the custom turbo confirm dialog by clicking cancel
+        #
+        # @example
+        #   dismiss_turbo_confirm { click_on 'Delete' }
+        #
+        # @param timeout [Integer] seconds to wait for the dialog
+        # @yield the block containing the action that triggers the confirm dialog
+        def dismiss_turbo_confirm(timeout: 5, &block)
+          yield
+
+          # Wait for the confirm dialog to open
+          dialog_selector = '#turbo-confirm-dialog'
+          has_css?("#{dialog_selector}[open]", visible: :all, wait: timeout)
+
+          # Click the cancel button
+          within(dialog_selector) do
+            click_button class: 'btn-light'
+          end
+        end
       end
     end
   end

data/lib/spree/admin.rb

@@ -1,5 +1,4 @@
-require 'spree_core'
-require 'spree_api'
+require 'spree'
 
 require 'active_link_to'
 require 'breadcrumbs_on_rails'
@@ -8,11 +7,10 @@ require 'groupdate'
 require 'hightop'
 require 'importmap-rails'
 require 'mapkick-rb'
-require 'bootstrap'
 require 'turbo-rails'
 require 'stimulus-rails'
 require 'local_time'
-require 'dartsass-rails'
+require 'tailwindcss-rails'
 require 'inline_svg'
 
 require 'spree/admin/action_callbacks'
@@ -21,6 +19,7 @@ require 'spree/admin/engine'
 require 'spree/core/partials'
 
 require 'tinymce-rails'
+require 'pagy'
 
 module Spree
   def self.admin
@@ -38,5 +37,9 @@ module Spree
     def navigation
       Rails.application.config.spree_admin.navigation
     end
+
+    def tables
+      Rails.application.config.spree_admin.tables
+    end
   end
 end

data/lib/tasks/tailwind.rake

@@ -0,0 +1,95 @@
+require 'spree/admin/tailwind_helper'
+
+namespace :spree do
+  namespace :admin do
+    namespace :tailwindcss do
+      desc "Build Spree Admin Tailwind CSS"
+      task build: :environment do
+        require "tailwindcss/ruby"
+
+        output_path = Spree::Admin::TailwindHelper.output_path
+        FileUtils.mkdir_p(output_path.dirname)
+
+        # Write resolved CSS to temp file
+        resolved_path = Spree::Admin::TailwindHelper.write_resolved_css
+
+        command = [Tailwindcss::Ruby.executable, "-i", resolved_path.to_s, "-o", output_path.to_s]
+        command << "--minify" unless Rails.env.development? || Rails.env.test?
+
+        puts "Building Spree Admin Tailwind CSS..."
+        puts "  Input: #{Spree::Admin::TailwindHelper.input_path}"
+        puts "  Resolved: #{resolved_path}"
+
+        system(*command)
+        raise("Spree Admin Tailwind build failed") unless $?.success?
+        puts "Done! Output: #{output_path}"
+      end
+
+      desc "Watch Spree Admin Tailwind CSS for changes"
+      task watch: :environment do
+        require "tailwindcss/ruby"
+
+        begin
+          require "listen"
+        rescue LoadError
+          puts "ERROR: The 'listen' gem is required for watch mode."
+          puts "Add it to your Gemfile in the development group:"
+          puts ""
+          puts "  group :development do"
+          puts "    gem 'listen', '>= 3.0'"
+          puts "  end"
+          puts ""
+          exit 1
+        end
+
+        output_path = Spree::Admin::TailwindHelper.output_path
+        FileUtils.mkdir_p(output_path.dirname)
+
+        # Initial write of resolved CSS
+        resolved_path = Spree::Admin::TailwindHelper.write_resolved_css
+        puts "Watching Spree Admin Tailwind CSS for changes..."
+        puts "  Host input: #{Spree::Admin::TailwindHelper.input_path}"
+        puts "  Engine CSS: #{Spree::Admin::TailwindHelper.engine_css_path}"
+        puts "  Resolved: #{resolved_path}"
+        puts "  Output: #{output_path}"
+
+        # Watch paths for CSS source changes
+        watch_paths = [
+          Spree::Admin::TailwindHelper.engine_css_path.to_s,  # Engine CSS files
+          Spree::Admin::TailwindHelper.input_path.dirname.to_s # Host app CSS files
+        ].select { |p| File.directory?(p) }
+
+        # Set up listener to regenerate resolved CSS when source files change
+        listener = Listen.to(*watch_paths, only: /\.css$/) do |modified, added, removed|
+          changed = (modified + added + removed).map { |f| File.basename(f) }.join(", ")
+          puts "\n[#{Time.now.strftime('%H:%M:%S')}] CSS changed: #{changed}"
+          puts "  Regenerating resolved CSS..."
+          Spree::Admin::TailwindHelper.write_resolved_css
+        end
+        listener.start
+
+        # Run Tailwind in watch mode (this blocks)
+        command = [
+          Tailwindcss::Ruby.executable,
+          "-i", resolved_path.to_s,
+          "-o", output_path.to_s,
+          "--watch"
+        ]
+
+        system(*command)
+      end
+    end
+  end
+end
+
+# Hook into assets:precompile
+if Rake::Task.task_defined?("assets:precompile")
+  Rake::Task["assets:precompile"].enhance(["spree:admin:tailwindcss:build"])
+end
+
+# Hook into test preparation tasks
+%w[test:prepare spec:prepare db:test:prepare].each do |task_name|
+  if Rake::Task.task_defined?(task_name)
+    Rake::Task[task_name].enhance(["spree:admin:tailwindcss:build"])
+  end
+end