spree_backend 4.7.0 → 4.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53af17f0ae03b42dc296d5867212669844deec1a6613c77c77d863c7160cd9ed
-  data.tar.gz: 22326cbf504f1f32d2fb8ee81cb05990d6ef2cd6a98ed68845ff5eaa7bab2b31
+  metadata.gz: a64f6be6f1dc47fc136c7f99adf19acefe212624a332355954592d9b8ee86eee
+  data.tar.gz: af8d92cf1b6666f2f2c0488f4fce06f5bf26c2218a769ff8c3fdea0312ac8d86
 SHA512:
-  metadata.gz: 0a2adf4c4895a8de60c84755afcca683fb13edb6e304d8691dafdd8d414274c6f4f0c768e2eae214acabc7c1a2108445b918494b14f8c18188c0b2b1c099e345
-  data.tar.gz: db8d9bd704a18c8d92c6df428b01e3a508fcff455eb56d05c5c346d7feb85bd026f9e7e9518a008ce959ecf0992f0a90423ef1881835fb72d99dc3646826e9a3
+  metadata.gz: 5644b93458d102a9941ded9f1bb10f851cc538a69e3b3d5cba77e8f4a2062545a633d59b9ea6fc73db90a56e457e4b17886990fd86ea8775893627cd10fec553
+  data.tar.gz: 52f91826040b92c0ccc3e93e2c62b065b29de04ba9d1e9b31b18d03699d2388839fe46f411ea656c0a26cfd316c63513998e6fcfac391efc8e8ff4489ad07383

data/Gemfile

@@ -61,7 +61,7 @@ group :development do
 end
 
 
-spree_opts = { github: 'spree/spree', branch: 'main' }
+spree_opts = { github: 'spree/spree', branch: '4-7-stable' }
 gem 'spree_core', spree_opts
 gem 'spree_api', spree_opts
 gemspec

data/app/assets/javascripts/spree/backend/global/tinymce.es6

@@ -4,7 +4,7 @@ document.addEventListener("spree:load", function() {
   tinymce.init({
     selector: '.spree-rte',
     plugins: [
-      'image table paste code link table'
+      'image table paste code link table lists'
     ],
     menubar: false,
     toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent | code '
@@ -14,7 +14,7 @@ document.addEventListener("spree:load", function() {
     selector: '.spree-rte-simple',
     menubar: false,
     plugins: [
-      'image table paste link table'
+      'image table paste link table lists'
     ],
     toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent'
   });

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

@@ -10,7 +10,6 @@ module Spree
       before_action :set_product_defaults, only: :new
 
       create.before :create_before
-      create.before :fix_option_values_params_rails_7_1
       update.before :update_before
       update.before :skip_updating_status
       update.after :update_status
@@ -168,27 +167,6 @@ module Spree
         @prototype = Spree::Prototype.find(params[:product][:prototype_id])
       end
 
-      def fix_option_values_params_rails_7_1
-        raise 'Verify if the patch is still needed' if Rails::VERSION::STRING >= '7.2.0'
-
-        if Rails::VERSION::STRING >= '7.1.0'
-          # This is a rather ugly fix for an issue with Rails 7.1.0 and 7.1.1
-          # As an example, a form field with name = option_values_hash[1][] and value = 5
-          # gets parsed incorrectly and is visible via params as the following structure
-          # { 'option_values_hash[1' => { '][]' => 5 } }
-          # This patch fixes that behavior to ensure compatibility with the existing templates
-          option_values_hash_keys = params[:product].keys.select { |e| e.starts_with?('option_values_hash[') }
-          option_values_hash = {}
-          option_values_hash_keys.each do |key|
-            value = params[:product].delete(key)
-            fixed_key = key.gsub(/option_values_hash\[/, '')
-            option_values_hash[fixed_key] ||= []
-            option_values_hash[fixed_key] << value['][]']
-          end
-          params[:product][:option_values_hash] = option_values_hash if option_values_hash.present?
-        end
-      end
-
       def update_before
         # NOTE: we only reset the product properties if we're receiving a post
         #       from the form on that tab

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

@@ -13,7 +13,7 @@
             <% ot.option_values.each do |ov| %>
               <li>
                 <%= label_tag "option_value_#{ov.id}" do %>
-                  <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
+                  <%= check_box_tag "product[option_values_hash][#{ot.id}][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
                   <div class="option-value__color" style="--presentation: <%= ov.presentation %>"></div>
                 <% end %>
               </li>
@@ -23,7 +23,7 @@
           <ul class="option-type-values">
             <% ot.option_values.each do |ov| %>
               <li>
-                <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
+                <%= check_box_tag "product[option_values_hash][#{ot.id}][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
                 <%= label_tag "option_value_#{ov.id}", ov.presentation %>
               </li>
             <% end %>

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

@@ -15,6 +15,7 @@
         <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) && !current_spree_vendor %>
           <th><%= Spree.t(:vendor) %></th>
         <% end %>
+        <th><%= Spree.t('admin.webhooks_subscribers.secret_key') %></th>
         <th><%= Spree.t('admin.active') %></th>
         <th><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></th>
         <th><%= Spree.t('admin.webhooks_subscribers.time_of_last_event') %></th>
@@ -31,6 +32,16 @@
               <%= link_to webhooks_subscriber.vendor.name, spree.admin_vendor_path(webhooks_subscriber.vendor) if webhooks_subscriber.vendor.present? %>
             </td>
           <% end %>
+          <td>
+          <div class="input-group" data-controller="password-toggle">
+            <%= password_field_tag :password, webhooks_subscriber.secret_key, class: 'form-control unhide text-muted border-0 shadow-none bg-transparent', data: { password_toggle_target: 'unhide' }, readonly: true %>
+            <div class="input-group-append">
+              <%= button_tag class: 'btn btn-link rounded', data: { action: 'click->password-toggle#password' } do %>
+                <%= svg_icon name: "view.svg", width: '18', height: '18' %>
+              <% end %>
+            </div>
+          </div>
+        </td>
           <td><%= active_badge(webhooks_subscriber.active) %></td>
           <td><%= webhooks_subscriber.subscriptions&.sort&.join(', ') %></td>
           <td><%= webhooks_subscriber.events.order(:created_at).last&.created_at %></td>

data/lib/spree/backend/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Backend
-    VERSION = '4.7.0'.freeze
+    VERSION = '4.7.2'.freeze
 
     def self.version
       VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2446,9 +2446,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_backend/issues
-  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.7.0
+  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.7.2
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_backend/tree/v4.7.0
+  source_code_uri: https://github.com/spree/spree_backend/tree/v4.7.2
 post_install_message:
 rdoc_options: []
 require_paths: