spree_admin 5.2.0.rc2 → 5.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e59ddd5613ed6add9a0bc7b66e9effa39e85f763750a3b4e2bede3e8f203da
-  data.tar.gz: bf9a3fc04741c70271817e9c81e1709e3a8de2a80f34771a3ce701391c5911d7
+  metadata.gz: 0ef3af7b481c377e93088f7ef61e1cd421b56db13d4fe9a55ec294a5c0e79588
+  data.tar.gz: 77c2dd8457a3acb0753c537b965e9d87913a77622b29cef116948fcbef535e6a
 SHA512:
-  metadata.gz: f513a0d0377068700800f84a23bb46eb61447252dddf16a78bda9deba79a9574c0499b562138c6c9cab7c72c98c733c81a4f1512c695aeb55f023fe2b2e58211
-  data.tar.gz: 21d4d0fcaf4029d2c5686dc73627aad315e5167b4c7d30a065bddd9f641f6bfd1dc74c780f8ec8695bb2ba0c748f30c10d997c948e934a0176b1703432bfb5c1
+  metadata.gz: c1155835ff2117a7265fe3cb6f27308ed51a23edbefcb3ed4f6a2919b42d10630de9aab7f0ffe4363a8503260e0e5bb49760ba4ee58a3dbef6c9acbf1d6e30a9
+  data.tar.gz: d936e9e79c1161aca8750c638257055b841646636859a10310cc4c8ec2e4c9136982b989f9841845ddf444d0206c8da49b25211fdb4bbb3bb944e061f7b58251

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

@@ -63,7 +63,7 @@
 
   .alert {
     border-width: 1px;
-    box-shadow: $box-shadow-xs;
+    box-shadow: $box-shadow-sm;
     border-radius: $border-radius-lg;
   }
 }

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

@@ -10,11 +10,13 @@ button[disabled]        .show-when-enabled { display: none; }
 }
 
 .btn {
-  box-shadow: $btn-box-shadow;
-
   transition: background-color 0.1s linear 0s, border-color 0.2s linear 0s !important;
 }
 
+.btn-primary, .btn-light, .btn-secondary {
+  box-shadow: $btn-box-shadow;
+}
+
 .btn,
 .nav-pills > li > a {
   vertical-align: middle;
@@ -31,9 +33,8 @@ button[disabled]        .show-when-enabled { display: none; }
 }
 
 .ti {
-  font-size: 130%;
+  font-size: 120%;
   vertical-align: middle;
-  line-height: 130%;
 }
 
 .btn {

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

@@ -198,7 +198,6 @@ dialog:open {
 
     .btn {
       display: inline-flex;
-      height: 2.5rem;
     }
   }
 }

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

@@ -51,6 +51,7 @@
     align-items: center;
     justify-content: flex-start;
     background: transparent;
+    height: 2rem;
 
     transition-property: background-color, color;
     transition-duration: 0.01s;
@@ -72,6 +73,9 @@
     &.btn {
       font-weight: $font-weight-base !important;
     }
+    &.btn-danger {
+      box-shadow: none;
+    }
   }
   .dropdown-item.active {
     color: theme-color('black') !important;

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

@@ -149,25 +149,24 @@
   .nav {
     padding-left: 0.75rem;
     padding-right: 0.75rem;
-    gap: 0.2rem;
+    gap: 0.25rem;
     display: flex;
     flex-direction: column;
   }
 
   .nav-link {
-    border-radius: $nav-pills-border-radius;
+    border-radius: $border-radius-lg;
     display: flex;
     align-items: center;
-    padding-left: 0.35rem;
-    padding-right: 0.35rem;
-    padding-top: 0.35rem;
-    padding-bottom: 0.35rem;
+    padding-left: 0.25rem;
+    padding-right: 0.25rem;
+    padding-top: 0.25rem;
+    padding-bottom: 0.25rem;
     color: inherit;
 
     transition: background-color 0.1s ease-in-out;
 
     .ti {
-      font-size: 1.125rem !important;
       margin-right: 0.5rem;
       border-radius: $border-radius;
       padding: 0.2rem 0.2rem;
@@ -194,6 +193,7 @@
 
     .badge:not(.badge-info) {
       @extend .badge-light;
+      border-radius: $border-radius;
     }
   }
 

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

@@ -35,8 +35,8 @@ table.table {
     th {
       background-color: $light;
       @extend .text-muted;
-      font-size: $font-size-base;
-      font-weight: $font-weight-normal;
+      font-size: $font-size-sm;
+      font-weight: $font-weight-medium;
       vertical-align: middle;
       padding-top: 0.45rem;
       padding-bottom: 0.45rem;

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

@@ -80,8 +80,7 @@
     .new_option_button {
       @extend .btn;
       @extend .btn-secondary;
-      @extend .py-3;
-      @extend .mt-2;
+      @extend .py-2;
       width: 100%;
       justify-content: flex-start;
     }

data/app/assets/stylesheets/spree/admin/global/_variables.scss

@@ -60,7 +60,7 @@ $body-bg: $white !default;
 $enable-shadows: false;
 $enable-responsive-font-sizes: true;
 $font-family-sans-serif: Inter, sans-serif !default;
-$font-size-base:   0.8125rem !default;
+$font-size-base:   0.875rem !default;
 $font-size-plus:   0.875rem !default;
 $font-size-sm:    0.75rem !default;
 $font-size-lg:    1rem !default;
@@ -73,7 +73,7 @@ $border-radius: 0.5rem !default;
 $border-radius-sm: 0.4rem !default;
 $border-radius-lg: 0.75rem !default;
 $border-color: rgba($gray-100, 0.85) !default;
-$input-border-color: rgba($gray-200, 0.85) !default;
+$input-border-color: $gray-200 !default;
 $list-group-border-color: $border-color !default;
 $list-group-hover-bg: $gray-25 !default;
 $list-group-active-bg: $action !default;
@@ -91,7 +91,7 @@ $card-spacer-x:                     1.25rem !default;
 $component-active-bg:         $blue !default;
 
 $input-placeholder-color: $gray-500;
-$input-padding-y:         .55rem !default;
+$input-padding-y:         .5rem !default;
 $input-disabled-bg: $gray-25 !default;
 $input-focus-border-color: $blue !default;
 $custom-select-disabled-bg: $gray-50 !default;
@@ -103,15 +103,17 @@ $link-hover-decoration:                   underline !default;
 
 $btn-active-box-shadow:       inset 0 3px 5px rgba($black, .025) !default;
 $btn-disabled-opacity: 0.7 !default;
+$btn-padding-y:               0.35rem !default;
+$btn-padding-x:               0.75rem !default;
 
-$nav-link-padding-y:                .5rem !default;
-$nav-link-padding-x:                .6rem !default;
+$nav-link-padding-y:                .35rem !default;
+$nav-link-padding-x:                .75rem !default;
 
 $box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1),0 2px 4px -1px rgba(0, 0, 0, 0.06) !default;
-$box-shadow-xs: rgba(43, 34, 51, 0.03) 0px 1px 1px !default;
+$box-shadow-xs: rgba(43, 34, 51, 0.05) 0px 1px 1px !default;
 $box-shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;
 $input-box-shadow: $box-shadow-xs !default;
-$btn-box-shadow: $input-box-shadow !default;
+$btn-box-shadow: $box-shadow-xs !default;
 
 $btn-font-weight: $font-weight-medium !default;
 
@@ -166,15 +168,15 @@ $display4-weight:             400 !default;
 $dropdown-bg: $white !default;
 $dropdown-border-width:  0px !default;
 $dropdown-border-radius: 1rem !default;
-$dropdown-inner-border-radius: 0.75rem !default;
+$dropdown-inner-border-radius: 0.8rem !default;
 $dropdown-link-hover-bg: rgba($gray-100, 0.5) !default;
-$dropdown-box-shadow:    0px 0px 0px 1px $gray-200, 0px 6px 12px -3px rgba($gray-300, 0.35), 0px 6px 18px 0px rgba($gray-300, 0.35) !default;
+$dropdown-box-shadow:    0px 0px 0px 1px rgba($gray-300, 0.5), 0px 6px 12px -3px rgba($gray-300, 0.35), 0px 6px 18px 0px rgba($gray-300, 0.35) !default;
 $dropdown-padding-x:    0.25rem !default;
 $dropdown-padding-y:    0.25rem !default;
 $dropdown-divider-bg: $gray-50 !default;
 $dropdown-divider-margin-y: 0.25rem !default;
 $dropdown-header-color: $text-muted !default;
-$dropdown-item-padding-y:           0.45rem !default;
+$dropdown-item-padding-y:           0.5rem !default;
 $dropdown-item-padding-x:           0.65rem !default;
 
 $zindex-dropdown: 1050;
@@ -213,7 +215,7 @@ $embed-responsive-aspect-ratios: (
 ) !default;
 
 // tables
-$table-cell-padding: 1.15rem .75rem !default;
+$table-cell-padding: 1rem .75rem !default;
 
 $code-color: $body-color !default;
 $code-bg: $gray-50 !default;
@@ -223,7 +225,7 @@ $list-group-bg: transparent !default;
 $list-group-item-padding-x:         1.25rem !default;
 $list-group-item-padding-y:         0.75rem !default;
 $header-bg: $body-bg !default;
-$header-height: 54px !default;
+$header-height: 58px !default;
 $sidebar-width: 220px !default;
 $sidebar-bg: $light !default;
 

data/app/assets/stylesheets/spree/admin/shared/_base.scss

@@ -7,7 +7,7 @@ html {
 }
 body {
   @extend .h-100;
-  overflow-y:scroll;
+  overflow-y: scroll;
 }
 
 body * {
@@ -163,7 +163,7 @@ strong {
 }
 .focus-shadow {
   &:focus, &:focus-within, &:active {
-    box-shadow: $input-btn-focus-box-shadow;
+    box-shadow: $input-focus-box-shadow;
   }
 }
 .focus-border {

data/app/assets/stylesheets/spree/admin/shared/_forms.scss

@@ -1,6 +1,10 @@
 .custom-checkbox .custom-control-label::before {
   border-radius: 0.25rem !important;
   border-color: $input-border-color;
+  box-shadow: $input-box-shadow;
+}
+.custom-checkbox .custom-control-label::before, .custom-checkbox .custom-control-label::after {
+  top: 0rem;
 }
 
 label {
@@ -22,7 +26,7 @@ label {
 }
 
 .form-text {
-  font-size: $font-size-sm;
+  font-size: $font-size-base;
   color: $text-muted;
   margin-top: 0;
 }
@@ -71,11 +75,6 @@ input[type="file"] {
   border-radius: $input-border-radius;
   padding-right: 2.5rem;
 }
-.custom-select, .form-control, .ts-control {
-  &:hover:not(:focus):not(:active):not(.active):not(:focus-visible):not(:focus-within) {
-    border: 1px solid $gray-100;
-  }
-}
 
 .ts-control>input {
   min-width: auto !important;

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

@@ -13,8 +13,6 @@ module Spree
 
       # GET /admin/admin_users
       def index
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at asc'
         @search = scope.includes(role_users: :role, avatar_attachment: :blob).
                   where(role_users: { resource: @parent }).
                   ransack(params[:q])

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

@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class CheckoutsController < BaseController
+    class CheckoutsController < ResourceController
       include Spree::Admin::OrdersFiltersHelper
 
       before_action :load_user, only: [:index]
@@ -10,9 +10,6 @@ module Spree
       add_breadcrumb_icon 'inbox'
 
       def index
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-
         load_orders
         render template: 'spree/admin/orders/index'
       end

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

@@ -4,20 +4,6 @@ module Spree
       belongs_to 'spree/promotion', find_by: :id
 
       include PromotionsBreadcrumbConcern
-
-      def collection
-        return @collection if @collection.present?
-
-        @collection = super
-
-        params[:q] ||= {}
-        @search = @collection.ransack(params[:q])
-        @collection = if request.format.csv?
-                        @search.result
-                      else
-                        @search.result.page(params[:page])
-                      end
-      end
     end
   end
 end

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

@@ -6,19 +6,6 @@ module Spree
       add_breadcrumb Spree.t(:customer_returns), :admin_customer_returns_path
 
       def index; end
-
-      private
-
-      def collection
-        return @collection if @collection.present?
-
-        params[:q] ||= {}
-
-        # @search needs to be defined as this is passed to search_form_for
-        @search = current_store.customer_returns.accessible_by(current_ability, :index).ransack(params[:q])
-        per_page = params[:per_page]
-        @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)
-      end
     end
   end
 end

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

@@ -13,8 +13,8 @@ module Spree
         Spree::Digital
       end
 
-      def collection
-        parent.digitals
+      def scope
+        parent.digitals.accessible_by(current_ability, :index)
       end
 
       def collection_url

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

@@ -22,15 +22,8 @@ module Spree
         Spree.t('admin.export_created')
       end
 
-      def collection
-        return @collection if @collection.present?
-
-        @collection = super
-
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result.includes(:user, attachment_attachment: :blob).page(params[:page])
+      def collection_includes
+        [:user, attachment_attachment: :blob]
       end
 
       def set_user

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

@@ -1,7 +1,8 @@
 module Spree
   module Admin
     class GiftCardsController < ResourceController
-      before_action :load_user
+      prepend_before_action :load_user
+      prepend_before_action :set_user_id_filter, only: :index
       before_action :add_breadcrumbs
       before_action :load_orders, only: :show
 
@@ -21,23 +22,15 @@ module Spree
         end
       end
 
-      def collection
-        return @collection if @collection.present?
+      def collection_includes
+        [:user, :created_by]
+      end
 
-        @collection = super
+      def set_user_id_filter
+        return if params[:user_id].blank?
 
         params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
         params[:q][:user_id_eq] = params[:user_id] if params[:user_id].present?
-
-        @search = @collection
-        @search = @search.ransack(params[:q])
-
-        @collection = @search.result.includes(:user, :created_by)
-
-        @collection = @collection.page(params[:page]).per(params[:per_page])
-
-        @collection
       end
 
       def location_after_destroy

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

@@ -13,8 +13,6 @@ module Spree
 
       # GET /admin/invitations
       def index
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
         @search = scope.includes(:inviter, :role).ransack(params[:q])
         @collection = @search.result
       end

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

@@ -7,16 +7,6 @@ module Spree
 
       private
 
-      def collection
-        return @collection if @collection.present?
-
-        @collection = super
-
-        params[:q] ||= {}
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result.page(params[:page]).per(500)
-      end
-
       def create_turbo_stream_enabled?
         true
       end

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

@@ -10,16 +10,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 setup_new_option_value
         @option_type.option_values.build if @option_type.option_values.empty?
       end

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

@@ -1,6 +1,6 @@
 module Spree
   module Admin
-    class OrdersController < Spree::Admin::BaseController
+    class OrdersController < Spree::Admin::ResourceController
       include Spree::Admin::OrderConcern
       include Spree::Admin::OrdersFiltersHelper
       include Spree::Admin::OrderBreadcrumbConcern

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

@@ -27,7 +27,7 @@ module Spree
         spree.edit_admin_theme_path(current_store.default_theme, page_id: object.id, **options)
       end
 
-      def collection
+      def scope
         super.custom.without_previews
       end
 

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

@@ -22,16 +22,6 @@ module Spree
         end
       end
 
-      def collection
-        return @collection if @collection.present?
-
-        params[:q] ||= {}
-
-        @collection = super.order(position: :asc)
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result.page(params[:page]).per(params[:per_page])
-      end
-
       def require_payment_type
         redirect_to spree.admin_payment_methods_path unless params.dig(:payment_method, :type).present?
       end

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

@@ -7,6 +7,10 @@ module Spree
 
       private
 
+      def collection_includes
+        [:rich_text_translations]
+      end
+
       def permitted_resource_params
         params.require(:policy).permit(permitted_policy_attributes)
       end

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

@@ -14,16 +14,8 @@ module Spree
 
       private
 
-      def collection
-        return @collection if @collection.present?
-
-        @collection = super
-
-        params[:q] ||= {}
-        params[:q][:s] ||= 'published_at desc'
-
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result.page(params[:page]).per(params[:per_page])
+      def collection_includes
+        [:author, :post_category, :image_attachment]
       end
 
       def load_post_categories

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

@@ -12,18 +12,6 @@ module Spree
         true
       end
 
-      def collection
-        return @collection if @collection.present?
-
-        # params[:q] can be blank upon pagination
-        params[:q] = {} if params[:q].blank?
-
-        @collection = super
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result.
-                      page(params[:page])
-      end
-
       def add_breadcrumbs
         if @property.present? && @property.persisted?
           add_breadcrumb @property.presentation, spree.edit_admin_property_path(@property)

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

@@ -1,12 +1,16 @@
 class Spree::Admin::ResourceController < Spree::Admin::BaseController
   include Spree::Admin::Callbacks
 
-  helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class, :search_collection, :paginated_collection
+  helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class
   before_action :load_resource
   before_action :set_currency, :set_current_store, only: [:new, :create]
 
   rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
 
+  def index
+    @collection = collection
+  end
+
   # GET /admin/<resource_name>/new
   def new
     invoke_callbacks(:new_action, :before)
@@ -217,7 +221,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   # Returns the collection of resources (as a scope)
   # @return [ActiveRecord::Relation]
-  def collection
+  def scope
     return parent.send(controller_name) if parent_data.present?
 
     base_scope = model_class.try(:for_store, current_store) || model_class
@@ -227,30 +231,36 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
     if model_class.respond_to?(:accessible_by) &&
         !current_ability.has_block?(params[:action], model_class)
-      base_scope.accessible_by(current_ability, action)
+      base_scope.accessible_by(current_ability, action).includes(collection_includes)
     else
-      base_scope
+      base_scope.includes(collection_includes)
+    end
+  end
+
+  # keeping this as @search for backwards compatibility
+  # @return [Ransack::Search]
+  def search_collection
+    @search ||= begin
+      params[:q] ||= {}
+      params[:q][:s] ||= collection_default_sort if collection_default_sort.present?
+      scope.ransack(params[:q])
     end
   end
 
   # Returns the filtered and paginated ransack results
   # @return [ActiveRecord::Relation]
-  def paginated_collection
-    @paginated_collection ||= begin
-      # Check if collection is already a ransack collection and return it
-      return collection if collection.respond_to?(:current_page)
+  def collection
+    @collection ||= search_collection.result(distinct: true).page(params[:page]).per(params[:per_page])
+  end
 
-      search_collection.result(distinct: true).page(params[:page]).per(params[:per_page])
-    end
+  def collection_includes
+    []
   end
 
-  # Returns the ransack search collection
-  # @return [Ransack::Search]
-  def search_collection
-    @search_collection ||= begin
-      params[:q] ||= {}
-      collection.ransack(params[:q])
-    end
+  # Override in child controllers to set default sort order
+  # @return [String, nil] Ransack sort string (e.g., "name asc", "created_at desc")
+  def collection_default_sort
+    nil
   end
 
   # Returns the URL to redirect to after destroying a resource

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

@@ -21,16 +21,6 @@ module Spree
       def location_after_destroy
         spree.edit_admin_order_path(@return_authorization.order)
       end
-
-      def collection
-        return @collection if @collection.present?
-
-        params[:q] ||= {}
-
-        # @search needs to be defined as this is passed to search_form_for
-        @search = current_store.return_authorizations.accessible_by(current_ability, :index).ransack(params[:q])
-        @collection = @search.result.order(created_at: :desc).page(params[:page]).per(params[:per_page])
-      end
     end
   end
 end

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

@@ -8,6 +8,10 @@ module Spree
 
       private
 
+      def collection_includes
+        [:zones, :calculator]
+      end
+
       def set_default_values
         @shipping_method.display_on = 'both'
         @shipping_method.shipping_categories = [Spree::ShippingCategory.first]