spree_admin 5.1.0.rc1 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb0755ba829d1de51777fd66fa98729eb800e9e16987ac363aa681234e7e753
-  data.tar.gz: 45e85e834bd1d24a4b06c326c67da0cf3ba4e8e6d659aab47092274545e37c4b
+  metadata.gz: ccc54cd595d9baf8f9e0f76c71b4682977fcac768b4ac6f5fe911fdd24c5d373
+  data.tar.gz: 969cf056d3745ae281b89421893ccef0ade5f41bcabacd5bc81254cc8404aa7b
 SHA512:
-  metadata.gz: d80798a2622f42da2419e1fc3d97ad57a7f54f15464179200a27ac445c4ffdb6f154b08ea735d21b542e85583aa0e4bd2c2cc90cecb273a07e25d3bd4ea4c456
-  data.tar.gz: b0028cb04dbfa94bc254045ab7316effbf0b9b4f23a1c3923ce7bf570b873a122091f82f016052a7d3d1e45eb1e58eda9d49b1081f935604e432a7a3d8df462b
+  metadata.gz: 1dbf7da3b5c957af7f63e69425516a4ecf45901cba3364db52356e63d00ced386a9031863025c67a68a5519d93ad904a1f6af4c2facd6ef4544e8c8104733846
+  data.tar.gz: bc6c07589f1aef8e58de7c5f025f98155cfa65a7bc6f0db41661ccd156cebf46d1134ff37192cbe9df8d77b66292ff7e0e6f21e0b3b205039f7098b25b38a2d6

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

@@ -86,8 +86,8 @@ strong {
 .w-15 {
   width: 15%;
 }
-.w-25 {
-  width: 25%;
+.w-20 {
+  width: 20%;
 }
 .w-25 {
   width: 25%;
@@ -322,10 +322,6 @@ small,
 
 // tailwind matchers
 
-.w-20 {
-  width: 20%;
-}
-
 .gap-1 {
   gap: calc($spacer / 4);
 }

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

@@ -10,7 +10,7 @@ module Spree
       before_action :load_order_items, only: :edit
       before_action :load_user, only: [:index]
 
-      helper_method :model_class
+      helper_method :model_class, :object_url
 
       # POST /admin/orders
       def create
@@ -108,6 +108,11 @@ module Spree
       def model_class
         Spree::Order
       end
+
+      # needed to show the delete button in the content header
+      def object_url
+        spree.admin_order_path(@order)
+      end
     end
   end
 end

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

@@ -8,13 +8,7 @@ module Spree
       def edit; end
 
       def update
-        locale_translation_params = permitted_translation_params.to_h.transform_values do |translations|
-          translations[@selected_translation_locale]
-        end
-
-        Mobility.with_locale(@selected_translation_locale) do
-          @resource.update!(locale_translation_params)
-        end
+        @resource.update!(permitted_translation_params)
 
         flash[:success] = Spree.t('notice_messages.translations_saved')
 
@@ -28,11 +22,20 @@ module Spree
       private
 
       def permitted_translation_params
-        params.require(:translation).permit(
-          resource_class.translatable_fields.each_with_object({}) do |field, acc|
-            acc[field] = current_store.supported_locales_list.map(&:to_sym)
-          end
-        )
+        params.require(@resource.model_name.param_key).permit(translation_fields(resource_class), **nested_params)
+      end
+
+      def nested_params
+        case resource_class.to_s
+          when 'Spree::OptionType'
+            { option_values_attributes: [ :id, *translation_fields(Spree::OptionValue)] }
+          else
+            {}
+        end
+      end
+
+      def translation_fields(klass)
+        klass.translatable_fields.map { |field| "#{field}_#{@selected_translation_locale}" }
       end
 
       def resource_class
@@ -61,20 +64,23 @@ module Spree
 
       def load_data
         @locales = (current_store.supported_locales_list - [@default_locale]).sort
+        @resource_name = @resource.try(:name)
 
-        case @resource
-        when Spree::Product
-          @resource_name = @resource.name
-          @back_path = spree.edit_admin_product_path(@resource)
-        when Spree::Taxon
-          @resource_name = @resource.name
-          @back_path = spree.edit_admin_taxonomy_taxon_path(@resource.taxonomy, @resource.id)
-        when Spree::Taxonomy
-          @resource_name = @resource.name
-          @back_path = spree.edit_admin_taxonomy_path(@resource)
-        when Spree::Store
-          @resource_name = @resource.name
-          @back_path = spree.edit_admin_store_path(section: "general-settings")
+        @back_path = case @resource.class.name
+          when 'Spree::OptionType'
+            spree.edit_admin_option_type_path(@resource)
+          when 'Spree::Product'
+            spree.edit_admin_product_path(@resource)
+          when 'Spree::Property'
+            spree.edit_admin_property_path(@resource)
+          when 'Spree::Store'
+            spree.edit_admin_store_path(section: "general-settings")
+          when 'Spree::Taxon'
+            spree.edit_admin_taxonomy_taxon_path(@resource.taxonomy, @resource.id)
+          when 'Spree::Taxonomy'
+            spree.admin_taxonomy_path(@resource)
+          else
+            [:edit, :admin, @resource]
         end
       end
     end

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

@@ -233,10 +233,6 @@ module Spree
         end
       end
 
-      def spree_dom_id(record)
-        dom_id(record, 'spree')
-      end
-
       # renders a red dot with a * to indicate that a field is required
       # @return [String] the required span tag
       def required_span_tag

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

@@ -28,6 +28,7 @@ export default class extends Controller {
         'This Month', 'Last Month'],
         position: 'left'
       },
+      lang: Spree.locale
     })
 
     this.picker.on('render', () => {

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

@@ -3,6 +3,10 @@
   <%= @option_type.presentation %>
 <% end %>
 
+<% content_for :page_actions_dropdown do %>
+  <%= link_to_edit_translations(@option_type) %>
+<% end %>
+
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>
 
 <%= form_for [:admin, @option_type], data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } do |f| %>

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

@@ -8,7 +8,7 @@
 
     <div class="form-group mb-0">
       <%= f.label :description, Spree.t(:description) %>
-      <div class="border rounded mb-0">
+      <div class="trix-container mb-0">
         <%= f.text_area :description, { rows: 10, class: "form-control spree-rte", data: { seo_form_target: 'sourceDescriptionInput' } } %>
       </div>
     </div>

data/app/views/spree/admin/properties/_property.html.erb

@@ -3,7 +3,7 @@
     <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>
   </td>
   <td class="w-20 cursor-pointer py-0" data-action="click->row-link#openLink">
-    <code><%= property.name %></vode>
+    <code><%= property.name %></code>
   </td>
   <td class="w-20 cursor-pointer" data-action="click->row-link#openLink">
     <%= link_to property.presentation, spree.edit_admin_property_path(property), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link } %>
@@ -22,4 +22,4 @@
   <td class="w-10 actions">
     <%= link_to_edit(property, class: 'btn btn-light btn-sm') if can?(:edit, property) %>
   </td>
-</tr>
+</tr>

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

@@ -3,6 +3,9 @@
   <%= @property.presentation %>
 <% end %>
 
+<% content_for :page_actions_dropdown do %>
+  <%= link_to_edit_translations(@property) %>
+<% end %>
 
 <%= form_for [:admin, @property] do |f| %>
   <div class="row">

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

@@ -56,4 +56,5 @@
 <script>
   window.Spree = window.Spree || {}
   Spree.adminPath = '<%= spree.admin_path %>'
+  Spree.locale = '<%= I18n.locale %>'
 </script>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -26,7 +26,7 @@
     <% end %>
   </div>
 
-  <div class="d-flex align-items-center px-3 ml-3">
+  <div class="d-flex align-items-center px-3 ml-3 gap-2">
     <%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link }) if can?(:edit, taxon) %>
 
     <div class="dropdown h-100">

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

@@ -7,7 +7,7 @@
 <% end %>
 
 <%= content_for(:page_actions) do %>
-  <%= link_to_edit_translations(@store, classes: 'btn btn-light') %>
+  <%= link_to_edit_translations(@store) %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-5 pb-5' %>

data/app/views/spree/admin/stores/form/_basic.html.erb

@@ -2,8 +2,8 @@
   <%= Spree.t(:store_details) %>
 <% end %>
 
-<%= content_for(:page_actions) do %>
-  <%= link_to_edit_translations(@store, classes: 'btn btn-light') %>
+<%= content_for(:page_actions_dropdown) do %>
+  <%= link_to_edit_translations(@store) %>
 <% end %>
 
 <div class="row">
@@ -43,7 +43,7 @@
 
         <div class="form-group">
           <%= f.label :address, Spree.t(:address) %>
-          <%= f.text_area :address, class: 'form-control', data: { controller: 'textarea-autogrow' } %>
+          <%= f.text_area :address, rows: 5, class: 'form-control', data: { controller: 'textarea-autogrow' } %>
         </div>
       </div>
     </div>

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

@@ -4,42 +4,50 @@
 <% end %>
 <% if @locales.any?%>
   <% if @locales.many? %>
-    <%= form_with url: spree.edit_admin_translation_path(@resource, resource_type: @resource.class.to_s), class: "w-100 d-flex justify-content-end", data: { controller: 'auto-submit', turbo_frame: 'translations_table'}, method: :get do |f| %>
+    <%= form_with url: spree.edit_admin_translation_path(@resource, resource_type: @resource.class.to_s), class: "w-100 d-flex justify-content-end mb-3", data: { controller: 'auto-submit', turbo_frame: 'translations_table'}, method: :get do |f| %>
       <div class="form-inline gap-2">
         <%= f.label :translation_locale, Spree.t(:language) %>
         <%= f.select :translation_locale, options_for_select(@locales.map { |locale| [Spree.t('i18n.this_file_language', locale: locale), locale] }, @selected_translation_locale), {}, { class: 'custom-select', data: { action: 'change->auto-submit#submit' } } %>
       </div>
     <% end %>
   <% end %>
-  <%= form_with url: spree.admin_translation_path(@resource, resource_type: @resource.class.to_s), method: :put, class: 'form-horizontal' do |f| %>
-    <%= turbo_frame_tag :translations_table, class: "table-responsive border rounded bg-white my-3", refresh: "morph" do %>
-      <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
-      <table class="table">
-        <thead>
-          <tr>
-            <th scope="col" class="text-center"><%= Spree.t(:field) %></th>
-            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
-            <th scope="col" class="text-center"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% options = { resource: @resource, selected_translation_locale: @selected_translation_locale } %>
-          <% case @resource %>
-          <% when Spree::Product %>
-            <%= render 'spree/admin/translations/products/form', options %>
-          <% when Spree::Taxon %>
-            <%= render 'spree/admin/translations/taxons/form', options %>
-          <% when Spree::Taxonomy %>
-            <%= render 'spree/admin/translations/taxonomies/form', options %>
-          <% when Spree::Store %>
-            <%= render 'spree/admin/translations/stores/form', options %>
-          <% end %>
-        </tbody>
-      </table>
-    <% end %>
-    <div class="form-actions">
+  <%= form_with model: @resource, url: spree.admin_translation_path(@resource, resource_type: @resource.class.to_s), method: :put, class: 'form-horizontal' do |f| %>
+    <div class="card mb-4">
+      <div class="card-body p-0">
+        <%= turbo_frame_tag :translations_table, refresh: "morph" do %>
+          <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
+          <table class="table">
+            <thead>
+              <tr>
+                <th scope="col" class="w-10"><%= Spree.t(:field) %></th>
+                <th scope="col" class="w-40"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
+                <th scope="col" class="w-50"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
+              </tr>
+            </thead>
+            <tbody>
+              <% options = { f: f, resource: @resource, locale: @selected_translation_locale } %>
+              <% case @resource.class.name %>
+              <% when 'Spree::OptionType' %>
+                <%= render 'spree/admin/translations/option_types/form', options %>
+              <% when 'Spree::Product' %>
+                <%= render 'spree/admin/translations/products/form', options %>
+              <% when 'Spree::Property' %>
+                <%= render 'spree/admin/translations/properties/form', options %>
+              <% when 'Spree::Store' %>
+                <%= render 'spree/admin/translations/stores/form', options %>
+              <% when 'Spree::Taxon' %>
+                <%= render 'spree/admin/translations/taxons/form', options %>
+              <% when 'Spree::Taxonomy' %>
+                <%= render 'spree/admin/translations/taxonomies/form', options %>
+              <% end %>
+            </tbody>
+          </table>
+        <% end %>
+      </div>
+    </div>
+    <div class="form-actions d-flex justify-content-between">
       <%= turbo_save_button_tag Spree.t('actions.update') %>
-      <%= link_to Spree.t('actions.cancel'), @back_path, class: 'btn btn-light ml-auto' %>
+      <%= link_to Spree.t('actions.discard'), @back_path, class: 'btn btn-light', data: { turbo_frame: '_top' } %>
     </div>
   <% end %>
 <% else %>

data/app/views/spree/admin/translations/option_types/_form.html.erb

@@ -0,0 +1,21 @@
+<%# locals: (f:, resource:, locale:) %>
+
+<% resource.class.translatable_fields.each do |field| %>
+  <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
+<% end %>
+
+<% if resource.option_values.any? %>
+  <tr class="bg-light">
+    <th colspan="3"><%= Spree.t(:option_values) %></th>
+  </tr>
+
+  <%= f.fields_for :option_values do |ff| %>
+    <% ff.object.class.translatable_fields.each do |field| %>
+      <tr>
+        <td><%= Spree.t(field) %></td>
+        <td><%= ff.object.send(field) %></td>
+        <td><%= ff.text_field "#{field}_#{locale}", class: 'form-control' %></td>
+      </tr>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/translations/products/_form.html.erb

@@ -1,23 +1,12 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <% if field == :meta_keywords %>
-    <% next %>
+  <% case field%>
+  <% when :description %>
+    <%= render "spree/admin/translations/translation_rows/tinymce_row", f: f, field: field, locale: locale %>
+  <% when :meta_description %>
+    <%= render "spree/admin/translations/translation_rows/textarea_row", f: f, field: field, locale: locale %>
+  <% else %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
   <% end %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="border rounded mb-0">
-            <%= text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { rows: 10, class: "form-control spree-rte", readonly: readonly, contenteditable: !readonly } %>
-          </div>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
 <% end %>

data/app/views/spree/admin/translations/properties/_form.html.erb

@@ -0,0 +1,5 @@
+<%# locals: (f:, resource:, locale:) %>
+
+<% resource.class.translatable_fields.each do |field| %>
+  <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
+<% end %>

data/app/views/spree/admin/translations/stores/_form.html.erb

@@ -1,25 +1,14 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <% if field == :meta_keywords %>
-    <% next %>
+  <% next if field == :meta_keywords %>
+
+  <% case field %>
+  <% when :description %>
+    <%= render "spree/admin/translations/translation_rows/rich_textarea_row", f: f, field: field, locale: locale %>
+  <% when :address, :meta_description %>
+    <%= render "spree/admin/translations/translation_rows/textarea_row", f: f, field: field, locale: locale %>
+  <% else %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
   <% end %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="trix-container mb-0">
-            <%= rich_text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { contenteditable: !readonly } %>
-          </div>
-        <% when :address %>
-          <%= text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly, data: { controller: 'textarea-autogrow'} %>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
 <% end %>

data/app/views/spree/admin/translations/taxonomies/_form.html.erb

@@ -1,20 +1,5 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="trix-container mb-0">
-            <%= rich_text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { contenteditable: !readonly } %>
-          </div>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
+  <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
 <% end %>

data/app/views/spree/admin/translations/taxons/_form.html.erb

@@ -1,37 +1,14 @@
+<%# locals: (f:, resource:, locale:) %>
+
 <% resource.class.translatable_fields.each do |field| %>
-  <% if field == :pretty_name %>
-    <% next %>
+  <% next if field == :pretty_name %>
+
+  <% case field %>
+  <% when :description %>
+    <%= render "spree/admin/translations/translation_rows/rich_textarea_row", f: f, field: field, locale: locale %>
+  <% when :permalink %>
+    <%= render "spree/admin/translations/translation_rows/permalink_field_row", f: f, field: field, locale: locale %>
+  <% else %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
   <% end %>
-  <tr>
-    <td class="text-left">
-      <%= Spree.t(field) %>
-    </td>
-    <% [@default_locale, selected_translation_locale].each do |translation_locale| %>
-      <% readonly = translation_locale == @default_locale %>
-      <td <% if readonly %>style="width: 40%;"<% else %>style="width: 60%;"<% end %>>
-        <% case field%>
-        <% when :description %>
-          <div class="trix-container mb-0">
-            <%= rich_text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { contenteditable: !readonly } %>
-          </div>
-        <% when :permalink %>
-          <% parent_permalink = resource.parent.present? ? I18n.with_locale(translation_locale) { resource.parent.permalink } + "/" : "" %>
-          <div class="form-group">
-            <div class="input-group">
-              <% if parent_permalink.present? %>
-                <div class="input-group-prepend">
-                  <span class="input-group-text">
-                    <%= parent_permalink %>
-                  </span>
-                </div>
-              <% end %>
-              <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field)&.delete_prefix(parent_permalink), class: 'form-control', readonly: readonly %>
-            </div>
-          </div>
-        <% else %>
-          <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
-        <% end %>
-      </td>
-    <% end %>
-  </tr>
 <% end %>

data/app/views/spree/admin/translations/translation_rows/_permalink_field_row.html.erb

@@ -0,0 +1,33 @@
+<%# locals: (f:, field:, locale:) %>
+
+<%
+  parent = f.object.parent
+
+  base_permalink = parent.present? ? parent.send(field).to_s + "/" : ""
+  value = f.object.send(field)&.delete_prefix(base_permalink)
+
+  base_permalink_translated = parent.present? ? I18n.with_locale(locale) { parent.send(field) } + "/" : ""
+  translated_value = f.object.send("#{field}_#{locale}")&.delete_prefix(base_permalink_translated)
+%>
+
+<tr>
+  <td><%= Spree.t(field) %></td>
+  <td>
+    <code>
+      <%= f.object.permalink %>
+    </code>
+  </td>
+  <td>
+    <div class="form-group">
+      <div class="input-group">
+        <% if base_permalink_translated.present? %>
+          <div class="input-group-prepend">
+            <span class="input-group-text"><%= base_permalink_translated %></span>
+          </div>
+        <% end %>
+
+        <%= f.text_field "#{field}_#{locale}", value: translated_value, class: 'form-control' %>
+      </div>
+    </div>
+  </td>
+</tr>

data/app/views/spree/admin/translations/translation_rows/_rich_textarea_row.html.erb

@@ -0,0 +1,13 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td><%= Spree.t(field) %></td>
+  <td class="text-wrap">
+    <%= @resource.send(field)%>
+  </td>
+  <td>
+    <div class="trix-container mb-0">
+      <%= f.rich_text_area "#{field}_#{locale}" %>
+    </div>
+  </td>
+</tr>

data/app/views/spree/admin/translations/translation_rows/_text_field_row.html.erb

@@ -0,0 +1,7 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td><%= Spree.t(field) %></td>
+  <td><%= @resource.send(field) %></td>
+  <td><%= f.text_field "#{field}_#{locale}", class: 'form-control' %></td>
+</tr>

data/app/views/spree/admin/translations/translation_rows/_textarea_row.html.erb

@@ -0,0 +1,11 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td><%= Spree.t(field) %></td>
+  <td>
+    <%= @resource.send(field) %>
+  </td>
+  <td>
+    <%= f.text_area "#{field}_#{locale}", rows: 5, class: "form-control", data: { controller: 'textarea-autogrow'} %>
+  </td>
+</tr>

data/app/views/spree/admin/translations/translation_rows/_tinymce_row.html.erb

@@ -0,0 +1,13 @@
+<%# locals: (f:, field:, locale:) %>
+
+<tr>
+  <td><%= Spree.t(field) %></td>
+  <td>
+    <%= @resource.send(field) %>
+  </td>
+  <td>
+    <div class="trix-container">
+      <%= f.text_area "#{field}_#{locale}", rows: 10, class: "form-control spree-rte" %>
+    </div>
+  </td>
+</tr>

data/app/views/spree/admin/variants/form/_inventory.html.erb

@@ -4,8 +4,18 @@
       <%= Spree.t(:inventory) %>
     </h5>
   </div>
-  <div class="card-body p-0">
-    <table class="table">
+  <div class="card-body p-0" data-controller="reveal" data-reveal-hidden-class="d-none">
+    <div class="custom-control custom-checkbox mb-4 m-3">
+      <%= f.check_box :track_inventory,
+            class: 'custom-control-input',
+            data: {
+              action: 'change->reveal#toggle'
+            }
+          %>
+      <%= f.label :track_inventory, Spree.t(:track_quantity), class: 'custom-control-label' %>
+    </div>
+
+    <table class="table <%= 'd-none' unless f.object.track_inventory? %>" data-reveal-target="item">
       <thead>
         <tr>
           <th><%= Spree.t(:stock_location) %></th>

data/lib/spree/admin/testing_support/capybara_utils.rb

@@ -35,10 +35,6 @@ module Spree
         rescue Selenium::WebDriver::Error::TimeoutError
           default_options[:error].nil? ? false : raise(default_options[:error])
         end
-
-        def fill_in_trix_editor(id, with:)
-          page.find(id, visible: :all).click.set(with)
-        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.0.rc1
+  version: 5.1.1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 2025-07-08 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.0.rc1
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.rc1
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.rc1
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.rc1
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -1040,10 +1040,17 @@ files:
 - app/views/spree/admin/themes/update.turbo_stream.erb
 - app/views/spree/admin/translations/_translations_unavailable.html.erb
 - app/views/spree/admin/translations/edit.html.erb
+- app/views/spree/admin/translations/option_types/_form.html.erb
 - app/views/spree/admin/translations/products/_form.html.erb
+- app/views/spree/admin/translations/properties/_form.html.erb
 - app/views/spree/admin/translations/stores/_form.html.erb
 - app/views/spree/admin/translations/taxonomies/_form.html.erb
 - app/views/spree/admin/translations/taxons/_form.html.erb
+- app/views/spree/admin/translations/translation_rows/_permalink_field_row.html.erb
+- app/views/spree/admin/translations/translation_rows/_rich_textarea_row.html.erb
+- app/views/spree/admin/translations/translation_rows/_text_field_row.html.erb
+- app/views/spree/admin/translations/translation_rows/_textarea_row.html.erb
+- app/views/spree/admin/translations/translation_rows/_tinymce_row.html.erb
 - app/views/spree/admin/user_passwords/edit.html.erb
 - app/views/spree/admin/user_passwords/new.html.erb
 - app/views/spree/admin/user_sessions/new.html.erb
@@ -1138,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.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.rc1
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.1
 post_install_message:
 rdoc_options: []
 require_paths: