spree_admin 5.2.6 → 5.3.0.rc1

data/app/assets/tailwind/spree/admin/utilities/_bootstrap.css

@@ -0,0 +1,158 @@
+/* ==========================================================================
+   BOOTSTRAP COMPATIBILITY UTILITIES
+   Aliases for Bootstrap utility classes mapped to Tailwind equivalents.
+   These ensure backwards compatibility for existing templates.
+   ========================================================================== */
+
+@layer utilities {
+  /* ==========================================================================
+     DISPLAY
+     ========================================================================== */
+  .d-none { @apply hidden; }
+  .d-inline { @apply inline; }
+  .d-inline-block { @apply inline-block; }
+  .d-block { @apply block; }
+  .d-flex { @apply flex; }
+  .d-inline-flex { @apply inline-flex; }
+  .d-grid { @apply grid; }
+
+  /* Responsive display */
+  @media (width >= 768px) {
+    .d-md-none { @apply hidden; }
+    .d-md-inline { @apply inline; }
+    .d-md-inline-block { @apply inline-block; }
+    .d-md-block { @apply block; }
+    .d-md-flex { @apply flex; }
+    .d-md-inline-flex { @apply inline-flex; }
+    .d-md-grid { @apply grid; }
+  }
+
+  @media (width >= 992px) {
+    .d-lg-none { @apply hidden; }
+    .d-lg-inline { @apply inline; }
+    .d-lg-inline-block { @apply inline-block; }
+    .d-lg-block { @apply block; }
+    .d-lg-flex { @apply flex; }
+    .d-lg-inline-flex { @apply inline-flex; }
+    .d-lg-grid { @apply grid; }
+  }
+
+  @media (width >= 1200px) {
+    .d-xl-none { @apply hidden; }
+    .d-xl-inline { @apply inline; }
+    .d-xl-inline-block { @apply inline-block; }
+    .d-xl-block { @apply block; }
+    .d-xl-flex { @apply flex; }
+    .d-xl-inline-flex { @apply inline-flex; }
+    .d-xl-grid { @apply grid; }
+  }
+
+  /* ==========================================================================
+     FLEXBOX
+     ========================================================================== */
+  .flex-row { @apply flex-row; }
+  .flex-column { @apply flex-col; }
+  .flex-row-reverse { @apply flex-row-reverse; }
+  .flex-column-reverse { @apply flex-col-reverse; }
+  .flex-wrap { @apply flex-wrap; }
+  .flex-nowrap { @apply flex-nowrap; }
+  .flex-wrap-reverse { @apply flex-wrap-reverse; }
+  .flex-fill { @apply flex-1; }
+  .flex-grow-0 { @apply grow-0; }
+  .flex-grow-1 { @apply grow; }
+  .flex-shrink-0 { @apply shrink-0; }
+  .flex-shrink-1 { @apply shrink; }
+
+  /* Justify content */
+  .justify-content-start { @apply justify-start; }
+  .justify-content-end { @apply justify-end; }
+  .justify-content-center { @apply justify-center; }
+  .justify-content-between { @apply justify-between; }
+  .justify-content-around { @apply justify-around; }
+  .justify-content-evenly { @apply justify-evenly; }
+
+  /* Align items */
+  .align-items-start { @apply items-start; }
+  .align-items-end { @apply items-end; }
+  .align-items-center { @apply items-center; }
+  .align-items-baseline { @apply items-baseline; }
+  .align-items-stretch { @apply items-stretch; }
+
+  /* Align self */
+  .align-self-auto { @apply self-auto; }
+  .align-self-start { @apply self-start; }
+  .align-self-end { @apply self-end; }
+  .align-self-center { @apply self-center; }
+  .align-self-baseline { @apply self-baseline; }
+  .align-self-stretch { @apply self-stretch; }
+
+  /* Align content */
+  .align-content-start { @apply content-start; }
+  .align-content-end { @apply content-end; }
+  .align-content-center { @apply content-center; }
+  .align-content-between { @apply content-between; }
+  .align-content-around { @apply content-around; }
+  .align-content-stretch { @apply content-stretch; }
+
+  /* Responsive flexbox */
+  @media (width >= 768px) {
+    .flex-md-row { @apply flex-row; }
+    .flex-md-column { @apply flex-col; }
+    .flex-md-wrap { @apply flex-wrap; }
+    .flex-md-nowrap { @apply flex-nowrap; }
+    .justify-content-md-start { @apply justify-start; }
+    .justify-content-md-end { @apply justify-end; }
+    .justify-content-md-center { @apply justify-center; }
+    .justify-content-md-between { @apply justify-between; }
+    .align-items-md-start { @apply items-start; }
+    .align-items-md-end { @apply items-end; }
+    .align-items-md-center { @apply items-center; }
+  }
+
+  @media (width >= 992px) {
+    .flex-lg-row { @apply flex-row; }
+    .flex-lg-column { @apply flex-col; }
+    .flex-lg-wrap { @apply flex-wrap; }
+    .flex-lg-nowrap { @apply flex-nowrap; }
+    .justify-content-lg-start { @apply justify-start; }
+    .justify-content-lg-end { @apply justify-end; }
+    .justify-content-lg-center { @apply justify-center; }
+    .justify-content-lg-between { @apply justify-between; }
+    .align-items-lg-start { @apply items-start; }
+    .align-items-lg-end { @apply items-end; }
+    .align-items-lg-center { @apply items-center; }
+  }
+
+  /* ==========================================================================
+     WIDTH & HEIGHT
+     ========================================================================== */
+  .w-25 { @apply w-1/4; }
+  .w-50 { @apply w-1/2; }
+  .w-75 { @apply w-3/4; }
+  .w-100 { @apply w-full; }
+  .w-auto { @apply w-auto; }
+
+  /* Custom percentage widths (not in Tailwind's default scale) */
+  .w-5 { width: 5%; }
+  .w-10 { width: 10%; }
+  .w-15 { width: 15%; }
+  .w-20 { width: 20%; }
+  .w-30 { width: 30%; }
+  .w-35 { width: 35%; }
+  .w-40 { width: 40%; }
+  .w-60 { width: 60%; }
+  .w-70 { width: 70%; }
+  .w-80 { width: 80%; }
+  .w-90 { width: 90%; }
+
+  /* ==========================================================================
+     MISC
+     ========================================================================== */
+  .list-unstyled { @apply list-none p-0; }
+  .list-inline { @apply list-none p-0 flex flex-wrap; }
+  .list-inline-item { @apply inline-block; }
+
+  .move-handle {
+    @apply cursor-grab;
+  }
+}

data/app/assets/tailwind/spree/admin/views/_dashboard.css

@@ -0,0 +1,30 @@
+/* ==========================================================================
+   DASHBOARD
+   ========================================================================== */
+
+@layer components {
+  .analytics-card-tab {
+    @apply rounded-md cursor-pointer p-2 h-full transition-colors duration-200 ease-in-out;
+  }
+
+  .analytics-card-tab.active,
+  .analytics-card-tab:hover {
+    @apply bg-gray-25;
+  }
+
+  .store-preview-link {
+    @apply transition-colors duration-200 ease-in-out;
+  }
+
+  .store-preview-link .store-preview-actions {
+    @apply hidden;
+  }
+
+  .store-preview-link:hover .store-preview-actions {
+    @apply flex;
+  }
+
+  #updater-notice {
+    @apply bg-white w-full flex flex-row gap-4 justify-start items-center p-2 border border-gray-200 rounded-lg shadow-xs;
+  }
+}

data/app/assets/tailwind/spree/admin/views/_page-builder.css

@@ -0,0 +1,214 @@
+/* ==========================================================================
+   PAGE BUILDER
+   ========================================================================== */
+
+@layer components {
+  #page-builder {
+    --pb-sidebar-width: 345px;
+    --pb-header-height: 50px;
+
+    @apply bg-gray-100 h-screen overflow-hidden;
+  }
+
+  #page-builder #content {
+    @apply ml-0 pt-0;
+  }
+
+  #page-builder #main-part {
+    @apply pb-0 px-8;
+  }
+
+  #page-builder #main-part .embed-responsive {
+    @apply min-h-screen;
+  }
+
+  #page-builder .nav-pills {
+    @apply bg-gray-100 rounded-xl p-1;
+  }
+
+  #page-builder .nav-pills .nav-link {
+    @apply bg-transparent py-1 px-2 rounded-lg;
+  }
+
+  #page-builder .nav-pills .nav-link.active {
+    @apply bg-white;
+  }
+
+  #page-builder-sidebar,
+  #page-builder-header {
+    @apply bg-white;
+  }
+
+  #page-builder-header {
+    @apply border-b border-gray-200;
+    z-index: 1031;
+    height: var(--pb-header-height);
+  }
+
+  #page-builder-header nav {
+    @apply w-full flex items-center gap-2 py-1 px-2;
+    height: var(--pb-header-height);
+  }
+
+  #page-builder-sidebar {
+    @apply fixed left-0 bg-white border-r border-gray-200 overflow-x-hidden;
+    width: var(--pb-sidebar-width);
+    top: var(--pb-header-height);
+    height: calc(100vh - var(--pb-header-height));
+  }
+
+  #page-builder-sidebar .sidebar-header {
+    @apply h-12 bg-white border-b border-gray-200 flex items-center mb-2 gap-2 sticky top-0;
+    padding: 0.5rem 0.7rem;
+    z-index: 1031;
+  }
+
+  #page-builder-sidebar .sidebar-footer {
+    @apply fixed bottom-0 left-0 p-2 bg-white flex items-center justify-between;
+    width: calc(var(--pb-sidebar-width) - 1px);
+    box-shadow: 0 0 0 1px var(--color-gray-200);
+    z-index: 1031;
+  }
+
+  #page-builder-sidebar .list-group-item {
+    @apply p-2;
+  }
+
+  #page-builder-preview {
+    @apply rounded-md border border-gray-200;
+    margin-top: calc(var(--pb-header-height) + 1rem);
+  }
+
+  .sidebar-section-title:hover,
+  .sidebar-section-title:focus,
+  .sidebar-block-title:hover,
+  .sidebar-block-title:focus {
+    @apply !text-gray-900 !bg-gray-100;
+  }
+
+  .sidebar-section-title:hover a,
+  .sidebar-section-title:focus a,
+  .sidebar-block-title:hover a,
+  .sidebar-block-title:focus a {
+    @apply !no-underline;
+  }
+
+  .sidebar-section-title:hover .btn-light,
+  .sidebar-section-title:focus .btn-light,
+  .sidebar-block-title:hover .btn-light,
+  .sidebar-block-title:focus .btn-light {
+    @apply visible;
+  }
+
+  .sidebar-section-title .btn-light,
+  .sidebar-block-title .btn-light {
+    @apply invisible !bg-transparent;
+  }
+
+  .sidebar-section-title .btn-light:hover,
+  .sidebar-section-title .btn-light:focus,
+  .sidebar-section-title .btn-light:active,
+  .sidebar-block-title .btn-light:hover,
+  .sidebar-block-title .btn-light:focus,
+  .sidebar-block-title .btn-light:active {
+    @apply !bg-gray-100;
+  }
+
+  .sidebar-page-block {
+    margin-left: 25px;
+  }
+
+  .edit-block .trix-button--icon-heading-1,
+  .edit-block .trix-button--icon-quote,
+  .edit-block .trix-button--icon-decrease-nesting-level,
+  .edit-block .trix-button--icon-increase-nesting-level,
+  .edit-block .trix-button--icon-strike,
+  .edit-block .trix-button-group--history-tools {
+    @apply !hidden;
+  }
+
+  .mobileLiveView #page-builder-preview {
+    @apply w-full h-screen -translate-x-1/2 overflow-auto;
+    inset: 0 50%;
+    max-width: 375px;
+    min-width: 375px;
+  }
+
+  .editor-add-section {
+    @apply fixed right-5 bottom-5 opacity-0 pointer-events-none flex justify-center items-center;
+    z-index: 999999;
+    padding: 0.6rem 1.3rem;
+  }
+
+  @media (max-width: 768px) {
+    #page-builder-preview {
+      @apply !border-0;
+    }
+
+    .page-builder .sidebar {
+      @apply opacity-0 pointer-events-none;
+    }
+
+    .page-builder .sidebar .right-sidebar,
+    .page-builder .sidebar .bottom-bar {
+      @apply !w-screen;
+    }
+
+    .mobile_sidebar_open.page-builder .sidebar,
+    .editor-add-section {
+      @apply opacity-100 pointer-events-auto;
+    }
+
+    .mobile_sidebar_open .editor-add-section {
+      @apply opacity-0 pointer-events-none;
+    }
+  }
+
+  @media (min-width: 768px) {
+    #main-part {
+      margin-left: 339px;
+    }
+
+    .mobileLiveView #page-builder-preview {
+      width: 392px;
+      max-width: 429px;
+      height: calc(100vh - 100px);
+      max-height: 800px;
+    }
+  }
+
+  .page-builder .radio-buttons-header input ~ p {
+    @apply text-sm;
+    border-radius: 0.22rem;
+    padding: 0.22rem 0.5rem;
+  }
+
+  .page-builder .radio-buttons-header {
+    @apply justify-around;
+  }
+
+  .page-builder .radio-buttons-header input:checked ~ p {
+    @apply !text-gray-900 !bg-gray-25 !border !border-primary;
+  }
+
+  .checkered-background {
+    background-image: linear-gradient(
+        45deg,
+        rgba(0, 0, 0, 0.1) 25%,
+        transparent 25%,
+        transparent 75%,
+        rgba(0, 0, 0, 0.1) 75%,
+        rgba(0, 0, 0, 0.1)
+      ),
+      linear-gradient(
+        45deg,
+        rgba(0, 0, 0, 0.1) 25%,
+        transparent 25%,
+        transparent 75%,
+        rgba(0, 0, 0, 0.1) 75%,
+        rgba(0, 0, 0, 0.1)
+      );
+    background-size: 20px 20px;
+    background-position: 0 0, 10px 10px;
+  }
+}

data/app/controllers/concerns/spree/admin/bulk_operations_concern.rb

@@ -5,18 +5,25 @@ module Spree
 
       def bulk_add_tags
         Spree::Tags::BulkAdd.call(tag_names: params[:tags], records: bulk_collection)
+        after_bulk_tags_change
 
         handle_bulk_operation_response
       end
 
       def bulk_remove_tags
         Spree::Tags::BulkRemove.call(tag_names: params[:tags], records: bulk_collection)
+        after_bulk_tags_change
 
         handle_bulk_operation_response
       end
 
       private
 
+      # Hook for subclasses to perform additional actions after bulk tag operations
+      def after_bulk_tags_change
+        # Override in controller to add custom behavior
+      end
+
       def handle_bulk_operation_response
         respond_to do |format|
           format.turbo_stream do

data/app/controllers/concerns/spree/admin/order_concern.rb

@@ -15,6 +15,20 @@ module Spree
         @order
       end
 
+      def load_order_items
+        @line_items = @order.line_items.includes(variant: [:product, :option_values])
+        @shipments = @order.shipments.includes(:inventory_units, :selected_shipping_rate,
+                                               shipping_rates: [:shipping_method, :tax_rate]).order(:created_at)
+        @payments = @order.payments.includes(:payment_method, :source).order(:created_at)
+        @refunds = @order.refunds
+
+        @return_authorizations = @order.return_authorizations.includes(:return_items)
+        @customer_returns = @order.customer_returns.distinct
+
+        @order_promotions = @order.order_promotions.includes(promotion: :promotion_actions)
+        @tax_adjustments = @order.all_adjustments.tax.includes(:source, :adjustable)
+      end
+
       def resource_not_found
         flash[:error] = flash_message_for(model_class.new, :not_found)
         redirect_to spree.admin_orders_path

data/app/controllers/concerns/spree/admin/table_concern.rb

@@ -0,0 +1,82 @@
+module Spree
+  module Admin
+    module TableConcern
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :_table_key, instance_writer: false
+      end
+
+      class_methods do
+        # Override the table key for this controller
+        # By default, the key is derived from controller_name (e.g., ProductsController -> :products)
+        # @param key [Symbol] the table key (e.g., :products)
+        def use_table(key)
+          self._table_key = key
+        end
+      end
+
+      # Get the table key for this controller
+      # Uses explicitly set key or derives from controller_name
+      # @return [Symbol]
+      def table_key
+        _table_key || controller_name.to_sym
+      end
+
+      # Get the table for this controller
+      # @return [Spree::Admin::Table, nil]
+      def table
+        @table ||= Spree.admin.tables.get(table_key)
+      end
+
+      # Check if a table is registered for this controller
+      # @return [Boolean]
+      def table_registered?
+        Spree.admin.tables.registered?(table_key)
+      end
+
+      # Apply custom sort scopes if the table has them configured
+      # Should be called after ransack result is obtained
+      # @param collection [ActiveRecord::Relation] the collection to sort
+      # @return [ActiveRecord::Relation] sorted collection
+      def apply_table_sort(collection)
+        return collection unless table
+        return collection unless params[:q].respond_to?(:dig)
+
+        sort_param = params.dig(:q, :s)
+        column = table.find_custom_sort_column(sort_param)
+
+        return collection unless column
+
+        # Remove sort from ransack params since we'll apply it manually
+        table.apply_custom_sort(collection.reorder(nil), sort_param)
+      end
+
+      # Check if current sort uses a custom scope
+      # @return [Boolean]
+      def custom_sort_active?
+        return false unless table
+        return false unless params[:q].respond_to?(:dig)
+
+        sort_param = params.dig(:q, :s)
+        table.find_custom_sort_column(sort_param).present?
+      end
+
+      # Process query_state parameter from table query builder
+      # and merge it into params[:q] for ransack
+      # @return [void]
+      def process_table_query_state
+        return unless params[:query_state].present?
+
+        query_builder = Spree::Admin::Table::QueryBuilder.new(table)
+        query_builder.load_from_json(params[:query_state])
+
+        ransack_params = query_builder.to_ransack_params
+        return if ransack_params.blank?
+
+        params[:q] ||= {}
+        params[:q].merge!(ransack_params)
+      end
+    end
+  end
+end

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

@@ -4,8 +4,8 @@ module Spree
       include Spree::Admin::SettingsConcern
 
       skip_before_action :authorize_admin, only: [:new, :create]
-      before_action :load_parent, except: [:new, :create]
-      before_action :load_roles, except: [:index]
+      before_action :load_parent, except: [:new, :create, :select_options]
+      before_action :load_roles, except: [:index, :select_options]
       before_action :load_invitation, only: [:new, :create]
       before_action :load_admin_user, only: [:show, :edit, :update, :destroy]
 
@@ -19,6 +19,15 @@ module Spree
         @collection = @search.result
       end
 
+      # GET /admin/admin_users/select_options.json
+      def select_options
+        q = params[:q]
+        ransack_params = q.is_a?(String) ? { email_cont: q } : q
+        users = Spree.admin_user_class.accessible_by(current_ability).ransack(ransack_params).result.order(:email).limit(50)
+
+        render json: users.pluck(:id, :email).map { |id, email| { id: id, name: email } }
+      end
+
       # GET /admin/admin_users/:id
       def show
         authorize! :read, @admin_user

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

@@ -0,0 +1,34 @@
+module Spree
+  module Admin
+    class BulkOperationsController < Spree::Admin::BaseController
+      # GET /admin/bulk_operations/new?kind=:action_key&table_key=:table_key
+      # Generic bulk modal action that reads configuration from BulkAction
+      def new
+        @table_key = params[:table_key]&.to_sym
+        @bulk_action = find_bulk_action(params[:kind], @table_key)
+
+        if @bulk_action.nil?
+          head :not_found
+          return
+        end
+
+        @title = @bulk_action.resolve_title
+        @body = @bulk_action.resolve_body
+        @form_partial = @bulk_action.form_partial
+        @form_partial_locals = @bulk_action.form_partial_locals || {}
+        @button_text = @bulk_action.resolve_button_text
+        @button_class = @bulk_action.button_class
+      end
+
+      private
+
+      def find_bulk_action(key, table_key)
+        return nil if key.blank? || table_key.blank?
+        return nil unless Spree.admin.tables.registered?(table_key)
+
+        table = Spree.admin.tables.get(table_key)
+        table.find_bulk_action(key.to_sym)
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ module Spree
   module Admin
     class CheckoutsController < ResourceController
       include Spree::Admin::OrdersFiltersHelper
+      include Spree::Admin::TableConcern
 
       before_action :load_user, only: [:index]
 
@@ -10,14 +11,25 @@ module Spree
       add_breadcrumb_icon 'inbox'
 
       def index
-        load_orders
-        render template: 'spree/admin/orders/index'
+        @orders = @collection
       end
 
       private
 
       def scope
-        current_store.checkouts.accessible_by(current_ability, :index)
+        current_store.checkouts.accessible_by(current_ability, :index).includes(collection_includes)
+      end
+
+      def collection_default_sort
+        'created_at desc'
+      end
+
+      def collection_includes
+        { user: [] }
+      end
+
+      def edit_object_url(object, options = {})
+        spree.admin_order_path(object, options)
       end
     end
   end

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

@@ -9,7 +9,7 @@ module Spree
 
       # create classifications in bulk
       def create
-        products = current_store.products.accessible_by(current_ability, :update).where(id: params[:product_ids].compact.uniq)
+        products = current_store.products.accessible_by(current_ability, :update).where(id: params[:ids].compact.uniq)
         Spree::Taxons::AddProducts.call(taxons: Spree::Taxon.where(id: parent.id), products: products)
 
         parent.reload
@@ -38,7 +38,6 @@ module Spree
                         includes(
                           :taxon,
                           product: {
-                            variant_images: [],
                             master: [:images, :stock_items, :stock_locations],
                             variants: [:images, :stock_items, :stock_locations]
                           }

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

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    class CountriesController < Spree::Admin::BaseController
+      def select_options
+        q = params[:q]
+        ransack_params = q.is_a?(String) ? { name_cont: q } : q
+        countries = Spree::Country.accessible_by(current_ability).ransack(ransack_params).result.order(:name).limit(50)
+
+        render json: countries.pluck(:id, :name).map { |id, name| { id: id, name: name } }
+      end
+    end
+  end
+end