spree_backend 4.6.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a727db968502ab5d08a7733adecdf3d46a1657218745d63a0896b72d6c0480
-  data.tar.gz: 660d8c18a9e4f401cd72321f7b68503dc0f3784e50eda8e123f0e5ee9cf18d76
+  metadata.gz: 53af17f0ae03b42dc296d5867212669844deec1a6613c77c77d863c7160cd9ed
+  data.tar.gz: 22326cbf504f1f32d2fb8ee81cb05990d6ef2cd6a98ed68845ff5eaa7bab2b31
 SHA512:
-  metadata.gz: a7d89b1b4411316a3727d36b349f07789ce4eb07e36be7dfa7d046a8becb2acd7dad8439fc7206ca47fd4e834db7a947ef2b8a4c2ade7dbecd17e38e72e8a9b8
-  data.tar.gz: 3cf8f6c96eaef38994f05a137ddcf5cefadb9403b3582dee37fa360c3c868649622b9cc9e56586e31bec9ca97855aff03e9fbe18da23774848de9df91ad77077
+  metadata.gz: 0a2adf4c4895a8de60c84755afcca683fb13edb6e304d8691dafdd8d414274c6f4f0c768e2eae214acabc7c1a2108445b918494b14f8c18188c0b2b1c099e345
+  data.tar.gz: db8d9bd704a18c8d92c6df428b01e3a508fcff455eb56d05c5c346d7feb85bd026f9e7e9518a008ce959ecf0992f0a90423ef1881835fb72d99dc3646826e9a3

data/.circleci/config.yml

@@ -7,17 +7,11 @@ defaults: &defaults
     BUNDLE_JOBS: 4
     BUNDLE_RETRY: 3
     BUNDLE_PATH: ~/spree/vendor/bundle
-    RAILS_VERSION: '~> 7.0'
+    RAILS_VERSION: '~> 7.1.0'
   working_directory: ~/spree
-  docker:
-    - image: &ruby_2_7_image circleci/ruby:2.7-node-browsers
-    - image: &redis_image circleci/redis:6.2-alpine
-
-defaults_3_0: &defaults_3_0
-  <<: *defaults
   docker:
     - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
-    - image: *redis_image
+    - image: &redis_image circleci/redis:6.2-alpine
 
 defaults_3_2: &defaults_3_2
   <<: *defaults
@@ -25,51 +19,8 @@ defaults_3_2: &defaults_3_2
     - image: &ruby_3_2_image cimg/ruby:3.2.0-browsers
     - image: *redis_image
 
-run_tests_2_7: &run_tests_2_7
-  <<: *defaults
-  parallelism: 8
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - spree-dashboard-bundle-v10-ruby-2-7-{{ .Branch }}
-          - spree-dashboard-bundle-v10-ruby-2-7
-    - run:
-        name: Add keyserver
-        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-    - run:
-        name: Install libvips
-        command: sudo apt-get update && sudo apt-get install libvips
-    - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-    - run:
-          name: Ensure bundle Install
-          command: |
-            bundle check || bundle install
-    - run:
-        name: Create test app
-        command: |
-          bundle exec rake test_app
-    - run:
-        name: Unlink NPM package
-        command: |
-          cd spec/dummy && yarn unlink @spree/dashboard
-    - run:
-          name: Run Rspec
-          command: |
-            TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            bundle exec rspec --format documentation \
-                              --format RspecJunitFormatter \
-                              -o ~/rspec/rspec.xml \
-                              -- ${TESTFILES}
-    - store_test_results:
-          path: ~/rspec
-    - store_artifacts:
-          path: /tmp/test-artifacts
-
 run_tests_3_0: &run_tests_3_0
-  <<: *defaults_3_0
+  <<: *defaults
   parallelism: 8
   steps:
     - checkout
@@ -152,34 +103,8 @@ run_tests_3_2: &run_tests_3_2
         path: /tmp/test-artifacts
 
 jobs:
-  bundle_ruby_2_7:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - spree-dashboard-bundle-v10-ruby-2-7-{{ .Branch }}
-            - spree-dashboard-bundle-v10-ruby-2-7
-      - run:
-          name: Add keyserver
-          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
-      - run:
-          name: Install libvips
-          command: sudo apt-get update && sudo apt-get install libvips
-      - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-      - run:
-          name: Bundle Install
-          command: |
-            bundle check || bundle install
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: spree-dashboard-bundle-v10-ruby-2-7-{{ checksum "Gemfile.lock" }}
-
   bundle_ruby_3_0:
-    <<: *defaults_3_0
+    <<: *defaults
     steps:
       - checkout
       - restore_cache:
@@ -227,40 +152,35 @@ jobs:
             - vendor/bundle
           key: spree-dashboard-bundle-v10-ruby-3-2-{{ checksum "Gemfile.lock" }}
 
-  tests_ruby_2_7_rails_7_0_postgres:
-    <<: *run_tests_2_7
-    environment: &postgres_environment
+  tests_ruby_3_0_rails_7_0_postgres:
+    <<: *run_tests_3_0
+    environment:
       <<: *environment
       DB: postgres
       DB_HOST: localhost
       DB_USERNAME: postgres
+      RAILS_VERSION: '~> 7.0.0'
     docker:
-      - image: *ruby_2_7_image
-      - image: *redis_image
+      - image: *ruby_3_0_image
       - image: &postgres_image circleci/postgres:12-alpine
         environment:
           POSTGRES_USER: postgres
-
-  tests_ruby_3_0_rails_7_0_postgres:
-    <<: *run_tests_3_0
-    environment:
-      <<: *postgres_environment
-    docker:
-      - image: *ruby_3_0_image
-      - image: *postgres_image
       - image: *redis_image
 
-  tests_ruby_3_2_rails_7_0_postgres:
+  tests_ruby_3_2_rails_7_1_postgres:
     <<: *run_tests_3_2
     environment:
-      <<: *postgres_environment
+      <<: *environment
+      DB: postgres
+      DB_HOST: localhost
+      DB_USERNAME: postgres
     docker:
       - image: *ruby_3_2_image
       - image: *postgres_image
       - image: *redis_image
 
-  tests_ruby_2_7_rails_7_0_mysql:
-    <<: *run_tests_2_7
+  tests_ruby_3_2_rails_7_1_mysql:
+    <<: *run_tests_3_2
     environment:
       <<: *environment
       DB: mysql
@@ -269,7 +189,7 @@ jobs:
       COVERAGE: true
       COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
-      - image: *ruby_2_7_image
+      - image: *ruby_3_2_image
       - image: *redis_image
       - image: &mysql_image circleci/mysql:8-ram
 
@@ -277,15 +197,14 @@ workflows:
   version: 2
   main:
     jobs:
-      - bundle_ruby_2_7
       - bundle_ruby_3_0
       - bundle_ruby_3_2
-      - tests_ruby_3_2_rails_7_0_postgres:
+      - tests_ruby_3_2_rails_7_1_postgres:
           requires:
             - bundle_ruby_3_2
       - tests_ruby_3_0_rails_7_0_postgres:
           requires:
             - bundle_ruby_3_0
-      - tests_ruby_2_7_rails_7_0_mysql:
+      - tests_ruby_3_2_rails_7_1_mysql:
           requires:
-            - bundle_ruby_2_7
+            - bundle_ruby_3_2

data/.codeclimate.yml

@@ -15,7 +15,7 @@ plugins:
         enabled: false
     config:
       file: .rubocop.yml
-    channel: "rubocop-0-80" # need to keep this value the same as rubocop version
+    channel: "rubocop-1-50-2" # need to keep this value the same as rubocop version
                             # https://docs.codeclimate.com/v1.0/docs/rubocop#section-using-rubocop-s-newer-versions
   eslint:
     enabled: true

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   Exclude:
     - '**/sandbox/**/*'
     - '**/db/migrate/*'
@@ -181,7 +181,10 @@ RSpec/NamedSubject:
 RSpec/MultipleExpectations:
   Enabled: false
 
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
+RSpec/SpecFilePathSuffix:
   Enabled: false
 
 RSpec/LetSetup:

data/Gemfile

@@ -6,7 +6,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
   actionmailer actionpack actionview activejob activemodel activerecord
   activestorage activesupport railties
 ].each do |rails_gem|
-  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.0.0'), require: false
+  gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.1.0'), require: false
 end
 
 platforms :jruby do
@@ -23,21 +23,21 @@ end
 
 group :test do
   gem 'tinymce-rails'
-  gem 'capybara', '~> 3.39'
-  gem 'capybara-screenshot', '~> 1.0'
+  gem 'capybara'
+  gem 'capybara-screenshot'
   gem 'capybara-select-2'
   gem 'database_cleaner', '~> 2.0'
   gem 'email_spec'
   gem 'factory_bot_rails', '~> 6.0'
   gem 'multi_json'
-  gem 'rspec-activemodel-mocks', '~> 1.0'
-  gem 'rspec-rails', '~> 5.0'
+  gem 'rspec-activemodel-mocks'
+  gem 'rspec-rails'
   gem 'rspec-retry'
   gem 'rspec_junit_formatter'
   gem 'rswag-specs'
   gem 'jsonapi-rspec'
   gem 'simplecov', '0.22.0'
-  gem 'webmock', '~> 3.7'
+  gem 'webmock'
   gem 'timecop'
   gem 'rails-controller-testing'
   gem 'turbo-rails'
@@ -47,12 +47,11 @@ group :test, :development do
   gem 'awesome_print'
   gem 'gem-release'
   gem 'redis'
-  gem 'rubocop', '~> 1.48.1', require: false # bumped
+  gem 'rubocop', require: false
   gem 'rubocop-rspec', require: false
   gem 'pry-byebug'
-  gem 'webdrivers', '~> 5.3'
-  # Puma 6.0 causes issues in specs due to conflict with capybara version
-  gem 'puma', '< 6.0'
+  gem 'selenium-webdriver'
+  gem 'puma'
   gem 'ffaker'
 end
 
@@ -62,10 +61,7 @@ group :development do
 end
 
 
-spree_opts = { github: 'spree/spree', branch: '4-6-stable' }
+spree_opts = { github: 'spree/spree', branch: 'main' }
 gem 'spree_core', spree_opts
 gem 'spree_api', spree_opts
-# Last version that supports Ruby 2.7
-# We should remove this once we drop support for Ruby 2.7
-gem 'selenium-webdriver', '~> 4.8.1'
 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 lists'
+      'image table paste code link table'
     ],
     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 lists'
+      'image table paste link table'
     ],
     toolbar: 'undo redo | styleselect | bold italic link forecolor backcolor | alignleft aligncenter alignright alignjustify | table | bullist numlist outdent indent'
   });

data/app/assets/javascripts/spree/backend/stock_transfer.js

@@ -128,7 +128,7 @@ document.addEventListener("spree:load", function() {
 
   TransferVariants.prototype._search_transfer_stock_items = function () {
     var stockLocationId = $('#transfer_source_location_id').val()
-    return this.build_select(Spree.routes.stock_items_api_v2 + '?filter[stock_location_id_eq]=' + stockLocationId + '&include=variant', 'variant_product_name_or_variant_sku_cont')
+    return this.build_select(Spree.routes.stock_items_api_v2 + '?filter[stock_location_id_eq]=' + stockLocationId + '&include=variant', 'variants_product_name_or_variants_sku_cont')
   }
 
   TransferVariants.prototype.format_variant_result = function (result) {

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

@@ -10,6 +10,7 @@ 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
@@ -167,6 +168,27 @@ 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/helpers/spree/admin/navigation_helper.rb

@@ -1,5 +1,6 @@
 module Spree
   module Admin
+    # rubocop:disable Metrics/ModuleLength
     module NavigationHelper
       # Makes an admin navigation tab (<li> tag) that links to a routing resource under /admin.
       # The arguments should be a list of symbolized controller names that will cause this tab to
@@ -86,14 +87,6 @@ module Spree
         end
       end
 
-      # Main menu tree menu
-      def main_menu_tree(text, icon: nil, sub_menu: nil, url: '#')
-        content_tag :li, class: 'sidebar-menu-item d-block w-100 text-muted' do
-          main_menu_item(text, url: url, icon: icon) +
-            render(partial: "spree/admin/shared/sub_menu/#{sub_menu}")
-        end
-      end
-
       # the per_page_dropdown is used on index pages like orders, products, promotions etc.
       # this method generates the select_tag
       def per_page_dropdown
@@ -279,7 +272,7 @@ module Spree
       end
 
       def main_part_classes
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           Admin::NavigationHelper#main_part_classes is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         if cookies['sidebar-minimized'] == 'true'
@@ -290,7 +283,7 @@ module Spree
       end
 
       def main_sidebar_classes
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           Admin::NavigationHelper#main_sidebar_classes is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         if cookies['sidebar-minimized'] == 'true'
@@ -301,7 +294,7 @@ module Spree
       end
 
       def wrapper_classes
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           Admin::NavigationHelper#wrapper_classes is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         'sidebar-minimized' if cookies['sidebar-minimized'] == 'true'
@@ -312,6 +305,79 @@ module Spree
           svg_icon name: 'chevron-left.svg', width: 15, height: 15
         end
       end
+
+      def main_menu
+        Rails.application.config.spree_backend.main_menu
+      end
+
+      def order_tabs
+        Rails.application.config.spree_backend.tabs[:order]
+      end
+
+      def user_tabs
+        Rails.application.config.spree_backend.tabs[:user]
+      end
+
+      def product_tabs
+        Rails.application.config.spree_backend.tabs[:product]
+      end
+
+      def orders_actions
+        Rails.application.config.spree_backend.actions[:orders]
+      end
+
+      def order_actions
+        Rails.application.config.spree_backend.actions[:order]
+      end
+
+      def users_actions
+        Rails.application.config.spree_backend.actions[:users]
+      end
+
+      def user_actions
+        Rails.application.config.spree_backend.actions[:user]
+      end
+
+      def products_actions
+        Rails.application.config.spree_backend.actions[:products]
+      end
+
+      def product_actions
+        Rails.application.config.spree_backend.actions[:product]
+      end
+
+      def images_actions
+        Rails.application.config.spree_backend.actions[:images]
+      end
+
+      def prices_actions
+        Rails.application.config.spree_backend.actions[:prices]
+      end
+
+      def store_credits_actions
+        Rails.application.config.spree_backend.actions[:store_credits]
+      end
+
+      def adjustments_actions
+        Rails.application.config.spree_backend.actions[:adjustments]
+      end
+
+      def payments_actions
+        Rails.application.config.spree_backend.actions[:payments]
+      end
+
+      def stock_actions
+        Rails.application.config.spree_backend.actions[:stock]
+      end
+
+      def variants_actions
+        Rails.application.config.spree_backend.actions[:variants]
+      end
+
+      def product_properties_actions
+        Rails.application.config.spree_backend.actions[:product_properties]
+      end
+      # rubocop:enable Metrics/ModuleLength
     end
   end
 end

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

@@ -2,24 +2,6 @@ module Spree
   module Admin
     module OrdersHelper
       # Renders all the extension partials that may have been specified in the extensions
-      def event_links(order, events)
-        links = []
-        events.each do |event|
-          next unless order.send("can_#{event}?")
-
-          label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
-          links << button_link_to(
-            label.capitalize,
-            [event.to_sym, :admin, order],
-            method: :put,
-            icon: event.to_s + '.svg',
-            data: { confirm: Spree.t(:order_sure_want_to, event: label) },
-            class: 'btn-light'
-          )
-        end
-        safe_join(links, ''.html_safe)
-      end
-
       def line_item_shipment_price(line_item, quantity)
         Spree::Money.new(line_item.price * quantity, currency: line_item.currency)
       end

data/app/models/spree/admin/actions/action.rb

@@ -0,0 +1,48 @@
+module Spree
+  module Admin
+    module Actions
+      class Action
+        STYLE_CLASSES = {
+          ::Spree::Admin::Actions::ActionStyle::PRIMARY => 'btn-success',
+          ::Spree::Admin::Actions::ActionStyle::SECONDARY => 'btn-secondary',
+          ::Spree::Admin::Actions::ActionStyle::LIGHT => 'btn-light'
+        }
+
+        attr_reader :key, :label_translation_key, :icon_key, :method, :id, :target, :data_attributes
+
+        def initialize(key, label_translation_key, url, icon_key, style, availability_checks, additional_classes, method, id, target, data_attributes) # rubocop:disable Metrics/ParameterLists
+          @key = key
+          @label_translation_key = label_translation_key
+          @url = url
+          @icon_key = icon_key
+          @style = style
+          @availability_checks = availability_checks
+          @additional_classes = additional_classes
+          @method = method
+          @id = id
+          @target = target
+          @data_attributes = data_attributes
+        end
+
+        def available?(current_ability, resource = nil)
+          return true if @availability_checks.empty?
+
+          result = @availability_checks.map { |check| check.call(current_ability, resource) }
+
+          result.all?(true)
+        end
+
+        def url(resource = nil)
+          @url.is_a?(Proc) ? @url.call(resource) : @url
+        end
+
+        def classes
+          [
+            STYLE_CLASSES[@style],
+            @additional_classes
+          ].compact.join(' ')
+        end
+      end
+    end
+  end
+end

data/app/models/spree/admin/actions/action_builder.rb

@@ -0,0 +1,79 @@
+module Spree
+  module Admin
+    module Actions
+      class ActionBuilder
+        include ::Spree::Admin::PermissionChecks
+
+        def initialize(key, url)
+          @key = key
+          @label_translation_key = key
+          @url = url
+          @icon_key = nil
+          @style = ::Spree::Admin::Actions::ActionStyle::LIGHT
+          @availability_checks = []
+          @classes = ''
+          @method = nil
+          @id = nil
+          @target = nil
+          @data_attributes = {}
+        end
+
+        def with_label_translation_key(key)
+          @label_translation_key = key
+          self
+        end
+
+        def with_icon_key(icon_key)
+          @icon_key = icon_key
+          self
+        end
+
+        def with_classes(classes)
+          @classes = classes
+          self
+        end
+
+        def with_style(style)
+          @style = style
+          self
+        end
+
+        def with_method(method)
+          @method = method
+          self
+        end
+
+        def with_id(id)
+          @id = id
+          self
+        end
+
+        def with_target(target)
+          @target = target
+          self
+        end
+
+        def with_data_attributes(data_attributes)
+          @data_attributes = data_attributes
+          self
+        end
+
+        def build
+          Action.new(
+            @key,
+            @label_translation_key,
+            @url,
+            @icon_key,
+            @style,
+            @availability_checks,
+            @classes,
+            @method,
+            @id,
+            @target,
+            @data_attributes
+          )
+        end
+      end
+    end
+  end
+end

data/app/models/spree/admin/actions/action_style.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Admin
+    module Actions
+      module ActionStyle
+        PRIMARY = 'primary'
+        SECONDARY = 'secondary'
+        LIGHT = 'light'
+      end
+    end
+  end
+end

data/app/models/spree/admin/actions/adjustments_default_actions_builder.rb

@@ -0,0 +1,28 @@
+module Spree
+  module Admin
+    module Actions
+      class AdjustmentsDefaultActionsBuilder
+        include Spree::Core::Engine.routes.url_helpers
+
+        def build
+          root = Root.new
+          add_new_adjustment_action(root)
+          root
+        end
+
+        private
+
+        def add_new_adjustment_action(root)
+          action =
+            ActionBuilder.new('new_adjustment', ->(resource) { new_admin_order_adjustment_path(resource) }).
+            with_icon_key('add.svg').
+            with_style(::Spree::Admin::Actions::ActionStyle::PRIMARY).
+            with_create_ability_check(::Spree::Adjustment).
+            build
+
+          root.add(action)
+        end
+      end
+    end
+  end
+end