Skip to content

Commit

Permalink
Merge pull request #2414 from samvera/javascript_issues
Browse files Browse the repository at this point in the history
working on issues with bulkrax and hyrax javascript
  • Loading branch information
Shana Moore authored Jan 15, 2025
2 parents d1c5331 + 64b60d1 commit be514fc
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 43 deletions.
86 changes: 44 additions & 42 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ GIT

GIT
remote: https://github.com/samvera/hyrax.git
revision: b6dcb8af85ab346b475c05e6e68b93da7825d319
revision: dd6f355b7864a3523ca0b2e6d2c0683a4d2eb18a
branch: main
specs:
hyrax (5.0.1)
Expand Down Expand Up @@ -244,11 +244,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)
Expand All @@ -267,8 +267,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)
Expand Down Expand Up @@ -335,9 +335,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
Expand Down Expand Up @@ -384,18 +384,18 @@ 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)
bulkrax (9.0.1)
bagit (~> 0.6.0)
coderay
denormalize_fields
Expand Down Expand Up @@ -514,7 +514,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)
Expand All @@ -526,7 +526,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)
Expand Down Expand Up @@ -610,8 +610,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)
Expand All @@ -626,7 +626,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)
Expand All @@ -640,31 +640,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)
Expand Down Expand Up @@ -714,13 +714,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
Expand All @@ -730,13 +730,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)
Expand Down Expand Up @@ -794,8 +794,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)
Expand Down Expand Up @@ -879,7 +880,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)
Expand Down Expand Up @@ -928,13 +929,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
Expand All @@ -947,8 +949,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)
Expand Down Expand Up @@ -1035,14 +1037,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)
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit be514fc

Please sign in to comment.