spree_admin 5.4.1 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26df0b31a098e6532b1f1ce9a0d9c93e5775eabfdb0aae25d97ddc2cad9817f7
-  data.tar.gz: d9a8d58ad5854ae05313f113ad57530aaa1a7b70d75bb4d19c20f7fc0904a71b
+  metadata.gz: 2f9e9301b1be27a3349cfc4eaef27ca076dff3e8131a8a88fc926abba84b40a1
+  data.tar.gz: 49e0257fda4a3ffb5a6b8da0ea1623b2e3c323c07d2c47eafc986fd0b1485ce2
 SHA512:
-  metadata.gz: 142a56b2d97a37fd72ec7230a0d35bc83a3ea1e56b31c36c536a1e33a5714c1148c4e69d6e779348fa10cef3f8157e0e14909641a9472419c95bd09da52bd48d
-  data.tar.gz: f29b088464374c13ae4bbc77a549f15524cd6661fedc3ac6e3d3f484c3dba47b91bd1e0d643031ddf953c156949f7fdf54ed889cc026096ca701df6b9e6db0e3
+  metadata.gz: e38c5fcb1d9c9205f67203ecfbc7dd0c862fc80bae7152d918f0ebec47af68f78f0ab7141d03219e4547c3ff1633bdc05355353ef74bdbc55a7e82f10ddba5b1
+  data.tar.gz: 46fa0bd908105098e55528c5691e38ea7d275bacd780f14f09f17062c81f15d8d91ddeb2fbd2bdaa3c18ef1dcabed2f60fea28242d763e1b4402ade26c6be53d

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

@@ -14,7 +14,7 @@ module Spree
         if @object.status == 'mapping'
           @mappings = @object.mappings
           @mappings_options = @object.unmapped_file_columns.map { |file_column| [file_column, file_column] }
-        else
+        elsif !@object.large_import?
           @rows = @object.rows.processed.includes(:item)
         end
       end

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class OptionTypesController < ResourceController
-      before_action :setup_new_option_value, only: :edit
+      before_action :setup_option_values, only: [:edit, :new]
 
       include ProductsBreadcrumbConcern
       add_breadcrumb Spree.t(:options), :admin_option_types_path
@@ -10,8 +10,21 @@ module Spree
 
       private
 
-      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
+        end
       end
 
       def add_breadcrumbs

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

@@ -79,7 +79,13 @@ module Spree
       def render_money_column(value, column)
         return empty_column_placeholder if value.blank?
 
-        value.respond_to?(:display_amount) ? value.display_amount : Spree::Money.new(value, currency: current_currency).to_html
+        if value.respond_to?(:display_amount)
+          value.display_amount
+        elsif value.is_a?(Spree::Money)
+          value.to_html
+        else
+          Spree::Money.new(value, currency: current_currency).to_html
+        end
       end
 
       # Render date column

data/app/subscribers/spree/admin/import_row_subscriber.rb

@@ -23,6 +23,7 @@ module Spree
 
         import_row = Spree::ImportRow.find_by_prefix_id(import_row_id)
         return unless import_row
+        return if import_row.import.large_import?
 
         add_row_to_import_view(import_row)
         update_footer_in_import_view(import_row)

data/app/subscribers/spree/admin/import_subscriber.rb

@@ -4,24 +4,17 @@ module Spree
   module Admin
     # Handles Import events for the admin interface.
     #
-    # This subscriber listens to import.completed event and handles:
-    # - Updating the loader in the import view (Turbo Streams)
-    #
-    # We use async: false because the UI update should happen immediately
-    # after the import completes.
+    # We use async: false because the UI updates should happen immediately.
     #
     class ImportSubscriber < Spree::Subscriber
-      subscribes_to 'import.completed', async: false
+      subscribes_to 'import.completed', 'import.progress', async: false
 
       on 'import.completed', :update_loader_in_import_view
+      on 'import.progress', :update_footer_in_import_view
 
       def update_loader_in_import_view(event)
-        import_id = event.payload['id']
-        return unless import_id
-
-        import = Spree::Import.find_by_prefix_id(import_id)
+        import = find_import(event)
         return unless import
-        return unless import.respond_to?(:broadcast_update_to)
 
         import.broadcast_update_to(
           "import_#{import.id}_loader",
@@ -30,6 +23,27 @@ module Spree
           locals: { import: import }
         )
       end
+
+      def update_footer_in_import_view(event)
+        import = find_import(event)
+        return unless import
+
+        import.broadcast_replace_to(
+          "import_#{import.id}_footer",
+          target: 'footer',
+          partial: 'spree/admin/imports/footer',
+          locals: { import: import }
+        )
+      end
+
+      private
+
+      def find_import(event)
+        import_id = event.payload['id']
+        return unless import_id
+
+        Spree::Import.find_by_prefix_id(import_id)
+      end
     end
   end
 end

data/app/views/spree/admin/imports/_loader.html.erb

@@ -2,6 +2,11 @@
   <div class="flex justify-center items-center my-12 flex-col pb-12">
     <%= icon('check', class: 'text-green-700', style: 'font-size: 4rem;') %>
     <p class="text-green-700 mb-3"><%= Spree.t('admin.imports.import_done') %>!</p>
+    <% if import.large_import? %>
+      <p class="text-gray-600 mb-3">
+        <%= Spree.t('admin.imports.large_import_summary', completed: import.rows.completed.count, failed: import.rows.failed.count) %>
+      </p>
+    <% end %>
     <%= link_to_with_icon 'arrow-back-up', Spree.t('admin.back_to_dashboard'), spree.admin_path, class: 'btn btn-light mb-12' %>
   </div>
 <% else %>

data/app/views/spree/admin/imports/show.html.erb

@@ -25,6 +25,20 @@
   </div>
 
   <%= render 'spree/admin/imports/mapping_footer', import: @import %>
+<% elsif @import.large_import? %>
+  <%= turbo_stream_from "import_#{@import.id}_footer" %>
+  <%= turbo_stream_from "import_#{@import.id}_loader" %>
+
+  <div class="p-6 text-center text-gray-600 my-8">
+    <p class="mb-2"><%= Spree.t('admin.imports.large_import_message', count: @import.rows_count) %></p>
+    <p><%= Spree.t('admin.imports.large_import_background_note') %></p>
+  </div>
+
+  <div id="loader" data-controller="auto-scroll">
+    <%= render 'spree/admin/imports/loader', import: @import %>
+  </div>
+
+  <%= render 'spree/admin/imports/footer', import: @import %>
 <% else %>
   <%= turbo_stream_from "import_#{@import.id}_rows" %>
   <%= turbo_stream_from "import_#{@import.id}_footer" %>

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

data/app/views/spree/admin/shared/_user_dropdown.html.erb

@@ -38,7 +38,7 @@
           <%= Spree.t(:support) %>
         </h6>
         <%= link_to_with_icon 'book',  Spree.t('admin.documentation'), 'https://spreecommerce.org/docs', class: 'dropdown-item', target: '_blank' %>
-        <%= link_to_with_icon 'brand-slack', Spree.t('admin.slack'), 'https://slack.spreecommerce.org/', class: 'dropdown-item', target: '_blank' %>
+        <%= link_to_with_icon 'brand-discord', 'Discord', 'https://discord.spreecommerce.org/', class: 'dropdown-item', target: '_blank' %>
         <%= link_to_with_icon 'message', Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item', target: '_blank' %>
       <% end %>
 

data/config/locales/en.yml

@@ -136,6 +136,9 @@ en:
         all_required_columns_mapped: Good job, all required columns are mapped!
         field_required: Field required
         import_done: All done!
+        large_import_background_note: You can close this page — the import will continue in the background.
+        large_import_message: This import contains %{count} rows and is too large to display individually.
+        large_import_summary: "%{completed} completed, %{failed} failed"
         mapping_required: This field is required
         please_map_all_required_fields: Please map all the required fields to continue.
         waiting_for_file_to_be_processed: Waiting for file to be processed...
@@ -294,7 +297,6 @@ en:
       shipment_transfer:
         wrong_destination: Wrong destination
       show_json: Show JSON
-      slack: Slack
       stock_transfers:
         add_products_tip: You need to select a destination location first
       store_credit:

data/lib/spree/admin/runtime_configuration.rb

@@ -11,6 +11,7 @@ module Spree
       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 :admin_option_values_per_page, :integer, default: 50
 
       preference :include_application_importmap, :boolean, default: false
       preference :legacy_sidebar_navigation, :boolean, default: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-14 00:00:00.000000000 Z
+date: 2026-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: 5.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: 5.4.2
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.8.5
-- !ruby/object:Gem::Dependency
-  name: pagy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '43.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '43.0'
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
   requirement: !ruby/object:Gem::Requirement
@@ -1175,9 +1161,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.4.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.4.1
+  source_code_uri: https://github.com/spree/spree/tree/v5.4.2
 post_install_message:
 rdoc_options: []
 require_paths: