Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Paginate option values in admin option type form (#13949)
Damian Legawiec173d0b454c53
diff --git a/spree/admin/app/controllers/spree/admin/option_types_controller.rb b/spree/admin/app/controllers/spree/admin/option_types_controller.rbindex d839dc274e..8bcb16880b 100644--- a/spree/admin/app/controllers/spree/admin/option_types_controller.rb+++ b/spree/admin/app/controllers/spree/admin/option_types_controller.rb@@ -1,7 +1,7 @@module Spreemodule Adminclass OptionTypesController < ResourceController- before_action :setup_new_option_value, only: :edit+ before_action :setup_option_values, only: [:edit, :new]include ProductsBreadcrumbConcernadd_breadcrumb Spree.t(:options), :admin_option_types_path@@ -10,8 +10,21 @@ module Spreeprivate- def setup_new_option_value- @option_type.option_values.build if @option_type.option_values.empty?+ def setup_option_values+ per_page = Spree::Admin::RuntimeConfig.admin_option_values_per_page+ @option_values_page = [params[:option_values_page].to_i, 1].max+ @option_values_total = @option_type.option_values.count++ if @option_values_total == 0+ @option_type.option_values.build+ @option_values = @option_type.option_values+ @option_values_pages = 1+ else+ @option_values = @option_type.option_values.order(:position)+ .offset((@option_values_page - 1) * per_page)+ .limit(per_page)+ @option_values_pages = (@option_values_total.to_f / per_page).ceil+ endenddef add_breadcrumbsdiff --git a/spree/admin/app/views/spree/admin/option_types/_form.html.erb b/spree/admin/app/views/spree/admin/option_types/_form.html.erbindex 2456feee80..712b4eb98b 100644--- a/spree/admin/app/views/spree/admin/option_types/_form.html.erb+++ b/spree/admin/app/views/spree/admin/option_types/_form.html.erb@@ -36,6 +36,11 @@<div class="card mb-6"><div class="card-header flex justify-between items-center"><h5 class="card-title"><%= Spree.t(:option_values) %></h5>+ <% if @option_values_total > 0 %>+ <span class="text-sm text-gray-500">+ <%= @option_values_total %> <%= 'value'.pluralize(@option_values_total) %>+ </span>+ <% end %></div><div class="card-body p-0"><div class="table-responsive">@@ -50,8 +55,7 @@</tr></thead><tbody id="option_values" data-controller="sortable" data-sortable-handle-value=".move-handle" data-sortable-resource-name-value="option_value" data-sortable-response-kind-value="turbo-stream">- <% @option_type.option_values.build if @option_type.option_values.empty? %>- <%= f.fields_for :option_values do |option_value_form| %>+ <%= f.fields_for :option_values, @option_values do |option_value_form| %><%= render partial: 'option_value_fields', locals: { f: option_value_form, option_type: @option_type } %><% end %>@@ -69,5 +73,36 @@</tbody></table></div>+ <% if @option_values_pages > 1 %>+ <div class="flex items-center justify-between p-3 border-t">+ <span class="text-sm text-gray-500">+ <% per_page = Spree::Admin::RuntimeConfig.admin_option_values_per_page %>+ Showing <%= (@option_values_page - 1) * per_page + 1 %>-<%= [@option_values_page * per_page, @option_values_total].min %> of <%= @option_values_total %>+ </span>+ <div class="flex gap-1.5">+ <% if @option_values_page > 1 %>+ <%= link_to icon('chevron-left', class: 'text-gray-900 mr-0'),+ spree.edit_admin_option_type_path(@option_type, option_values_page: @option_values_page - 1),+ class: "btn btn-light p-2",+ 'aria-label': 'Previous page' %>+ <% else %>+ <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>+ <%= icon('chevron-left', class: 'text-gray-900 mr-0') %>+ </button>+ <% end %>++ <% if @option_values_page < @option_values_pages %>+ <%= link_to icon('chevron-right', class: 'text-gray-900 mr-0'),+ spree.edit_admin_option_type_path(@option_type, option_values_page: @option_values_page + 1),+ class: "btn btn-light p-2",+ 'aria-label': 'Next page' %>+ <% else %>+ <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>+ <%= icon('chevron-right', class: 'text-gray-900 mr-0') %>+ </button>+ <% end %>+ </div>+ </div>+ <% end %></div></div>diff --git a/spree/admin/lib/spree/admin/runtime_configuration.rb b/spree/admin/lib/spree/admin/runtime_configuration.rbindex 46b902d109..53015f5bdf 100644--- a/spree/admin/lib/spree/admin/runtime_configuration.rb+++ b/spree/admin/lib/spree/admin/runtime_configuration.rb@@ -11,6 +11,7 @@ module Spreepreference :admin_records_per_page, :integer, default: DEFAULT_PER_PAGEpreference :admin_products_per_page, :integer, default: DEFAULT_PER_PAGEpreference :admin_orders_per_page, :integer, default: DEFAULT_PER_PAGE+ preference :admin_option_values_per_page, :integer, default: 50preference :include_application_importmap, :boolean, default: falsepreference :legacy_sidebar_navigation, :boolean, default: false