spree_backend 4.4.0.rc1 → 4.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d5367f1dbc355de3ae28ae2d8fe99c2325c64cb88755bc48086973c92ae89c
-  data.tar.gz: a39a64d3fd3282f581dbd4bf208b4527ab1a3bcf21587b190a938688c085e4f4
+  metadata.gz: ebcc48cb4029196c2f92245da41148073d38eb79ab6e26a97870bad59e266364
+  data.tar.gz: 28613b605a0464f4e0e3ebd4d9b6eb0179267b3465e156830c8824d84ba5a70d
 SHA512:
-  metadata.gz: 8f1009715e9017806b2c7c139b26bf48fb70d6c074b183ca61135044a0ea4cc48ffa385423aa412a84913d2d74de57e68474a7cacd391812d583421432bcdaa3
-  data.tar.gz: '0684732d6c1df365155d75d7aaa84b11da1e293b05792e89ad9a5f56cf8b4fbe76754610bbf42c86ebde985de62093e677b11484340563c1899c73e2b7d1ada6'
+  metadata.gz: c17c6967cc3daf6e6dfe6bda173cb8214b1da6662c601f08cd4657de6c2e7d1883151d832d7a7a10971148b673346c28864e7b3491dea8949674a41424d9fd01
+  data.tar.gz: 6e4366fb5d2ca9fb24e796ca478e2063831e5448760f1771bb4410fbf0981f32ea860734de786f54bb30504224a481c0f6f7b60dcc420547135f763119b5b28a

data/.gitignore

@@ -61,3 +61,4 @@ node_modules
 app/assets/javascripts/spree-dashboard.js
 app/assets/javascripts/spree-dashboard.*.js
 src
+*.gem

data/Gemfile

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

data/app/assets/javascripts/spree/backend/address_states.es6

@@ -4,6 +4,8 @@ function updateAddressState(region, successCallback) {
   const stateSelect = $('#' + region + 'state select')
   const stateInput = $('#' + region + 'state input.state_name')
 
+  if (!countryId) { return }
+
   fetch(Spree.routes.countries_api_v2 + '/' + countryId + '?include=states', {
     headers: Spree.apiV2Authentication()
   }).then((response) => {

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

@@ -21,3 +21,9 @@ document.addEventListener("spree:load", function() {
   flatpickr('.datepicker', {})
 })
 
+document.addEventListener("turbo:before-cache", function() {
+  document.querySelectorAll('.datePickerFrom, .datePickerTo, .datepicker').forEach(function(element) {
+    element._flatpickr.destroy()
+  })
+})
+

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

@@ -25,6 +25,13 @@ document.addEventListener("spree:load", function() {
   loadAutoCompleteParams()
 })
 
+// we need to delete select2 instances before document is saved to cache
+// https://stackoverflow.com/questions/36497723/select2-with-ajax-gets-initialized-several-times-with-rails-turbolinks-events
+document.addEventListener("turbo:before-cache", function() {
+  const select2Autocompletes = document.querySelectorAll('select[data-autocomplete-url-value]')
+  select2Autocompletes.forEach(element => $(element).select2('destroy'))
+})
+
 // eslint-disable-next-line no-unused-vars
 function loadAutoCompleteParams() {
   const select2Autocompletes = document.querySelectorAll('select[data-autocomplete-url-value]')

data/app/assets/javascripts/spree/backend/spree-select2.js

@@ -1,3 +1,10 @@
+// we need to delete select2 instances before document is saved to cache
+// https://stackoverflow.com/questions/36497723/select2-with-ajax-gets-initialized-several-times-with-rails-turbolinks-events
+document.addEventListener("turbo:before-cache", function() {
+  $('select.select2').select2('destroy')
+  $('select.select2-clear').select2('destroy')
+})
+
 document.addEventListener("spree:load", function() {
   // Initiate a standard Select2 on any select element with the class .select2
   // Remember to add a place holder in the HTML as needed.

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     class ReturnIndexController < BaseController
       def return_authorizations
-        collection(Spree::ReturnAuthorization)
+        collection(Spree::ReturnAuthorization.for_store(current_store))
         respond_with(@collection)
       end
 
@@ -18,9 +18,8 @@ module Spree
 
         params[:q] ||= {}
 
-        @collection = resource.all
         # @search needs to be defined as this is passed to search_form_for
-        @search = @collection.ransack(params[:q])
+        @search = resource.ransack(params[:q])
         per_page = params[:per_page] || Spree::Backend::Config[:admin_customer_returns_per_page]
         @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)
       end

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

@@ -231,7 +231,6 @@
       <%= f.select :option_type_ids, options_from_collection_for_select(@product.option_types, :id, :name, @product.option_type_ids),
                                       { include_hidden: true },
                                         multiple: true,
-                                        class: 'select2-hidden-accessible',
                                         data: { autocomplete_url_value: 'option_types_api_v2',
                                                 autocomplete_return_attr_value: 'name',
                                                 autocomplete_multiple_value: true } %>

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

@@ -10,7 +10,6 @@
   <div data-hook="admin_products_sidebar">
 
     <%= search_form_for [:admin, @search] do |f| %>
-      <%- locals = {f: f} %>
       <div data-hook="admin_products_index_search" class="row">
         <div class="col-12 col-lg-6">
           <div class="form-group">

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

@@ -152,7 +152,7 @@
       <% end %>
       <%= f.field_container :checkout_zone_id do %>
         <%= f.label :checkout_zone_id, Spree.t(:zone) %>
-        <%= f.select :checkout_zone_id, options_for_select(@zones, selected_checkout_zone(@store)&.id), { include_blank: Spree.t(:no_limits_zone) }, { class: 'select2' } %>
+        <%= f.select :checkout_zone_id, options_for_select(@zones), { include_blank: Spree.t(:no_limits_zone) }, { class: 'select2' } %>
         <small class="form-text text-muted">
           <%= raw(Spree.t('store_form.checkout_zone_help')) %>
         </small>

data/lib/spree/backend/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Backend
-    VERSION = '4.4.0.rc1'.freeze
+    VERSION = '4.4.0.rc2'.freeze
 
     def self.version
       VERSION

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spree/dashboard",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "Spree Dashboard",
   "main": "app/assets/javascripts/spree-dashboard.js",
   "type": "module",
@@ -22,7 +22,6 @@
     "@hotwired/stimulus": "^3.0.1",
     "@hotwired/turbo": "^7.0.1",
     "@rails/request.js": "^0.0.5",
-    "@spree/dashboard": "^0.0.3",
     "bootstrap": "4.6.1",
     "flatpickr": "^4.6.9",
     "jquery": "3.5.1",

data/yarn.lock

@@ -101,21 +101,6 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@spree/dashboard@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/@spree/dashboard/-/dashboard-0.0.3.tgz#efa6488953d8dc2b3dd1011dd82e79464bb314a1"
-  integrity sha512-a5txJwwZ7uxq3HVBpq3dlwcO+rPzmqmj9IMMDNyPr3iTPQpZmoX6pL3xcJ9h/Bc8ddfPBqETI8S7YxRjY4GwGA==
-  dependencies:
-    "@hotwired/stimulus" "^3.0.1"
-    "@hotwired/turbo" "^7.0.1"
-    "@rails/request.js" "^0.0.5"
-    bootstrap "4.6.1"
-    flatpickr "^4.6.9"
-    jquery "3.5.1"
-    popper.js "1.16.1"
-    sortablejs "^1.14.0"
-    stimulus-sortable "^3.1.0"
-
 "@types/estree@*":
   version "0.0.50"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.4.0.rc1
+  version: 4.4.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -900,9 +900,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.4.0.rc1
+  changelog_uri: https://github.com/spree/spree_backend/releases/tag/v4.4.0.rc2
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_backend/tree/v4.4.0.rc1
+  source_code_uri: https://github.com/spree/spree_backend/tree/v4.4.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -919,7 +919,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - none
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Admin Dashboard for Spree eCommerce platform