Translations for Menu and Menu Items

.circleci/config.yml

@@ -13,10 +13,10 @@ defaults: &defaults
     - 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_3_2: &defaults_3_2
   <<: *defaults
   docker:
-    - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
+    - image: &ruby_3_2_image cimg/ruby:3.2.0-browsers
     - image: *redis_image
 
 run_tests_2_7: &run_tests_2_7
@@ -28,9 +28,12 @@ run_tests_2_7: &run_tests_2_7
         keys:
           - spree-bundle-v10-ruby-2-7-{{ .Branch }}
           - spree-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 install libvips
+        command: sudo apt-get update && sudo apt-get install libvips
     - run:
         name: Ensure Bundle Install
         command: |
@@ -48,18 +51,18 @@ run_tests_2_7: &run_tests_2_7
     - store_test_results:
         path: /tmp/test-results
 
-run_tests_3_0: &run_tests_3_0
-  <<: *defaults_3_0
+run_tests_3_2: &run_tests_3_2
+  <<: *defaults_3_2
   parallelism: 3
   steps:
     - checkout
     - restore_cache:
         keys:
-          - spree-bundle-v10-ruby-3-0-{{ .Branch }}
-          - spree-bundle-v10-ruby-3-0
+          - spree-bundle-v10-ruby-3-2-{{ .Branch }}
+          - spree-bundle-v10-ruby-3-2
     - run:
         name: Install libvips
-        command: sudo apt-get install libvips
+        command: sudo apt-get update && sudo apt-get install libvips42
     - run:
         name: Ensure Bundle Install
         command: |
@@ -86,9 +89,12 @@ jobs:
           keys:
             - spree-bundle-v10-ruby-2-7-{{ .Branch }}
             - spree-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 install libvips
+          command: sudo apt-get update && sudo apt-get install libvips
       - run:
           name: Bundle Install
           command: |
@@ -99,29 +105,29 @@ jobs:
           paths:
             - ~/spree/vendor/bundle
 
-  bundle_ruby_3_0:
-    <<: *defaults_3_0
+  bundle_ruby_3_2:
+    <<: *defaults_3_2
     steps:
       - checkout
       - restore_cache:
           keys:
-            - spree-bundle-v10-ruby-3-0-{{ .Branch }}
-            - spree-bundle-v10-ruby-3-0
+            - spree-bundle-v10-ruby-3-2-{{ .Branch }}
+            - spree-bundle-v10-ruby-3-2
       - run:
           name: Install libvips
-          command: sudo apt-get install libvips
+          command: sudo apt-get update && sudo apt-get install libvips42
       - run:
           name: Bundle Install
           command: |
             bundle check || bundle install
             ./bin/build-ci.rb install
       - save_cache:
-          key: spree-bundle-v10-ruby-3-0-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+          key: spree-bundle-v10-ruby-3-1-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
           paths:
             - ~/spree/vendor/bundle
 
   brakeman:
-    <<: *defaults_3_0
+    <<: *defaults_3_2
     steps:
       - checkout
       - restore_cache:
@@ -136,7 +142,7 @@ jobs:
       - run:
           name: Run Brakeman spree/api
           command: |
-            bundle exec brakeman -p api/ --skip-files app/controllers/spree/api/v1/ --exit-on-warn --exit-on-error
+            bundle exec brakeman -p api/ --ignore-config api/brakeman.ignore --skip-files app/controllers/spree/api/v1/ --exit-on-warn --exit-on-error
       - run:
           name: Run Brakeman spree/core
           command: |
@@ -160,12 +166,12 @@ jobs:
         environment:
           POSTGRES_USER: postgres
 
-  tests_ruby_3_0_rails_7_0_postgres:
-    <<: *run_tests_3_0
+  tests_ruby_3_2_rails_7_0_postgres:
+    <<: *run_tests_3_2
     environment:
       <<: *postgres_environment
     docker:
-      - image: *ruby_3_0_image
+      - image: *ruby_3_2_image
       - image: *postgres_image
       - image: *redis_image
 
@@ -175,8 +181,8 @@ jobs:
       <<: *postgres_environment
       RAILS_VERSION: '~> 6.1.0'
 
-  tests_ruby_3_0_rails_7_0_mysql:
-    <<: *run_tests_3_0
+  tests_ruby_3_2_rails_7_0_mysql:
+    <<: *run_tests_3_2
     environment:
       <<: *environment
       DB: mysql
@@ -185,19 +191,22 @@ jobs:
       COVERAGE: true
       COVERAGE_DIR: /tmp/workspace/simplecov
     docker:
-      - image: *ruby_3_0_image
+      - image: *ruby_3_2_image
       - image: *redis_image
       - image: circleci/mysql:8-ram
         command: [--default-authentication-plugin=mysql_native_password]
     steps:
       - checkout
       - restore_cache:
           keys:
-            - spree-bundle-v10-ruby-3-0-{{ .Branch }}
-            - spree-bundle-v10-ruby-3-0
+            - spree-bundle-v10-ruby-3-2-{{ .Branch }}
+            - spree-bundle-v10-ruby-3-2
+      - run:
+          name: Add keyserver
+          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
       - run:
           name: Install libvips
-          command: sudo apt-get install libvips
+          command: sudo apt-get update && sudo apt-get install libvips
       - run:
           name: Ensure Bundle Install
           command: |
@@ -254,22 +263,22 @@ workflows:
   main:
     jobs:
       - bundle_ruby_2_7
-      - bundle_ruby_3_0
+      - bundle_ruby_3_2
       - brakeman:
           requires:
-            - bundle_ruby_3_0
-      - tests_ruby_3_0_rails_7_0_postgres:
+            - bundle_ruby_3_2
+      - tests_ruby_3_2_rails_7_0_postgres:
           requires:
-            - bundle_ruby_3_0
+            - bundle_ruby_3_2
       - tests_ruby_2_7_rails_7_0_postgres:
           requires:
             - bundle_ruby_2_7
       - tests_ruby_2_7_rails_6_1_postgres:
           requires:
             - bundle_ruby_2_7
-      - tests_ruby_3_0_rails_7_0_mysql:
+      - tests_ruby_3_2_rails_7_0_mysql:
           requires:
-            - bundle_ruby_3_0
+            - bundle_ruby_3_2
       - send_test_coverage:
           requires:
-            - tests_ruby_3_0_rails_7_0_mysql
+            - tests_ruby_3_2_rails_7_0_mysql

api/app/controllers/spree/api/v2/base_controller.rb

@@ -82,6 +82,8 @@ def spree_current_user
           @spree_current_user ||= doorkeeper_token.resource_owner
         end
 
+        alias try_spree_current_user spree_current_user  # for compatibility with spree_legacy_frontend
+
         def spree_authorize!(action, subject, *args)
           authorize!(action, subject, *args)
         end

api/app/controllers/spree/api/v2/data_feeds/google_controller.rb

@@ -0,0 +1,24 @@
+module Spree
+  module Api
+    module V2
+      module DataFeeds
+        class GoogleController < ::Spree::Api::V2::BaseController
+          def rss_feed
+            send_data data_feeds_google_rss_service.value[:file], filename: 'products.rss', type: 'text/xml'
+          end
+
+          private
+
+          def settings
+            @settings ||= Spree::DataFeedSetting.find_by!(spree_store_id: current_store, uuid: params[:unique_url], provider: 'google', enabled: true)
+          end
+
+          def data_feeds_google_rss_service
+            Spree::Dependencies.data_feeds_google_rss_service.constantize.new.call(settings)
+          end
+        end
+      end
+    end
+  end
+end
+

api/app/controllers/spree/api/v2/platform/google_feed_settings_controller.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        class GoogleFeedSettingsController < ResourceController
+          private
+
+          def model_class
+            Spree::GoogleFeedSetting
+          end
+        end
+      end
+    end
+  end
+end

api/app/controllers/spree/api/v2/platform/taxons_controller.rb

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V2
       module Platform
-        class TaxonsController < TranslatableResourceController
+        class TaxonsController < ResourceController
           include ::Spree::Api::V2::Platform::NestedSetRepositionConcern
 
           private

api/app/controllers/spree/api/v2/platform/variants_controller.rb

@@ -16,11 +16,8 @@ def spree_permitted_attributes
           def collection
             # if filtering on products, manually join on product translation to workaround mobility-ransack issue
             if params.key?(:filter) && params[:filter].keys.any? { |k| k.include? 'product' }
-              @collection ||= scope.joins(:product).
-                                    joins("LEFT OUTER JOIN #{Product::Translation.table_name} #{Product.translation_table_alias}
-                                           ON #{Product.translation_table_alias}.spree_product_id = #{Product.table_name}.id
-                                           AND #{Product.translation_table_alias}.locale = '#{Mobility.locale.to_s}'").
-                                    ransack(params[:filter]).result
+              @collection ||= scope.joins(:product).join_translation_table(Product).
+                              ransack(params[:filter]).result
             else
               super
             end

api/app/controllers/spree/api/v2/resource_controller.rb

@@ -35,7 +35,7 @@ def scope(skip_cancancan: false)
           base_scope = model_class.for_store(current_store)
           base_scope = base_scope.accessible_by(current_ability, :show) unless skip_cancancan
           base_scope = base_scope.includes(scope_includes) if scope_includes.any? && action_name == 'index'
-          base_scope
+          model_class.include?(TranslatableResource) ? base_scope.i18n : base_scope
         end
 
         def scope_includes

api/app/models/concerns/spree/webhooks/has_webhooks.rb

@@ -58,13 +58,7 @@ def resource_serializer
       end
 
       def updating_only_ignored_attributes?
-        if defined?(translations) &&
-            translations.any?(&:saved_changes) &&
-            (translations.first(&:saved_changes).saved_changes.keys - ignored_attributes).any?
-          false
-        else
-          (saved_changes.keys - ignored_attributes).empty?
-        end
+        (saved_changes.keys - ignored_attributes).empty?
       end
 
       def ignored_attributes

api/app/serializers/spree/api/v2/platform/google_feed_setting_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        class GoogleFeedSettingSerializer < BaseSerializer
+          include ResourceSerializerConcern
+        end
+      end
+    end
+  end
+end

api/app/serializers/spree/api/v2/platform/user_serializer.rb

@@ -5,7 +5,7 @@ module Platform
         class UserSerializer < BaseSerializer
           set_type :user
 
-          attributes :email, :first_name, :last_name, :created_at, :updated_at, :public_metadata, :private_metadata
+          attributes :email, :first_name, :last_name, :created_at, :updated_at, :public_metadata, :private_metadata, :selected_locale
 
           attribute :average_order_value do |user, params|
             price_stats(user.report_values_for(:average_order_value, params[:store]))

api/app/serializers/spree/v2/storefront/user_serializer.rb

@@ -4,7 +4,7 @@ module Storefront
       class UserSerializer < BaseSerializer
         set_type :user
 
-        attributes :email, :first_name, :last_name, :public_metadata
+        attributes :email, :first_name, :selected_locale, :last_name, :public_metadata
 
         attribute :store_credits do |user|
           user.total_available_store_credit

api/brakeman.ignore

@@ -0,0 +1,7 @@
+{
+  "ignored_warnings": [
+
+  ],
+  "updated": "2022-12-29 09:29:46 +0100",
+  "brakeman_version": "5.4.0"
+}

api/config/routes.rb

@@ -196,6 +196,9 @@
         # Store API
         resources :stores
 
+        # Google Feed Setting API
+        resources :google_feed_settings
+
         # Configurations API
         resources :payment_methods
         resources :shipping_categories
@@ -207,6 +210,11 @@
           resources :subscribers
         end
       end
+
+      namespace :data_feeds do
+        # google data feed API
+        get '/google/:unique_url', to: 'google#rss_feed'
+      end
     end
   end
 end