spree_admin 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d55b4e39523cee4652dddb953445f27d15190d2cff8e40d3f012329c3e3612ec
-  data.tar.gz: e919c13188d0b35f8c17afaa52fd6e26ea2eae5713e2f5c7d2abb81ea7b7cb9e
+  metadata.gz: 1fb2e27934e0ce22324b5a7c032fbeb7d0abf76d3512f726dd0acddc30a217dc
+  data.tar.gz: 3caabc53934c4c0bdbd2b70bfea5dcaa9685eb3acb9a2d2bcebcc362c4807e73
 SHA512:
-  metadata.gz: f7534f9a249beb83294f14d274920f12d7eb55504951365b0511e1efd980040a4811ffb9261af1aaf8074a60afb564176aa654c321bf771da211f629862e1281
-  data.tar.gz: 50b9265c84d615cade73af58b1af47ff41c043394ac10f9475d1a5cfdaf1398cf3bd274be2880264d846ad15e0ff9701e7b883cf1839b99eef34e198779db873
+  metadata.gz: ffb8d7703b134adf2439b7f035557930448883896f6e4a07daea768de52847d13dc0ed7ca8cb37fc1e38e0df637b7fcbfb54cc3d7e13fdf03adc23493714e33a
+  data.tar.gz: 88f4985f3985761932f2e341ed62085658c925a18244718bb14ffc729b3074cc9d726fa8419c70af12a3da77e9a624f39d3bba5841b4d759a03a1cb8abaad994

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

@@ -31,13 +31,16 @@
 }
 
 .alert-danger {
-  background-color: #f8d7da;
-  border-color: rgba($danger, 0.3) !important;
-
+  background-color: #FEF2F2;
+  border-color: #FBE3E3;
+  color: #450A09;
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%23dc2626' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-exclamation-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M12 9v4' /%3E%3Cpath d='M12 16v.01' /%3E%3C/svg%3E");
 }
 
 .alert-success {
+  background-color: #ECFDF5;
+  color: #092E26;
+  border-color: #D5F9E6;
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='%2310b981' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-check-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M9 12l2 2l4 -4' /%3E%3C/svg%3E");
 }
 

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

@@ -18,10 +18,10 @@ $light: $gray-50 !default;
 
 $primary: #061932 !default;
 $black: #000000 !default;
-$blue: #0077ff !default;
+$blue: #0090FE !default;
 $white: #FFFFFF !default;
 
-$action: #f1faff !default;
+$action: #F4F9FF !default;
 $action-border: #e2ecff !default;
 
 $theme-colors: (
@@ -104,11 +104,11 @@ $box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1),0 2px 4px -1px rgba(0, 0, 0, 0.06
 $box-shadow-xs: rgba(43, 34, 51, 0.04) 0px 1px 2px !default;
 $box-shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;
 
-$tooltip-border-radius: $border-radius-sm !default;
+$tooltip-border-radius: $border-radius !default;
 $tooltip-opacity: 1 !default;
 $tooltip-margin:                    0.25rem 0 !default;
-$tooltip-padding-y:                 .5rem !default;
-$tooltip-padding-x:                 .75rem !default;
+$tooltip-padding-y:                 .25rem !default;
+$tooltip-padding-x:                 .5rem !default;
 $tooltip-bg: $white !default;
 $tooltip-color: $body-color !default;
 $tooltip-arrow-color: transparent !default;

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

@@ -1,10 +1,7 @@
 // https://twitter.com/NatalieMarleny/status/1662402066365526016
 html {
   min-height: 100%;
-  font-feature-settings: "kern";
-  font-optical-sizing: auto;
-  font-style: normal;
-  font-variation-settings: "slnt" 0;
+  letter-spacing: normal;
 }
 body {
   @extend .h-100;
@@ -670,7 +667,8 @@ div.uppy-Root {
 }
 
 .tooltip-inner {
-  box-shadow: $dropdown-box-shadow;
+  border: 1px solid $gray-100;
+  box-shadow: $box-shadow-xs;
 }
 
 .avatar {

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

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class PostsController < ResourceController
+      before_action :load_post_categories
+
       def select_options
         render json: current_store.posts.published.to_tom_select_json
       end
@@ -18,6 +20,10 @@ module Spree
         @search = @collection.ransack(params[:q])
         @collection = @search.result.page(params[:page]).per(params[:per_page])
       end
+
+      def load_post_categories
+        @post_categories = current_store.post_categories.accessible_by(current_ability).order(:title)
+      end
     end
   end
 end

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

@@ -15,6 +15,7 @@ module Spree
       before_action :prepare_product_params, only: [:create, :update]
       before_action :strip_stock_items_param, only: [:create, :update]
       before_action :ensure_session_uploaded_assets_uuid, only: :new
+      before_action :check_slug_availability, only: [:create, :update]
 
       new_action.before :build_master_prices
       new_action.before :build_master_stock_items
@@ -354,6 +355,11 @@ module Spree
           variant_images: [],
         }
       end
+
+      def check_slug_availability
+        new_slug = permitted_resource_params[:slug]
+        permitted_resource_params[:slug] = @product.ensure_slug_is_unique(new_slug)
+      end
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Spree
 
       def update
         if @user.update(user_params)
-          flash[:success] = Spree.t(:account_updated)
+          flash[:success] = flash_message_for(@user, :successfully_updated)
           redirect_to spree.admin_user_path(@user)
         else
           render :edit, status: :unprocessable_entity

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

@@ -10,8 +10,5 @@ export default class extends Controller {
     const name = this.nameTarget.value
     const url = name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)+/g, '')
     this.urlTarget.value = url
-
-    // TODO: do ajax call and check if url is available
-    // if not, append a number to the end to make it unique
   }
 }

data/app/javascript/spree/admin/helpers/bootstrap.js

@@ -4,11 +4,11 @@ import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'
 
 
 const initTooltips = () => {
-  $('.with-tip').each(function() {
+  $('.with-tip, .trix-button').each(function() {
     $(this).tooltip()
   })
 
-  $('.with-tip').on('show.bs.tooltip', function(event) {
+  $('.with-tip, .trix-button').on('show.bs.tooltip', function(event) {
     if (('ontouchstart' in window)) {
       event.preventDefault()
     }
@@ -16,7 +16,7 @@ const initTooltips = () => {
 }
 
 const removeTooltips = () => {
-  $('.with-tip').each(function() {
+  $('.with-tip, .trix-button').each(function() {
     $(this).tooltip('dispose')
   })
 }

data/app/views/spree/admin/errors/forbidden.html.erb

@@ -0,0 +1,13 @@
+<%= content_for :title do %>
+  <%= Spree.t(:forbidden) %>
+<% end %>
+
+<%= content_for :page_title do %>
+  <%= Spree.t(:forbidden) %>
+<% end %>
+
+<p class="text-danger">
+  <%= Spree.t(:forbidden_message) %>
+</p>
+
+<%= link_to Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn btn-primary' %>

data/app/views/spree/admin/pages/_page.html.erb

@@ -0,0 +1,26 @@
+<tr id="<%= dom_id page %>" data-controller="row-link" class="cursor-pointer">
+  <td scope="row" data-action="click->row-link#openLink" class="w-60">
+    <%= link_to page.name, spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), data: { row_link_target: :link } %>
+  </td>
+  <td data-action="click->row-link#openLink" class="w-15">
+    <%= local_time_ago(page.created_at, class: 'with-tip') %>
+  </td>
+  <td data-action="click->row-link#openLink" class="w-15">
+    <%= local_time_ago(page.updated_at, class: 'with-tip') %>
+  </td>
+  <td class="w-10 text-right">
+    <div class="dropdown">
+      <button class="btn btn-sm btn-light" type="button" data-toggle="dropdown" aria-expanded="false">
+        <%= icon('dots-vertical', class: 'mr-0') %>
+      </button>
+      <ul class="dropdown-menu">
+        <li>
+          <%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), class: 'dropdown-item' %>
+        </li>
+        <li>
+          <%= link_to_delete(page, class: 'dropdown-item btn-danger', icon: 'trash') %>
+        </li>
+      </ul>
+    </div>
+  </td>
+</tr>

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

@@ -10,10 +10,12 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
-            <th><%= Spree.t(:name) %></th>
-            <th><%= Spree.t(:updated) %></th>
+            <th><%= sort_link @search, :name, Spree.t(:name) %></th>
+            <th><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
+            <th><%= sort_link @search, :updated_at, Spree.t(:updated_at) %></th>
+            <th></th>
           </tr>
         </thead>
         <tbody>

data/app/views/spree/admin/post_categories/_post_category.html.erb

@@ -1,6 +1,9 @@
 <tr data-controller="row-link" id="<%= dom_id(post_category) %>">
-  <td><%= link_to post_category.title, spree.edit_admin_post_category_path(post_category), class: 'd-flex', data: { row_link_target: :link } %></td>
-  <td class="actions cursor-pointer" data-action="click->row-link#openLink">
+  <td class="w-60 p-0">
+    <%= link_to post_category.title, spree.edit_admin_post_category_path(post_category), class: 'd-block w-100 h-100 px-3 py-2', data: { row_link_target: :link } %>
+  </td>
+  <td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= post_category.posts.count %></td>
+  <td class="w-10 cursor-pointer text-right" data-action="click->row-link#openLink">
     <%= link_to_edit(post_category, class: 'btn btn-light btn-sm') if can? :edit, post_category %>
   </td>
 </tr>

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

@@ -10,7 +10,8 @@
       <table class="table">
         <thead class="text-muted">
           <tr>
-            <th class="w-90"><%= Spree.t(:title) %></th>
+            <th><%= Spree.t(:title) %></th>
+            <th><%= Spree.t(:posts) %></th>
             <th></th>
           </tr>
         </thead>

data/app/views/spree/admin/posts/_filters.html.erb

@@ -20,9 +20,9 @@
         <div class="form-group">
           <%= f.label :post_category_id_eq, Spree.t(:category) %>
           <%= f.select :post_category_id_eq,
-                   options_for_select(Spree::PostCategory.all.pluck(:title, :id), params.dig(:q, :post_category_id_eq)),
+                   options_for_select(@post_categories.pluck(:title, :id), params.dig(:q, :post_category_id_eq)),
                    { include_blank: true },
-                   { class: "custom-select", data: { filters_target: :input } } %>
+                   { data: { filters_target: :input, controller: 'autocomplete-select' } } %>
         </div>
       </div>
     </div>

data/app/views/spree/admin/posts/_form.html.erb

@@ -48,12 +48,12 @@
       <div class="card-body">
         <div class="form-group">
           <%= f.label :author_id, Spree.t(:author) %>
-          <%= f.select :author_id, options_for_select(post_authors_select_options, @post.author_id || try_spree_current_user.id), {}, { class: 'custom-select' } %>
+          <%= f.select :author_id, options_for_select(post_authors_select_options, @post.author_id || try_spree_current_user.id), {}, { data: { controller: 'autocomplete-select' } } %>
         </div>
 
         <div class="form-group">
           <%= f.label :post_category_id, Spree.t(:category) %>
-          <%= f.select :post_category_id, options_for_select(current_store.post_categories.pluck(:title, :id), @post.post_category_id), { include_blank: true }, { class: 'custom-select' } %>
+          <%= f.select :post_category_id, options_for_select(@post_categories.pluck(:title, :id), @post.post_category_id), { include_blank: true }, { data: { controller: 'autocomplete-select' } } %>
         </div>
 
         <div class="form-group">

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

@@ -13,10 +13,10 @@
       <table class="table">
         <thead class="text-muted">
           <tr>
-            <th><%= Spree.t(:title) %></th>
+            <th><%= sort_link @search, :title, Spree.t(:title) %></th>
             <th><%= Spree.t(:category) %></th>
             <th><%= Spree.t(:author) %></th>
-            <th><%= Spree.t(:published_at) %></th>
+            <th><%= sort_link @search, :published_at, Spree.t(:published_at) %></th>
             <th></th>
           </tr>
         </thead>

data/app/views/spree/admin/stores/new.html.erb

@@ -14,6 +14,7 @@
                     <%= f.text_field :name, class: 'form-control',
                                           placeholder: Spree.t(:store_name),
                                           required: true,
+                                          autofocus: true,
                                           data: {
                                             enable_button_target: 'input',
                                           } %>

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

@@ -43,7 +43,7 @@
 
       <div class="col-lg-4">
         <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">
-          <span class="text-muted"><%= Spree.t('admin.member_since') %></span>
+          <span class="text-muted"><%= Spree.t(:created_at) %></span>
           <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">
             <%= local_time(@user.created_at) %>
           </span>

data/config/initializers/chartkick.rb

@@ -1,5 +1,5 @@
 Chartkick.options = {
-  colors: ["#007bff"],
+  colors: ["#0090FE"],
   zeros: true,
   points: false
 }

data/config/locales/en.yml

@@ -19,7 +19,6 @@ en:
               active: Setting products to active will make those products available on the storefront.
               archived: Setting products to archived will hide them from storefront.
               draft: Setting products to draft will hide them from storefront.
-              ready_for_review: We will notify your partners that these products are ready for review. Your partners will be able to review and publish these products.
           status_updated: Status updated
           title:
             add_tags: Add tags
@@ -80,7 +79,6 @@ en:
       manage_stock_locations: Manage Stock Locations
       manage_taxons: Manage Taxons
       manage_zones: Manage Zones
-      member_since: Member since
       name: Name
       navigation:
         nested_under: Nested under
@@ -160,7 +158,7 @@ en:
         by_stock: By stock
         deleted: Deleted
         draft: Draft
-        help_bubble: Draft & Ready for Review statuses mean that the product isn't available for purchase. Active means that the product is live. Vendors can move product from draft to ready for review, but only marketplace operators can move product from ready for review to active
+        help_bubble: Draft products aren't available for purchase. Active products are live.
         in_stock: In Stock
         inventory:
           barcode: Barcode (ISBN, UPC, GTIN, etc.)
@@ -175,7 +173,7 @@ en:
           available_on: Marks when the product will be released, put a future date to indicate that this is a pre-order
           discontinue_on: Marks when the product should be automatically taken off from your site
           make_active_at: Marks when the product should be automatically promoted to "active" state
-          status: Draft - initial status. Ready For Review - inform store owner that product can be checked before activation
+          status: Draft products aren't available for purchase. Active products are live.
         stores:
           choose_stores: Choose which stores this product should be available in
         variants:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-09 00:00:00.000000000 Z
+date: 2025-04-22 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.0.1
+        version: 5.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -520,6 +520,7 @@ files:
 - app/views/spree/admin/digital_assets/index.html.erb
 - app/views/spree/admin/digital_assets/new.html.erb
 - app/views/spree/admin/digital_assets/update.turbo_stream.erb
+- app/views/spree/admin/errors/forbidden.html.erb
 - app/views/spree/admin/exports/_export.html.erb
 - app/views/spree/admin/exports/create.turbo_stream.erb
 - app/views/spree/admin/exports/index.html.erb
@@ -687,7 +688,7 @@ files:
 - app/views/spree/admin/page_sections/update.turbo_stream.erb
 - app/views/spree/admin/pages/_filters.html.erb
 - app/views/spree/admin/pages/_form.html.erb
-- app/views/spree/admin/pages/_page.erb
+- app/views/spree/admin/pages/_page.html.erb
 - app/views/spree/admin/pages/edit.html.erb
 - app/views/spree/admin/pages/index.html.erb
 - app/views/spree/admin/pages/new.html.erb
@@ -1058,9 +1059,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.0.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.1
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.2
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/views/spree/admin/pages/_page.erb

@@ -1,8 +0,0 @@
-<tr id="<%= dom_id page %>" data-controller="row-link" class="cursor-pointer">
-  <td scope="row" data-action="click->row-link#openLink">
-    <%= link_to page.name, spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), data: { row_link_target: :link } %>
-  </td>
-  <td data-action="click->row-link#openLink">
-    <%= local_time_ago(page.updated_at, class: 'with-tip') %>
-  </td>
-</tr>