From f8807cef4ad96bff3a5db6f2a3efe8d0abb8fc2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:34:29 -0800 Subject: [PATCH 1/4] Bump nanoid from 3.3.7 to 3.3.8 (#2401) Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1f89d878a..40a9007df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1831,9 +1831,9 @@ mute-stream@0.0.7: integrity sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ== nanoid@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" - integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== + version "3.3.8" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf" + integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w== next-tick@^1.1.0: version "1.1.0" From e4d58d1448eab659d0e17b78d2c4b34ac77941f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:34:44 -0800 Subject: [PATCH 2/4] Bump elliptic from 6.5.7 to 6.6.0 (#2372) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.0. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.7...v6.6.0) --- updated-dependencies: - dependency-name: elliptic dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 40a9007df..f34fd2898 100644 --- a/yarn.lock +++ b/yarn.lock @@ -937,9 +937,9 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" elliptic@^6.5.3, elliptic@^6.5.5: - version "6.5.7" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b" - integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q== + version "6.6.0" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.0.tgz#5919ec723286c1edf28685aa89261d4761afa210" + integrity sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA== dependencies: bn.js "^4.11.9" brorand "^1.1.0" From 0944fa8831d03ed5b97dfa8772d9995efb946536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:34:56 -0800 Subject: [PATCH 3/4] Bump cross-spawn from 7.0.3 to 7.0.6 (#2385) Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index f34fd2898..faea1a818 100644 --- a/yarn.lock +++ b/yarn.lock @@ -757,9 +757,9 @@ cross-env@^6.0.3: cross-spawn "^7.0.0" cross-spawn@^7.0.0: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" From 1efcc99159a049c5604f71ce29d5cf3b096dbe93 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Fri, 20 Dec 2024 16:42:44 -0800 Subject: [PATCH 4/4] Update Bulkrax to 9.0 (#2403) * update bulkrax to 9.0 * run migration --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ db/schema.rb | 6 +++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index b4cdb3b22..e3dc4abd1 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'blacklight_range_limit' gem 'bolognese', '>= 1.9.10' gem 'bootstrap', '~> 4.6' gem 'bootstrap-datepicker-rails' -gem 'bulkrax', '~> 8.3' +gem 'bulkrax', '~> 9.0.0' gem 'byebug', group: %i[development test] gem 'capybara', group: %i[test] gem 'capybara-screenshot', '~> 1.0', group: %i[test] diff --git a/Gemfile.lock b/Gemfile.lock index 2199bc61a..9b7993627 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,11 +206,11 @@ GIT GIT remote: https://github.com/scientist-softserv/willow_sword.git - revision: 64d0b818bc2a31c158baa80cc6af107715b50a94 + revision: e4edebde9a29636d74c794efca423535db296880 branch: main specs: willow_sword (0.2.0) - bagit (~> 0.4.1) + bagit (~> 0.4) rails (~> 6.1) rubyzip (>= 1.0.0) @@ -294,7 +294,7 @@ GEM babel-source (>= 4.0, < 6) execjs (~> 2.0) backport (1.2.0) - bagit (0.4.6) + bagit (0.6.0) docopt (~> 0.5.0) validatable (~> 1.6) base64 (0.2.0) @@ -396,8 +396,8 @@ GEM signet (~> 0.8) typhoeus builder (3.2.4) - bulkrax (8.3.0) - bagit (~> 0.4.6) + bulkrax (9.0.0) + bagit (~> 0.6.0) coderay denormalize_fields iso8601 (~> 0.9.0) @@ -1494,7 +1494,7 @@ DEPENDENCIES bolognese (>= 1.9.10) bootstrap (~> 4.6) bootstrap-datepicker-rails - bulkrax (~> 8.3) + bulkrax (~> 9.0.0) byebug capybara capybara-screenshot (~> 1.0) diff --git a/db/schema.rb b/db/schema.rb index f8b315bbb..961c8652a 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.define(version: 2024_09_16_182823) do +ActiveRecord::Schema.define(version: 2024_12_05_212513) do # These are extensions that must be enabled in order to support this database enable_extension "hstore" @@ -74,7 +74,9 @@ t.string "importerexporter_type", default: "Bulkrax::Importer" t.integer "import_attempts", default: 0 t.string "status_message", default: "Pending" + t.string "error_class" t.index ["identifier", "importerexporter_id", "importerexporter_type"], name: "bulkrax_identifier_idx" + t.index ["importerexporter_id", "importerexporter_type", "id"], name: "index_bulkrax_entries_on_importerexporter_id_type_and_id" t.index ["importerexporter_id", "importerexporter_type"], name: "bulkrax_entries_importerexporter_idx" t.index ["type"], name: "index_bulkrax_entries_on_type" end @@ -110,6 +112,7 @@ t.boolean "include_thumbnails", default: false t.boolean "generated_metadata", default: false t.string "status_message", default: "Pending" + t.string "error_class" t.index ["user_id"], name: "index_bulkrax_exporters_on_user_id" end @@ -153,6 +156,7 @@ t.string "status_message", default: "Pending" t.datetime "last_imported_at" t.datetime "next_import_at" + t.string "error_class" t.index ["user_id"], name: "index_bulkrax_importers_on_user_id" end