From 2f9dd8532ea46ba3a2cde5505775f4fd835b6f60 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Tue, 14 Jan 2025 17:24:49 -0800 Subject: [PATCH 1/2] working on issues with bulkrax and hyrax javascript --- Gemfile | 2 +- Gemfile.lock | 124 ++++++++++++++------------ app/assets/javascripts/application.js | 2 +- 3 files changed, 68 insertions(+), 60 deletions(-) diff --git a/Gemfile b/Gemfile index 928c19372..3e0aaa0b5 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', '~> 9.0.0' +gem 'bulkrax', github: 'samvera/bulkrax', branch: 'file_guard' # , '~> 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 8f437cd3e..d0605d4de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,9 +151,31 @@ GIT iiif_manifest (> 0.5) rails (>= 5.1, < 8.0) +GIT + remote: https://github.com/samvera/bulkrax.git + revision: 00232b8f819902091c6af977efd002529a7d0652 + branch: file_guard + specs: + bulkrax (9.0.0) + bagit (~> 0.6.0) + coderay + denormalize_fields + iso8601 (~> 0.9.0) + kaminari + language_list (~> 1.2, >= 1.2.1) + libxml-ruby (~> 5.0) + loofah (>= 2.2.3) + marcel + oai (>= 0.4, < 2.x) + rack (>= 2.0.6) + rails (>= 5.1.6) + rdf (>= 2.0.2, < 4.0) + rubyzip + simple_form + GIT remote: https://github.com/samvera/hyrax.git - revision: b6dcb8af85ab346b475c05e6e68b93da7825d319 + revision: dd6f355b7864a3523ca0b2e6d2c0683a4d2eb18a branch: main specs: hyrax (5.0.1) @@ -244,11 +266,11 @@ GEM active_encode (0.8.2) rails sprockets (< 4) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) - activerecord-import (1.7.0) + activerecord-import (2.0.0) activerecord (>= 4.2) activerecord-nulldb-adapter (1.0.1) activerecord (>= 5.2.0, < 7.2) @@ -267,8 +289,8 @@ GEM attr_required (1.0.1) autoprefixer-rails (10.4.16.0) execjs (~> 2) - awesome_nested_set (3.6.0) - activerecord (>= 4.0.0, < 7.2) + awesome_nested_set (3.8.0) + activerecord (>= 4.0.0, < 8.1) aws-eventstream (1.3.0) aws-partitions (1.865.0) aws-sdk-core (3.190.0) @@ -335,9 +357,9 @@ GEM blacklight (> 6.0, < 8) cancancan (>= 1.8) deprecation (~> 1.0) - blacklight-gallery (4.4.0) + blacklight-gallery (4.8.1) blacklight (>= 7.17, < 9) - rails (>= 6.1, < 8) + rails (>= 6.1, < 9) blacklight_advanced_search (7.0.0) blacklight (~> 7.0) parslet @@ -384,33 +406,17 @@ GEM bootstrap-datepicker-rails (1.10.0.1) railties (>= 3.0) breadcrumbs_on_rails (3.0.1) - browse-everything (1.3.0) + browse-everything (1.5.0) addressable (~> 2.5) aws-sdk-s3 dropbox_api (>= 0.1.20) google-apis-drive_v3 googleauth (>= 0.6.6, < 2.0) - rails (>= 4.2, < 7.2) + rails (>= 4.2, < 8.1) ruby-box signet (~> 0.8) typhoeus builder (3.2.4) - bulkrax (9.0.0) - bagit (~> 0.6.0) - coderay - denormalize_fields - iso8601 (~> 0.9.0) - kaminari - language_list (~> 1.2, >= 1.2.1) - libxml-ruby (~> 5.0) - loofah (>= 2.2.3) - marcel - oai (>= 0.4, < 2.x) - rack (>= 2.0.6) - rails (>= 5.1.6) - rdf (>= 2.0.2, < 4.0) - rubyzip - simple_form byebug (11.1.3) cancancan (3.6.1) capybara (3.39.2) @@ -514,7 +520,7 @@ GEM dropbox_api (0.1.21) faraday (< 3.0) oauth2 (~> 1.1) - dry-configurable (1.1.0) + dry-configurable (1.2.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) dry-container (0.11.0) @@ -526,7 +532,7 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 1.0, < 2) dry-inflector (1.0.0) - dry-initializer (3.1.1) + dry-initializer (3.2.0) dry-logic (1.5.0) concurrent-ruby (~> 1.0) dry-core (~> 1.0, < 2) @@ -610,8 +616,8 @@ GEM flot-rails (0.0.7) jquery-rails flutie (2.2.0) - font-awesome-rails (4.7.0.8) - railties (>= 3.2, < 8.0) + font-awesome-rails (4.7.0.9) + railties (>= 3.2, < 9.0) fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) @@ -626,7 +632,7 @@ GEM gender_detector (0.1.2) unicode_utils (>= 1.3.0) geo_coord (0.2.0) - geocoder (1.8.3) + geocoder (1.8.5) base64 (>= 0.1.0) csv (>= 3.0.0) globalid (1.2.1) @@ -640,31 +646,31 @@ GEM thor (>= 0.14.1) webrick (>= 1.3) zeitwerk (>= 2.0) - google-analytics-data (0.6.0) + google-analytics-data (0.6.1) google-analytics-data-v1beta (>= 0.11, < 2.a) google-cloud-core (~> 1.6) - google-analytics-data-v1beta (0.12.0) + google-analytics-data-v1beta (0.14.0) gapic-common (>= 0.21.1, < 2.a) google-cloud-errors (~> 1.0) - google-apis-core (0.15.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) - httpclient (>= 2.8.1, < 3.a) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml - google-apis-drive_v3 (0.51.0) + google-apis-drive_v3 (0.61.0) google-apis-core (>= 0.15.0, < 2.a) - google-cloud-core (1.7.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) google-cloud-errors (1.4.0) google-protobuf (3.25.5) - googleapis-common-protos (1.5.0) - google-protobuf (~> 3.18) + googleapis-common-protos (1.6.0) + google-protobuf (>= 3.18, < 5.a) googleapis-common-protos-types (~> 1.7) grpc (~> 1.41) googleapis-common-protos-types (1.14.0) @@ -714,13 +720,13 @@ GEM deprecation mime-types (> 2.0, < 4.0) mini_magick (>= 3.2, < 5) - hydra-editor (6.2.0) + hydra-editor (6.3.0) active-fedora (>= 9.0.0) - activerecord (>= 5.2, < 7.1) + activerecord (>= 5.2, < 8.0) almond-rails (~> 0.1) cancancan psych (~> 3.3, < 4) - rails (>= 5.2, < 7.1) + rails (>= 5.2, < 8.0) simple_form (>= 4.1.0, < 5.2) sprockets (>= 3.7) sprockets-es6 @@ -730,13 +736,13 @@ GEM hydra-access-controls (= 12.1.0) hydra-core (= 12.1.0) rails (>= 5.2, < 7.1) - hydra-pcdm (1.3.0) - active-fedora (>= 10, < 15) + hydra-pcdm (1.4.0) + active-fedora (>= 10) mime-types (>= 1) rdf-vocab - hydra-works (2.1.0) - activesupport (>= 5.2, < 7.1) - hydra-derivatives (~> 3.6) + hydra-works (2.2.0) + activesupport (>= 5.2, < 8.0) + hydra-derivatives (>= 3.6) hydra-file_characterization (~> 1.0) hydra-pcdm (>= 0.9) i18n (1.14.1) @@ -794,8 +800,9 @@ GEM json-ld-preloaded (3.2.2) json-ld (~> 3.2) rdf (~> 3.2) - json-schema (4.3.0) - addressable (>= 2.8) + json-schema (5.1.1) + addressable (~> 2.8) + bigdecimal (~> 3.1) jsonlint (0.3.0) oj (~> 3) optimist (~> 3) @@ -879,7 +886,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - logger (1.6.0) + logger (1.6.5) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -928,13 +935,14 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.3.0) + mutex_m (0.3.0) namae (1.1.1) negative_captcha (0.5) actionpack activesupport nest (3.2.0) redic - net-http-persistent (4.0.2) + net-http-persistent (4.0.5) connection_pool (~> 2.2) net-imap (0.4.9) date @@ -947,8 +955,8 @@ GEM net-protocol nio4r (2.7.3) noid (0.9.0) - noid-rails (3.1.0) - actionpack (>= 5.0.0, < 7.1) + noid-rails (3.2.0) + actionpack (>= 5.0.0, < 8) noid (~> 0.9) nokogiri (1.13.10) mini_portile2 (~> 2.8.0) @@ -1035,14 +1043,14 @@ GEM public_suffix (4.0.7) puma (5.6.9) nio4r (~> 2.0) - qa (5.11.0) + qa (5.14.0) activerecord-import deprecation faraday (< 3.0, != 2.0.0) geocoder ldpath nokogiri (~> 1.6) - rails (>= 5.0, < 7.2) + rails (>= 5.0, < 8.1) rdf raabro (1.4.0) racc (1.8.1) @@ -1493,7 +1501,7 @@ DEPENDENCIES bolognese (>= 1.9.10) bootstrap (~> 4.6) bootstrap-datepicker-rails - bulkrax (~> 9.0.0) + bulkrax! byebug capybara capybara-screenshot (~> 1.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ed4414108..67b3590d1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -28,7 +28,7 @@ // Required by Blacklight //= require blacklight/blacklight //= require blacklight_advanced_search -//= require blacklight_gallery/default +//= require blacklight_gallery/blacklight-gallery // Moved the Hyku JS *above* the Hyrax JS to resolve #1187 (following // a pattern found in ScholarSphere) From 64b60d1f8cd39fa7bbe5e739b0234f3a4cdf1234 Mon Sep 17 00:00:00 2001 From: Shana Moore Date: Wed, 15 Jan 2025 11:44:20 -0800 Subject: [PATCH 2/2] bump bulkrax version --- Gemfile | 2 +- Gemfile.lock | 40 +++++++++++++++++----------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index 3e0aaa0b5..928c19372 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', github: 'samvera/bulkrax', branch: 'file_guard' # , '~> 9.0.0' +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 d0605d4de..2d5b31714 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,28 +151,6 @@ GIT iiif_manifest (> 0.5) rails (>= 5.1, < 8.0) -GIT - remote: https://github.com/samvera/bulkrax.git - revision: 00232b8f819902091c6af977efd002529a7d0652 - branch: file_guard - specs: - bulkrax (9.0.0) - bagit (~> 0.6.0) - coderay - denormalize_fields - iso8601 (~> 0.9.0) - kaminari - language_list (~> 1.2, >= 1.2.1) - libxml-ruby (~> 5.0) - loofah (>= 2.2.3) - marcel - oai (>= 0.4, < 2.x) - rack (>= 2.0.6) - rails (>= 5.1.6) - rdf (>= 2.0.2, < 4.0) - rubyzip - simple_form - GIT remote: https://github.com/samvera/hyrax.git revision: dd6f355b7864a3523ca0b2e6d2c0683a4d2eb18a @@ -417,6 +395,22 @@ GEM signet (~> 0.8) typhoeus builder (3.2.4) + bulkrax (9.0.1) + bagit (~> 0.6.0) + coderay + denormalize_fields + iso8601 (~> 0.9.0) + kaminari + language_list (~> 1.2, >= 1.2.1) + libxml-ruby (~> 5.0) + loofah (>= 2.2.3) + marcel + oai (>= 0.4, < 2.x) + rack (>= 2.0.6) + rails (>= 5.1.6) + rdf (>= 2.0.2, < 4.0) + rubyzip + simple_form byebug (11.1.3) cancancan (3.6.1) capybara (3.39.2) @@ -1501,7 +1495,7 @@ DEPENDENCIES bolognese (>= 1.9.10) bootstrap (~> 4.6) bootstrap-datepicker-rails - bulkrax! + bulkrax (~> 9.0.0) byebug capybara capybara-screenshot (~> 1.0)