From cd4c148a0e45a8a2b1b6982811b18db42ab93fb3 Mon Sep 17 00:00:00 2001 From: Damian Legawiec Date: Fri, 6 Sep 2024 14:36:37 +0200 Subject: [PATCH] Bump Spree to v4.10 --- Gemfile.lock | 74 ++++++++++--------- ...5_add_pretty_name_to_spree_taxons.spree.rb | 10 +++ db/schema.rb | 6 +- 3 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 db/migrate/20240906121215_add_pretty_name_to_spree_taxons.spree.rb diff --git a/Gemfile.lock b/Gemfile.lock index d4ff35ba..78e86b28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,14 +102,14 @@ GEM acts_as_list (1.2.2) activerecord (>= 6.1) activesupport (>= 6.1) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) auto_strip_attributes (2.6.0) activerecord (>= 4.0) autoprefixer-rails (10.4.19.0) execjs (~> 2) - awesome_nested_set (3.6.0) - activerecord (>= 4.0.0, < 7.2) + awesome_nested_set (3.7.0) + activerecord (>= 4.0.0, < 8.0) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -120,10 +120,9 @@ GEM bindex (0.8.1) bootsnap (1.18.4) msgpack (~> 1.2) - bootstrap (4.6.2) + bootstrap (4.6.2.1) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.16.1, < 2) - sassc-rails (>= 2.0.0) builder (3.3.0) cancancan (3.6.1) canonical-rails (0.2.15) @@ -182,11 +181,11 @@ GEM globalid (1.2.1) activesupport (>= 6.1) glyphicons (1.0.2) - highline (3.1.0) + highline (3.1.1) reline i18n (1.14.5) concurrent-ruby (~> 1.0) - i18n_data (0.17.1) + i18n_data (1.1.0) simple_po_parser (~> 1.1) image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) @@ -195,7 +194,7 @@ GEM actionpack (>= 6.0.0) activesupport (>= 6.0.0) railties (>= 6.0.0) - inline_svg (1.9.0) + inline_svg (1.10.0) activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.7.2) @@ -211,6 +210,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (7.0.0) railties (>= 3.2.16) + json (2.7.2) jsonapi-serializer (2.2.0) activesupport (>= 4.2) kaminari (1.2.2) @@ -246,12 +246,13 @@ GEM matrix (0.4.2) mini_magick (4.13.2) mini_mime (1.1.5) - mini_racer (0.14.1) + mini_racer (0.16.0) libv8-node (~> 18.19.0.0) minitest (5.25.1) - mission_control-jobs (0.2.1) + mission_control-jobs (0.3.1) importmap-rails - rails (~> 7.1) + irb (~> 1.13) + rails (>= 7.1) stimulus-rails turbo-rails mobility (1.2.9) @@ -266,7 +267,7 @@ GEM i18n (>= 0.6.4, <= 2) msgpack (1.7.2) mutex_m (0.2.0) - net-imap (0.4.14) + net-imap (0.4.16) date net-protocol net-pop (0.1.2) @@ -289,13 +290,13 @@ GEM nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) - paranoia (2.6.4) - activerecord (>= 5.1, < 7.2) + paranoia (3.0.0) + activerecord (>= 6, < 8.1) pg (1.5.7) popper_js (1.16.1) psych (5.1.2) stringio - public_suffix (5.0.5) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) raabro (1.4.0) @@ -352,17 +353,16 @@ GEM redis-client (0.22.2) connection_pool regexp_parser (2.9.2) - reline (0.5.9) + reline (0.5.10) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) - requestjs-rails (0.0.11) + requestjs-rails (0.0.12) railties (>= 6.1.0) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.6) - strscan + rexml (3.3.7) ruby-vips (2.2.2) ffi (~> 1.12) logger @@ -387,21 +387,22 @@ GEM activejob (>= 7) activerecord (>= 7) railties (>= 7) - solid_queue (0.6.1) + solid_queue (0.8.2) activejob (>= 7.1) activerecord (>= 7.1) concurrent-ruby (>= 1.3.1) fugit (~> 1.11.0) railties (>= 7.1) - spree (4.9.0) - spree_api (= 4.9.0) - spree_cli (= 4.9.0) - spree_core (= 4.9.0) - spree_api (4.9.0) + thor (~> 1.3.1) + spree (4.10.1) + spree_api (= 4.10.1) + spree_cli (= 4.10.1) + spree_core (= 4.10.1) + spree_api (4.10.1) bcrypt (~> 3.1) doorkeeper (~> 5.3) jsonapi-serializer (~> 2.1) - spree_core (= 4.9.0) + spree_core (= 4.10.1) spree_auth_devise (4.6.3) devise (~> 4.7) devise-encryptable (= 0.2.0) @@ -426,9 +427,9 @@ GEM stimulus-rails tinymce-rails (~> 5.0) turbo-rails - spree_cli (4.9.0) + spree_cli (4.10.1) thor (~> 1.0) - spree_core (4.9.0) + spree_core (4.10.1) actionpack (>= 6.1, < 8.0) actionview (>= 6.1, < 8.0) active_storage_validations (~> 1.1) @@ -453,7 +454,7 @@ GEM mobility-ransack (~> 1.2) monetize (~> 1.9) money (~> 6.13) - paranoia (~> 2.4) + paranoia (>= 2.4) railties (>= 6.1, < 8.0) ransack (>= 4.1) request_store (~> 1.7) @@ -461,10 +462,11 @@ GEM state_machines-activemodel (~> 0.7) state_machines-activerecord (~> 0.6) stringex + tracking_number validates_zipcode - spree_emails (4.9.0) + spree_emails (4.10.1) actionmailer - spree_core (>= 4.9.0) + spree_core (>= 4.10.1) sprockets (>= 4.0) spree_extension (0.1.0) activerecord (>= 4.2) @@ -495,9 +497,9 @@ GEM rails-i18n spree_core (>= 4.2.0.rc3) spree_extension - spree_sample (4.9.0) + spree_sample (4.10.1) ffaker (~> 2.9) - spree_core (>= 4.9.0) + spree_core (>= 4.10.1) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -516,12 +518,14 @@ GEM railties (>= 6.0.0) stringex (2.8.6) stringio (3.1.1) - strscan (3.1.0) thor (1.3.2) tilt (2.4.0) timeout (0.4.1) tinymce-rails (5.10.9) railties (>= 3.1.1) + tracking_number (2.0.1) + activesupport (>= 4.2.5) + json (>= 1.8.3) turbo-rails (2.0.6) actionpack (>= 6.0.0) activejob (>= 6.0.0) diff --git a/db/migrate/20240906121215_add_pretty_name_to_spree_taxons.spree.rb b/db/migrate/20240906121215_add_pretty_name_to_spree_taxons.spree.rb new file mode 100644 index 00000000..72b25b97 --- /dev/null +++ b/db/migrate/20240906121215_add_pretty_name_to_spree_taxons.spree.rb @@ -0,0 +1,10 @@ +# This migration comes from spree (originally 20240822163534) +class AddPrettyNameToSpreeTaxons < ActiveRecord::Migration[6.1] + def change + add_column :spree_taxons, :pretty_name, :string, null: true, if_not_exists: true + add_index :spree_taxons, :pretty_name, if_not_exists: true + + add_column :spree_taxon_translations, :pretty_name, :string, null: true, if_not_exists: true + add_index :spree_taxon_translations, :pretty_name, if_not_exists: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 1afd709f..1f3861cf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_08_14_121345) do +ActiveRecord::Schema[7.1].define(version: 2024_09_06_121215) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1512,7 +1512,9 @@ t.string "meta_description" t.string "meta_keywords" t.string "permalink" + t.string "pretty_name" t.index ["locale"], name: "index_spree_taxon_translations_on_locale" + t.index ["pretty_name"], name: "index_spree_taxon_translations_on_pretty_name" t.index ["spree_taxon_id", "locale"], name: "index_spree_taxon_translations_on_spree_taxon_id_and_locale", unique: true end @@ -1557,6 +1559,7 @@ t.boolean "hide_from_nav", default: false t.jsonb "public_metadata" t.jsonb "private_metadata" + t.string "pretty_name" t.index ["lft"], name: "index_spree_taxons_on_lft" t.index ["name", "parent_id", "taxonomy_id"], name: "index_spree_taxons_on_name_and_parent_id_and_taxonomy_id", unique: true t.index ["name"], name: "index_spree_taxons_on_name" @@ -1564,6 +1567,7 @@ t.index ["permalink", "parent_id", "taxonomy_id"], name: "index_spree_taxons_on_permalink_and_parent_id_and_taxonomy_id", unique: true t.index ["permalink"], name: "index_taxons_on_permalink" t.index ["position"], name: "index_spree_taxons_on_position" + t.index ["pretty_name"], name: "index_spree_taxons_on_pretty_name" t.index ["rgt"], name: "index_spree_taxons_on_rgt" t.index ["taxonomy_id"], name: "index_taxons_on_taxonomy_id" end