spree_admin 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38049374f6d7f79407c48dfcf500d7fdc68d33066be7a19aa9ed6d43097f0251
-  data.tar.gz: 3b6da7a55d29b372f6e1ea85550eb83834a85220b3386f3168ecd551a892b2b7
+  metadata.gz: edab2a99241e4db5473957b6cc3294ee86cd82c5d5c09b96c1674b88b74570b8
+  data.tar.gz: 8ae3514c6c648be6fd26e42c0bd8811f0dfd2a38a4cb06448791ad1b45e24db8
 SHA512:
-  metadata.gz: 5f7a0c8b6512c468a00bcbbe83d674191984292b00349a2cdafd1fc2f4ab1213f839a9a2bc2e3901811f4bc3ff880f338892e7a6d0e02ae772bad0cf27a36cd9
-  data.tar.gz: 1177771475c2b570e542146d1e2e860bf11fe6960cd4ee5e46f2d8022abba0c52f8036b95a393d004183d9f68a30ef849a8c0f50d505f83dcf2aa631790dbc87
+  metadata.gz: 1ce82d6b487a7a5db6e39c32e2b8da9e66a77331e2f79c22a1b402283ab7bb7b8bb105666c76c74c937e8f3a923d630cda21ddd1cd246b2b6ea89e5368ab12e8
+  data.tar.gz: 63efa374a215c5b3ccc8756e2ce0d0dc3397f4896cb899f47d494d3987b7fddf8792e367e28d814f95b6e9279a6b834258a438986f78cb61714a92fbeb49d1a3

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

@@ -3,14 +3,59 @@
   align-items: center;
   border-radius: $border-radius-lg;
   background-color: $white;
-  padding: 0.5rem;
   box-shadow: $dropdown-box-shadow;
   animation: bounceInUp;
   animation-duration: 0.5s;
-  gap: 0.5rem;
 
   .btn {
-    height: 2rem;
+    border-width: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+    height: 2.75rem;
+    border-radius: 0;
+  }
+
+  > * {
+    height: 2.75rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &:first-child {
+      border-top-left-radius: $border-radius-lg;
+      border-bottom-left-radius: $border-radius-lg;
+
+      .btn {
+        border-top-left-radius: $border-radius-lg;
+        border-bottom-left-radius: $border-radius-lg;
+      }
+    }
+
+    &:last-child {
+      border-top-right-radius: $border-radius-lg;
+      border-bottom-right-radius: $border-radius-lg;
+
+      .btn {
+        border-top-right-radius: $border-radius-lg;
+        border-bottom-right-radius: $border-radius-lg;
+      }
+    }
+
+    &:after {
+      content: '';
+      display: block;
+      width: 1px;
+      height: 100%;
+      background-color: $gray-50;
+    }
+
+    &:last-child:after {
+      display: none;
+    }
+  }
+
+  .btn-close {
+    width: 2.5rem;
   }
 }
 
@@ -38,11 +83,14 @@
 }
 
 .bulk-operations-counter {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 0.25rem;
-  margin-left: 1rem;
-  margin-right: 1rem;
-  border-left: 1px solid $gray-50;
+  padding-left: 1rem;
+  padding-right: 0;
+
+  .bulk-operations-counter-label {
+    margin-right: 1rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+  }
 }

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

@@ -184,18 +184,3 @@ button[disabled]        .show-when-enabled { display: none; }
   min-width: 24px;
   height: 24px;
 }
-
-.page-link {
-  @extend .btn;
-  @extend .btn-sm;
-  @extend .btn-light;
-  @extend .ml-1;
-  @extend .p-2;
-
-  .ti {
-    @extend .mr-0;
-  }
-}
-.page-link.disabled {
-  cursor: not-allowed;
-}

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

@@ -1,6 +1,6 @@
 .filter-wrap {
   padding: 0.5rem;
-  border-bottom: 1px solid $gray-50;
+  border-bottom: 1px solid $table-border-color;
   gap: 0.5rem;
   position: sticky;
   top: $header-height;

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

@@ -207,7 +207,30 @@ td.actions {
 }
 
 .pagination-container {
-  border-top: 1px solid $gray-50;
+  border-top: 1px solid $table-border-color;
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
+
+  position: sticky;
+  bottom: 0;
+  background-color: $card-bg;
+  z-index: 100;
+  border-bottom-left-radius: $border-radius-lg;
+  border-bottom-right-radius: $border-radius-lg;
+
+  .page-link {
+    @extend .btn;
+    @extend .btn-sm;
+    @extend .btn-light;
+    @extend .ml-1;
+    @extend .p-2;
+  
+    .ti {
+      @extend .mr-0;
+    }
+  }
+  .page-item.disabled {
+    cursor: not-allowed;
+    opacity: 0.2;
+  }
 }

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

@@ -720,4 +720,11 @@ code {
   background-color: $code-bg;
   border-radius: $border-radius-sm;
   padding: 0.25rem 0.5rem;
+}
+
+kbd {
+  @extend .badge;
+  @extend .badge-light;
+  text-transform: lowercase;
+  box-shadow: $box-shadow-xs;
 }

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

@@ -20,6 +20,15 @@ module Spree
       def permitted_resource_params
         params.require(:option_value).permit(permitted_option_value_attributes)
       end
+
+      # for select_options action, we only require read permission
+      def authorize_admin
+        if action == :select_options
+          authorize! :read, Spree::OptionValue
+        else
+          super
+        end
+      end
     end
   end
 end

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

@@ -82,9 +82,11 @@ module Spree
       # render a counter for the bulk operations
       # @return [String]
       def bulk_operations_counter
-        content_tag(:span, class: 'bulk-operations-counter') do
-          content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
-          Spree.t("admin.selected")
+        content_tag(:div, class: 'bulk-operations-counter') do
+          content_tag(:span, class: 'bulk-operations-counter-label') do
+            content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
+            Spree.t("admin.selected")
+          end
         end
       end
     end

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

@@ -41,7 +41,7 @@ module Spree
           button_tag(raw(selected_option), class: 'btn btn-light btn-sm', data: { toggle: 'dropdown', expanded: false }) +
             content_tag(:div, class: 'dropdown-menu') do
               per_page_options.map do |option|
-                link_to option, per_page_dropdown_params(option), class: "dropdown-item #{'active' if option == selected_option}"
+                link_to option, per_page_dropdown_params(option), class: "dropdown-item #{'active' if option.to_i == selected_option.to_i}"
               end.join.html_safe
             end
         end

data/app/javascript/spree/admin/application.js

@@ -43,6 +43,7 @@ import Sortable from 'stimulus-sortable'
 import { Tabs } from 'tailwindcss-stimulus-components'
 
 import ActiveStorageUpload from 'spree/admin/controllers/active_storage_upload_controller'
+import AdminController from 'spree/admin/controllers/admin_controller'
 import AssetUploaderController from 'spree/admin/controllers/asset_uploader_controller'
 import AutocompleteSelectController from 'spree/admin/controllers/autocomplete_select_controller'
 import BetterSliderController from 'spree/admin/controllers/better_slider_controller'
@@ -87,6 +88,7 @@ import EnableButtonController from 'spree/core/controllers/enable_button_control
 application.register('active-storage-upload', ActiveStorageUpload)
 application.register('address-autocomplete', AddressAutocompleteController)
 application.register('address-form', AddressFormController)
+application.register('admin', AdminController)
 application.register('asset-uploader', AssetUploaderController)
 application.register('auto-submit', AutoSubmit)
 application.register('autocomplete-select', AutocompleteSelectController)

data/app/javascript/spree/admin/controllers/admin_controller.js

@@ -0,0 +1,18 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ['close', 'save']
+
+  close() {
+    if (this.hasCloseTarget) {
+      window.Turbo.visit(this.closeTarget.href)
+    }
+  }
+
+  save(event) {
+    if (this.hasSaveTarget) {
+      event.preventDefault()
+      this.saveTarget.click()
+    }
+  }
+}

data/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb

@@ -6,8 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.first? %>
-  <li class="first page-item">
-    <%= link_to_unless current_page.first?, icon('double-chevron-left', class: 'mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
-  </li>
-<% end %>
+<li class="first page-item <%= current_page.first? ? 'disabled' : '' %>">
+  <%= link_to icon('double-chevron-left', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
+</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb

@@ -6,8 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.last? %>
-  <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
-    <%= link_to_unless current_page.last?, icon('double-chevron-right', class: 'mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
-  </li>
-<% end %>
+<li class="last next page-item <%= current_page.last? ? 'disabled' : '' %>">
+  <%= link_to icon('double-chevron-right', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
+</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb

@@ -6,8 +6,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.last? %>
-  <li class="next_page page-item">
-    <%= link_to_unless current_page.last?, icon('chevron-right', class: 'text-dark'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
-  </li>
-<% end %>
+<li class="next page-item <%= current_page.last? ? 'disabled' : '' %>">
+  <%= link_to icon('chevron-right', class: 'text-dark'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
+</li>
+

data/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb

@@ -12,6 +12,6 @@
   <ul class="pagination d-inline-flex <%= pagination_class %> mb-0">
 
     <%= prev_page_tag %>
-    <%= next_page_tag unless current_page.last? %>
+    <%= next_page_tag %>
   </ul>
 <% end %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb

@@ -6,8 +6,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.first? %>
-  <li class="prev page-item">
-    <%= link_to_unless current_page.first?, icon('chevron-left', class: 'text-dark'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
-  </li>
-<% end %>
+<li class="prev page-item <%= current_page.first? ? 'disabled' : '' %>">
+  <%= link_to icon('chevron-left', class: 'text-dark'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
+</li>
+

data/app/views/layouts/spree/admin.html.erb

@@ -5,7 +5,10 @@
     <%= render "spree/admin/shared/custom_head" %>
   </head>
 
-  <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>">
+  <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>"
+    data-controller="admin"
+    data-action="keydown.esc->admin#close keydown.ctrl+s->admin#save keydown.meta+s->admin#save"
+  >
     <%= render_admin_partials(:body_start_partials) %>
 
     <%= render "spree/admin/shared/header" %>

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

@@ -37,6 +37,7 @@
               <%= Spree.t(:email) %>
               <span>
                 <%= @admin_user.email %>
+                <%= clipboard_component(@admin_user.email) %>
               </span>
             </li>
             <li class="list-group-item d-flex justify-content-between align-items-center">
@@ -101,7 +102,7 @@
               <li class="list-group-item d-flex justify-content-between align-items-center">
                 <%= Spree.t(:invited_by) %>
                 <span>
-                <%= @admin_user.invited_by.name %>
+                  <%= link_to @admin_user.invited_by.email, spree.admin_admin_user_path(@admin_user.invited_by), class: 'text-decoration-none', data: { turbo_frame: '_top' } %>
                 </span>
               </li>
             <% end %>

data/app/views/spree/admin/payment_methods/edit.html.erb

@@ -3,7 +3,7 @@
   <%= @payment_method.name %>
 <% end %>
 
-<%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_method_path(@payment_method) do |f| %>
+<%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_method_path(@payment_method), html: { id: "edit_payment_method_#{@payment_method.id}" } do |f| %>
   <div class="row">
     <div class="col-lg-6 offset-lg-3">
       <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>

data/app/views/spree/admin/products/_bulk_operations.html.erb

@@ -1,5 +1,7 @@
 <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
   <div class="bulk-panel-container">
+    <%= bulk_operations_counter %>
+
     <% if can?(:activate, Spree::Product) %>
       <%= bulk_action_link(
         Spree.t("admin.bulk_ops.products.title.set_status", status: :active),
@@ -20,7 +22,7 @@
       <button
         type="button"
         data-display="static"
-        class="btn btn-light px-2 h-100"
+        class="btn btn-light"
         data-placement="bottom"
         data-toggle="dropdown"
         aria-expanded="false"
@@ -81,7 +83,6 @@
       </div>
     </div>
 
-    <%= bulk_operations_counter %>
     <%= bulk_operations_close_button %>
   </div>
 </div>

data/app/views/spree/admin/products/form/_variants.html.erb

@@ -56,7 +56,7 @@
                 <label class="label" for="new_option_name"><%= Spree.t(:option_name) %></label>
                 <%= tom_select_tag :new_option_name,
                   multiple: false,
-                  create: true,
+                  create: can?(:create, Spree::OptionType),
                   preloaded_options: option_types_for_select,
                   include_blank: true,
                   select_data: {

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

@@ -1,4 +1,4 @@
-<% record = @object || @customer_return || @order || @product || @vendor || @user || @taxon || @store_credit %>
+<% record = @object || @customer_return || @order || @product || @vendor || @user || @admin_user || @taxon || @store_credit %>
 <% record = nil if @user&.is_a?(Spree.admin_user_class) %>
 
 <% show_record_subtitle = record && record.persisted? && record.has_attribute?(:updated_at) %>
@@ -24,7 +24,8 @@
       <%= yield :page_actions if content_for?(:page_actions) %>
 
       <% if action_name == 'edit' && @object %>
-        <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{@object.class.name.demodulize.underscore}_#{@object.id}" %>
+        <% class_name = defined?(model_class) ? model_class.to_s : @object.class.name %>
+        <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{class_name.demodulize.underscore}_#{@object.id}", data: { admin_target: 'save' } %>
       <% end %>
 
       <% if show_record_subtitle || content_for(:page_actions_dropdown) %>

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

@@ -1,7 +1,7 @@
 <% destroy_url = defined?(destroy_url) && destroy_url ? destroy_url : object_url(f.object) %>
 
 <div class="form-actions">
-  <%= turbo_save_button_tag Spree.t('actions.update') %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), data: { admin_target: 'save' } %>
   <% if f.object.can_be_deleted? && can?(:delete, f.object) %>
     <%= link_to Spree.t('actions.destroy'), destroy_url, data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : '_top' }, class: 'btn btn-danger ml-auto' %>
   <% end %>

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

@@ -11,9 +11,10 @@
     </div>
 
     <% if settings_active? %>
-      <div class="store-dropdown px-2">
-        <%= active_link_to_with_icon('arrow-left', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mx-1 py-2') %>
-      </div>
+      <%= link_to spree.admin_path, class: 'store-dropdown text-decoration-none px-2 justify-content-start with-tip', title: Spree.t('admin.back_to_dashboard'), data: { admin_target: 'close' } do %>
+        <%= icon 'x', class: 'mx-2' %>
+        <kbd>ESC</kbd>
+      <% end %>
     <% else %>
       <% if defined?(current_vendor) && current_vendor.present? %>
         <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>

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

@@ -1,3 +1,3 @@
 <div class="form-actions">
-  <%= turbo_save_button_tag Spree.t('actions.create') %>
+  <%= turbo_save_button_tag Spree.t('actions.create'), data: { admin_target: 'save' } %>
 </div>

data/app/views/spree/admin/users/index.html.erb

@@ -22,6 +22,8 @@
         <%= render 'spree/admin/shared/bulk_modal' %>
         <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
           <div class="bulk-panel-container">
+            <%= bulk_operations_counter %>
+
             <% if can?(:manage_tags, Spree.user_class) %>
               <%= bulk_action_link(
                 Spree.t("admin.bulk_ops.users.title.add_tags"),
@@ -36,7 +38,6 @@
                 url: spree.bulk_remove_tags_admin_users_path
               ) %>
             <% end %>
-            <%= bulk_operations_counter %>
             <%= bulk_operations_close_button %>
           </div>
         </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-14 00:00:00.000000000 Z
+date: 2025-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.1.3
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -448,6 +448,7 @@ files:
 - app/javascript/spree/admin/application.js
 - app/javascript/spree/admin/controllers/active_storage_upload_controller.js
 - app/javascript/spree/admin/controllers/address_form_controller.js
+- app/javascript/spree/admin/controllers/admin_controller.js
 - app/javascript/spree/admin/controllers/asset_uploader_controller.js
 - app/javascript/spree/admin/controllers/autocomplete_select_controller.js
 - app/javascript/spree/admin/controllers/better_slider_controller.js
@@ -1144,9 +1145,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.2
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.3
 post_install_message:
 rdoc_options: []
 require_paths: