From 65fc70eb5582cda8ecb97dd3e4b5bfcd7bdf76b6 Mon Sep 17 00:00:00 2001 From: Brandon Straley Date: Tue, 24 Oct 2023 16:21:01 -0400 Subject: [PATCH 1/3] Hyrax 5.0.0.rc2 OD2 --- .yarnrc | 2 +- Dockerfile | 6 +- Gemfile | 18 +- Gemfile.lock | 858 +++++++++--------- app/assets/html/401.html.haml | 2 - app/assets/html/403.html.haml | 2 - app/assets/html/404.html.haml | 2 - app/assets/html/418.html.haml | 2 - app/assets/javascripts/application.js | 3 +- app/assets/stylesheets/application.scss | 6 +- app/assets/stylesheets/hyrax.scss | 6 - .../oregon_digital/_breadcrumbs.scss | 18 +- app/controllers/application_controller.rb | 3 - app/controllers/catalog_controller.rb | 1 - .../blacklight_config_behavior.rb | 2 +- .../works_controller_behavior.rb | 4 +- .../hyrax/admin/workflows_catalog_behavior.rb | 1 - app/controllers/hyrax/homepage_controller.rb | 33 +- .../explore_collections_controller.rb | 1 - app/controllers/search_history_controller.rb | 2 - app/models/search_builder.rb | 1 - app/models/user.rb | 3 +- app/views/_ga.html.erb | 11 +- config/initializers/hyrax_migrator.rb | 95 -- config/routes.rb | 4 - db/schema.rb | 20 +- docker-compose.yml | 14 +- package.json | 3 +- yarn.lock | 146 ++- 29 files changed, 658 insertions(+), 611 deletions(-) delete mode 100644 config/initializers/hyrax_migrator.rb diff --git a/.yarnrc b/.yarnrc index 5caefca0c..f73b422be 100644 --- a/.yarnrc +++ b/.yarnrc @@ -2,4 +2,4 @@ # yarn lockfile v1 -lastUpdateCheck 1635288382639 +lastUpdateCheck 1698174086578 diff --git a/Dockerfile b/Dockerfile index 71d8e66e9..c7ac0587e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7-alpine3.15 as bundler +FROM ruby:alpine3.18 as bundler # Necessary for bundler to operate properly ENV LANG C.UTF-8 @@ -12,7 +12,7 @@ FROM bundler as dependencies RUN apk --no-cache update && apk --no-cache upgrade && \ apk add --no-cache alpine-sdk nodejs unzip ghostscript vim yarn \ git sqlite sqlite-dev postgresql-dev libjpeg-turbo-dev libpng-dev \ - libtool libgomp libreoffice libressl libressl-dev java-common libc6-compat \ + libtool libgomp libreoffice java-common libc6-compat \ curl build-base tzdata zip autoconf automake libtool texinfo \ bash bash-completion java-common openjdk11-jre-headless graphicsmagick \ poppler-utils ffmpeg tesseract-ocr openjpeg-dev openjpeg-tools openjpeg less\ @@ -56,7 +56,7 @@ ARG UID=8083 ARG GID=8083 # Create an app user so our program doesn't run as root. -RUN addgroup -g "$GID" app && adduser -h /data -u "$UID" -G app -D -H app +RUN addgroup -g 8083 app && adduser -h /data -u 8083 -G app -D -H app FROM dependencies as gems diff --git a/Gemfile b/Gemfile index 7e82c5035..db850eb18 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,6 @@ end # TODO: make this a version specification once we get a new release cut # gem 'hydra-derivatives', git: 'https://github.com/samvera/hydra-derivatives.git' -gem "blacklight_range_limit", "~> 6" gem 'browse-everything' # coffee-rails is a requirement for Hyrax or one of its dependencies but hasn't # been added to either gemspecs @@ -18,28 +17,28 @@ gem 'dalli', '~> 3.2.3' gem 'devise' gem "edtf", "~> 3.0" gem 'hydra-role-management' -gem 'hyrax', '3.6.0' -gem 'hyrax-migrator', github: 'OregonDigital/hyrax-migrator', branch: 'master' +gem 'hyrax', '5.0.0.rc2' gem 'jquery-rails' +gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails' gem 'sassc-rails' gem 'chosen-rails' gem 'pg' -gem 'puma', '~> 5.6' -gem 'rails', '~> 5.2' +gem 'puma' +gem 'rails', '~> 6.1' gem 'rsolr', '>= 1.0' -gem 'sass-rails', '~> 5.0' +gem 'sass-rails' gem 'sidekiq', '~> 6.4' gem 'streamio-ffmpeg' gem 'stemmify' gem 'tzinfo-data' gem 'uglifier', '>= 1.3.0' gem 'ruby-oembed' -gem 'blacklight_advanced_search', '~> 6.4' +gem 'blacklight_advanced_search' gem 'blacklight-oembed' gem 'blacklight_dynamic_sitemap' gem 'triplestore-adapter', git: 'https://github.com/osulp/triplestore-adapter' -gem 'faraday_middleware', '~> 0.10.0' -gem 'blacklight_iiif_search', '~> 1.0' +gem 'faraday_middleware' +gem 'blacklight_iiif_search' gem 'rubyzip', '~> 2' gem 'zip_tricks', '~> 5.3' gem 'bulkrax', github: 'samvera-labs/bulkrax', ref: 'd9bc39781b9c542a766b9ff2f7a7cce2d736debd' #5.2.1 @@ -107,3 +106,4 @@ gem "vcr", "~> 5.1" # INSTALL: Get the new Font Awesome gem 'font-awesome-sass', '~> 6.4', '>= 6.4.2' +gem 'bootstrap-sass' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 4a6e6c584..457441f52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,19 +1,3 @@ -GIT - remote: https://github.com/OregonDigital/hyrax-migrator.git - revision: 87173608ae1def27fe9f97bc46e10cd4f72c6a3a - branch: master - specs: - hyrax-migrator (0.1.0) - aasm - actionview (>= 5.2, < 7.0) - aws-sdk-s3 - bagit - haml - rails (~> 5.2) - rdf - rubyzip - sidekiq - GIT remote: https://github.com/notch8/willow_sword.git revision: 74f7684ff9ca96251f341e50a3afc34b5bd312cc @@ -35,6 +19,16 @@ GIT rdf-vocab sparql-client +GIT + remote: https://github.com/rweng/jquery-datatables-rails.git + revision: d486b31b192a2924b1913e080ad23460e6b96d31 + specs: + jquery-datatables-rails (3.4.0) + actionpack (>= 3.1) + jquery-rails + railties (>= 3.1) + sass-rails + GIT remote: https://github.com/samvera-labs/bulkrax.git revision: d9bc39781b9c542a766b9ff2f7a7cce2d736debd @@ -58,37 +52,50 @@ GIT GEM remote: https://rubygems.org/ specs: - aasm (5.5.0) - concurrent-ruby (~> 1.0) - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + mail (>= 2.7.1) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + nokogiri (>= 1.8.5) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - active-fedora (13.3.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + active-fedora (14.0.1) active-triples (>= 0.11.0, < 2.0.0) activemodel (>= 5.1) activesupport (>= 5.1) deprecation - faraday (~> 0.12) + faraday (>= 1.0) faraday-encoding (>= 0.0.5) ldp (>= 0.7.0, < 2) rsolr (>= 1.1.2, < 3) @@ -101,45 +108,47 @@ GEM active_encode (0.8.2) rails sprockets (< 4) - activejob (5.2.8.1) - activesupport (= 5.2.8.1) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) activerecord-import (1.5.0) activerecord (>= 4.2) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) almond-rails (0.3.0) rails (>= 4.2) - anyway_config (2.5.3) + anyway_config (2.5.4) ruby-next-core (>= 0.14.0) - arel (9.0.0) ast (2.4.2) autoprefixer-rails (10.4.15.0) execjs (~> 2) - awesome_nested_set (3.5.0) - activerecord (>= 4.0.0, < 7.1) + awesome_nested_set (3.6.0) + activerecord (>= 4.0.0, < 7.2) aws-eventstream (1.2.0) - aws-partitions (1.831.0) - aws-sdk-core (3.185.0) + aws-partitions (1.840.0) + aws-sdk-core (3.185.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -167,57 +176,50 @@ GEM bagit (0.4.6) docopt (~> 0.5.0) validatable (~> 1.6) - bcp47 (0.3.3) - i18n + bcp47_spec (0.2.1) bcrypt (3.1.19) bindex (0.8.1) - blacklight (6.25.0) - bootstrap-sass (~> 3.2) + blacklight (7.34.0) deprecation globalid + hashdiff + i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) - nokogiri (~> 1.6) - rails (>= 4.2, < 6) - rsolr (>= 1.0.6, < 3) - twitter-typeahead-rails (= 0.11.1.pre.corejavascript) - blacklight-access_controls (0.6.2) - blacklight (~> 6.0) - cancancan (~> 1.8) + ostruct (>= 0.3.2) + rails (>= 5.1, < 7.1) + view_component (>= 2.66, < 4) + blacklight-access_controls (6.0.1) + blacklight (> 6.0, < 8) + cancancan (>= 1.8) deprecation (~> 1.0) - blacklight-gallery (0.12.0) - blacklight (~> 6.3) - bootstrap-sass (~> 3.0) - openseadragon (>= 0.2.0) - rails - blacklight-oembed (0.3.0) - blacklight (>= 5.0, < 7) - bootstrap-sass (~> 3.0) + blacklight-gallery (4.4.0) + blacklight (>= 7.17, < 9) + rails (>= 6.1, < 8) + blacklight-oembed (1.1.1) + blacklight (>= 7.0, < 9) rails ruby-oembed - blacklight_advanced_search (6.4.1) - blacklight (~> 6.0, >= 6.0.1) + blacklight_advanced_search (7.0.0) + blacklight (~> 7.0) parslet - blacklight_dynamic_sitemap (0.6.0) - blacklight (> 6.0) + blacklight_dynamic_sitemap (1.0.0) + blacklight (> 7.0) rails - blacklight_iiif_search (1.0.0) - blacklight (~> 6.0) + blacklight_iiif_search (2.0.0) + blacklight (~> 7.0) iiif-presentation - rails (>= 4.2, < 6) - blacklight_oai_provider (6.1.1) - blacklight (~> 6.0) - oai (~> 1.0) - blacklight_range_limit (6.5.0) - blacklight (~> 6.10) - jquery-rails - rails (>= 4.2, < 6) + rails (>= 5.1, < 7) + blacklight_oai_provider (7.0.2) + blacklight (~> 7.0) + oai (~> 1.2) + rexml bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - bootstrap_form (5.1.0) - actionpack (>= 5.2) - activemodel (>= 5.2) + bootstrap_form (5.3.2) + actionpack (>= 6.1) + activemodel (>= 6.1) breadcrumbs_on_rails (3.0.1) browse-everything (1.2.0) addressable (~> 2.5) @@ -231,7 +233,7 @@ GEM typhoeus builder (3.2.4) byebug (11.1.3) - cancancan (1.17.0) + cancancan (3.5.0) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -277,26 +279,20 @@ GEM database_cleaner (1.99.0) date (3.3.3) declarative (0.0.20) - declarative-builder (0.1.0) - declarative-option (< 0.2.0) - declarative-option (0.1.0) deprecation (1.1.0) activesupport descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.9.2) + devise (4.9.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) diff-lcs (1.5.0) - disposable (0.4.7) + disposable (0.6.3) declarative (>= 0.0.9, < 1.0.0) - declarative-builder (< 0.2.0) - declarative-option (< 0.2.0) - representable (>= 2.4.0, <= 3.1.0) - uber (< 0.2.0) + representable (>= 3.1.1, < 4) docile (1.4.0) docopt (0.5.0) domain_name (0.5.20190701) @@ -311,68 +307,58 @@ GEM dropbox_api (0.1.21) faraday (< 3.0) oauth2 (~> 1.1) - dry-configurable (0.16.1) - dry-core (~> 0.6) + dry-configurable (1.1.0) + dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) dry-container (0.11.0) concurrent-ruby (~> 1.0) - dry-core (0.9.1) + dry-core (1.0.1) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) - dry-equalizer (0.3.0) - dry-events (0.2.0) + dry-events (1.0.1) concurrent-ruby (~> 1.0) - dry-core (~> 0.4) - dry-equalizer (~> 0.2) - dry-inflector (0.3.0) + dry-core (~> 1.0, < 2) + dry-inflector (1.0.0) dry-initializer (3.1.1) - dry-logic (1.3.0) + dry-logic (1.5.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.9, >= 0.9) + dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) - dry-matcher (0.9.0) - dry-core (~> 0.4, >= 0.4.8) - dry-monads (1.4.0) + dry-monads (1.6.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.7) - dry-schema (1.11.3) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-schema (1.13.3) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.16, >= 0.16) - dry-core (~> 0.9, >= 0.9) + dry-configurable (~> 1.0, >= 1.0.1) + dry-core (~> 1.0, < 2) dry-initializer (~> 3.0) - dry-logic (~> 1.3) - dry-types (~> 1.6) + dry-logic (>= 1.4, < 2) + dry-types (>= 1.7, < 2) zeitwerk (~> 2.6) - dry-struct (1.5.2) - dry-core (~> 0.9, >= 0.9) - dry-types (~> 1.6) + dry-struct (1.6.0) + dry-core (~> 1.0, < 2) + dry-types (>= 1.7, < 2) ice_nine (~> 0.11) zeitwerk (~> 2.6) - dry-transaction (0.13.3) - dry-container (>= 0.2.8) - dry-events (>= 0.1.0) - dry-matcher (>= 0.7.0) - dry-monads (>= 0.4.0) - dry-types (1.6.1) + dry-types (1.7.1) concurrent-ruby (~> 1.0) - dry-container (~> 0.3) - dry-core (~> 0.9, >= 0.9) - dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.3, >= 1.3) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) zeitwerk (~> 2.6) - dry-validation (1.9.0) + dry-validation (1.10.0) concurrent-ruby (~> 1.0) - dry-container (~> 0.7, >= 0.7.1) - dry-core (~> 0.9, >= 0.9) + dry-core (~> 1.0, < 2) dry-initializer (~> 3.0) - dry-schema (~> 1.11, >= 1.11.0) + dry-schema (>= 1.12, < 2) zeitwerk (~> 2.6) dumb_delegator (0.8.1) - ebnf (2.3.5) + ebnf (2.4.0) htmlentities (~> 4.3) - rdf (~> 3.2) + rdf (~> 3.3) scanf (~> 1.0) - sxp (~> 1.2) + sxp (~> 1.3) unicode-types (~> 1.8) edtf (3.1.1) activesupport (>= 3.0, < 8.0) @@ -389,13 +375,36 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (0.17.6) - multipart-post (>= 1.2, < 3) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) faraday-encoding (0.0.5) faraday - faraday_middleware (0.10.1) - faraday (>= 0.7.4, < 1.0) - ffi (1.16.2) + faraday-excon (1.1.0) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -409,8 +418,8 @@ GEM font-awesome-sass (6.4.2) sassc (~> 2.0) geocoder (1.8.2) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) google-apis-core (0.11.1) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) @@ -428,14 +437,16 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - haml (6.2.0) + haml (6.2.3) temple (>= 0.8.2) thor tilt + hamster (3.0.0) + concurrent-ruby (~> 1.0) hashdiff (1.0.1) hashie (5.0.0) hiredis (0.6.3) - honeycomb-beeline (3.0.0) + honeycomb-beeline (3.0.1) libhoney (>= 1.14.2) htmlentities (4.3.4) http (5.1.1) @@ -448,39 +459,40 @@ GEM http-form_data (2.3.0) http_logger (0.7.0) httpclient (2.8.3) - hydra-access-controls (11.0.7) + hydra-access-controls (12.1.0) active-fedora (>= 10.0.0) - activesupport (>= 4, < 6) - blacklight (>= 5.16) - blacklight-access_controls (~> 0.6.0) - cancancan (~> 1.8) + activesupport (>= 5.2, < 7.1) + blacklight-access_controls (~> 6.0) + cancancan (>= 1.8, < 4) deprecation (~> 1.0) - hydra-core (11.0.7) - hydra-access-controls (= 11.0.7) - railties (>= 4.0.0, < 6) - hydra-derivatives (3.7.0) - active-fedora (>= 11.5.6, != 13.2.1, != 13.2.0, != 13.1.3, != 13.1.2, != 13.1.1, != 13.1.0, != 13.0.0, != 12.2.1, != 12.2.0, != 12.1.1, != 12.1.0, != 12.0.3, != 12.0.2, != 12.0.1, != 12.0.0) + hydra-core (12.1.0) + hydra-access-controls (= 12.1.0) + railties (>= 5.2, < 7.1) + hydra-derivatives (3.8.0) + active-fedora (>= 14.0) + active-triples (>= 1.2) active_encode (~> 0.1) - activesupport (>= 4.0, < 7) + activesupport (>= 4.0, < 7.1) addressable (~> 2.5) deprecation mime-types (> 2.0, < 4.0) mini_magick (>= 3.2, < 5) - hydra-editor (5.0.5) + hydra-editor (6.2.0) active-fedora (>= 9.0.0) - activerecord (~> 5.0) + activerecord (>= 5.2, < 7.1) almond-rails (~> 0.1) - cancancan (~> 1.8) - rails (>= 5, < 6) - simple_form (>= 4.1.0, < 6.0) - sprockets (~> 3.7) + cancancan + psych (~> 3.3, < 4) + rails (>= 5.2, < 7.1) + simple_form (>= 4.1.0, < 5.2) + sprockets (>= 3.7) sprockets-es6 - hydra-file_characterization (1.1.2) + hydra-file_characterization (1.2.0) activesupport (>= 3.0.0) - hydra-head (11.0.7) - hydra-access-controls (= 11.0.7) - hydra-core (= 11.0.7) - rails (>= 5.2, < 6.1) + hydra-head (12.1.0) + 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) mime-types (>= 1) @@ -497,49 +509,46 @@ GEM hydra-derivatives (~> 3.6) hydra-file_characterization (~> 1.0) hydra-pcdm (>= 0.9) - hyrax (3.6.0) - active-fedora (~> 13.1, >= 13.1.2) + hyrax (5.0.0.rc2) + active-fedora (~> 14.0) almond-rails (~> 0.1) awesome_nested_set (~> 3.1) - blacklight (~> 6.14) - blacklight-gallery (~> 0.7) + blacklight (~> 7.29) + blacklight-gallery (~> 4.0) breadcrumbs_on_rails (~> 3.0) browse-everything (>= 0.16, < 2.0) carrierwave (~> 1.0) clipboard-rails (~> 1.5) + concurrent-ruby (~> 1.0) + connection_pool (~> 2.4) draper (~> 4.0) - dry-equalizer (~> 0.2) - dry-events (~> 0.2.0) - dry-monads (< 1.5) - dry-struct (~> 1.0) - dry-transaction (~> 0.11) - dry-validation (~> 1.3) + dry-container (~> 0.11) + dry-events (~> 1.0, >= 1.0.1) + dry-logic (~> 1.5) + dry-monads (~> 1.6) + dry-struct (~> 1.6) + dry-validation (~> 1.10) flipflop (~> 2.3) flot-rails (~> 0.0.6) font-awesome-rails (~> 4.2) hydra-derivatives (~> 3.3) - hydra-editor (~> 5.0, >= 5.0.4) - hydra-file_characterization (~> 1.1.2) - hydra-head (~> 11.0, >= 11.0.1) + hydra-editor (~> 6.0) + hydra-file_characterization (~> 1.1) + hydra-head (~> 12.0) hydra-works (>= 0.16) iiif_manifest (>= 0.3, < 2.0) - jquery-datatables-rails (~> 3.4) - jquery-ui-rails (~> 6.0) - json-ld (< 3.2) json-schema - kaminari_route_prefix (~> 0.1.1) legato (~> 0.3) linkeddata mailboxer (~> 0.12) nest (~> 3.1) - noid-rails (~> 3.0.0) + noid-rails (~> 3.0) oauth oauth2 (~> 1.2) + openseadragon posix-spawn - power_converter (~> 0.1, >= 0.1.2) - psych (~> 3.3) qa (~> 5.5, >= 5.5.1) - rails (~> 5.0) + rails (~> 6.1) rails_autolink (~> 1.1) rdf-rdfxml rdf-vocab (~> 3.0) @@ -549,12 +558,13 @@ GEM reform (~> 2.3) reform-rails (~> 0.2.0) retriable (>= 2.9, < 4.0) - samvera-nesting_indexer (~> 2.0) - sass-rails (~> 5.0) + sass-rails (~> 6.0) select2-rails (~> 3.5) signet + sprockets (~> 3.7) tinymce-rails (~> 5.10) - valkyrie (~> 2, >= 2.1.1) + valkyrie (~> 3.1.1) + view_component (~> 2.74.1) i18n (1.14.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) @@ -569,29 +579,22 @@ GEM actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) - jquery-datatables-rails (3.4.0) - actionpack (>= 3.1) - jquery-rails - railties (>= 3.1) - sass-rails jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) json (2.6.3) json-canonicalization (0.3.2) - json-ld (3.1.10) + json-ld (3.3.0) htmlentities (~> 4.3) - json-canonicalization (~> 0.2) + json-canonicalization (~> 0.3, >= 0.3.2) link_header (~> 0.0, >= 0.0.8) - multi_json (~> 1.14) - rack (~> 2.0) - rdf (~> 3.1) - json-ld-preloaded (3.1.6) - json-ld (~> 3.1) - rdf (~> 3.1) + multi_json (~> 1.15) + rack (>= 2.2, < 4) + rdf (~> 3.3) + json-ld-preloaded (3.3.0) + json-ld (~> 3.3) + rdf (~> 3.3) json-schema (4.1.1) addressable (>= 2.8) jwt (2.7.1) @@ -607,22 +610,21 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kaminari_route_prefix (0.1.1) - kaminari (~> 1.0) language_list (1.2.1) - ld-patch (3.2.2) - ebnf (~> 2.3) - rdf (~> 3.2) - rdf-xsd (~> 3.2) - sparql (~> 3.2) - sxp (~> 1.2) - ldp (1.0.3) + ld-patch (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.3) + ldp (1.2.0) deprecation - faraday + faraday (>= 1) http_logger - json-ld - rdf (>= 1.1) + json-ld (~> 3.2) + rdf (~> 3.2) rdf-isomorphic + rdf-ldp rdf-turtle rdf-vocab (>= 0.8) slop @@ -639,42 +641,42 @@ GEM http (>= 2.0, < 6.0) libxml-ruby (3.2.4) link_header (0.0.8) - linkeddata (3.1.6) - equivalent-xml (~> 0.6) - json-ld (~> 3.1, >= 3.1.10) - json-ld-preloaded (~> 3.1, >= 3.1.6) - ld-patch (~> 3.1, >= 3.1.3) - nokogiri (~> 1.12) - rdf (~> 3.1, >= 3.1.15) - rdf-aggregate-repo (~> 3.1) - rdf-isomorphic (~> 3.1, >= 3.1.1) - rdf-json (~> 3.1) - rdf-microdata (~> 3.1, >= 3.1.4) - rdf-n3 (~> 3.1, >= 3.1.2) - rdf-normalize (~> 0.4) - rdf-ordered-repo (~> 3.1, >= 3.1.1) - rdf-rdfa (~> 3.1, >= 3.1.3) - rdf-rdfxml (~> 3.1, >= 3.1.1) - rdf-reasoner (~> 0.7, >= 0.7.2) - rdf-tabular (~> 3.1, >= 3.1.1) - rdf-trig (~> 3.1, >= 3.1.2) - rdf-trix (~> 3.1, >= 3.1.1) - rdf-turtle (~> 3.1, >= 3.1.3) - rdf-vocab (~> 3.1, >= 3.1.14) - rdf-xsd (~> 3.1, >= 3.1.1) - shacl (~> 0.1, >= 0.1.1) - shex (~> 0.6, >= 0.6.4) - sparql (~> 3.1, >= 3.1.8) - sparql-client (~> 3.1, >= 3.1.2) - listen (3.1.5) + linkeddata (3.3.1) + json-ld (~> 3.3) + json-ld-preloaded (~> 3.3) + ld-patch (~> 3.3) + nokogiri (~> 1.15, >= 1.15.4) + rdf (~> 3.2, >= 3.2.1) + rdf-aggregate-repo (~> 3.2) + rdf-hamster-repo (~> 3.3) + rdf-isomorphic (~> 3.3) + rdf-json (~> 3.3) + rdf-microdata (~> 3.3) + rdf-n3 (~> 3.3) + rdf-normalize (~> 0.7) + rdf-ordered-repo (~> 3.3) + rdf-rdfa (~> 3.3) + rdf-rdfxml (~> 3.3) + rdf-reasoner (~> 0.9) + rdf-tabular (~> 3.3) + rdf-trig (~> 3.3) + rdf-trix (~> 3.3) + rdf-turtle (~> 3.3) + rdf-vocab (~> 3.3) + rdf-xsd (~> 3.3) + shacl (~> 0.4) + shex (~> 0.8) + sparql (~> 3.3) + sparql-client (~> 3.3) + yaml-ld (~> 0.0) + listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) logger (1.5.3) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -697,11 +699,13 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.3.0) + mustermann (2.0.2) + ruby2_keywords (~> 0.0.1) nest (3.2.0) redic net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-imap (0.3.7) + net-imap (0.4.2) date net-protocol net-pop (0.1.2) @@ -712,17 +716,15 @@ GEM net-protocol nio4r (2.5.9) noid (0.9.0) - noid-rails (3.0.3) - actionpack (>= 5.0.0, < 7) + noid-rails (3.1.0) + actionpack (>= 5.0.0, < 7.1) noid (~> 0.9) nokogiri (1.15.4-aarch64-linux) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) - racc (~> 1.4) - oai (1.1.0) + oai (1.2.1) builder (>= 3.1.0) - faraday - faraday_middleware + faraday (< 3) + faraday-follow_redirects (>= 0.3.0, < 2) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) snaky_hash (~> 2.0) @@ -752,8 +754,9 @@ GEM rails (> 3.2.0) orm_adapter (0.5.0) os (1.1.4) + ostruct (0.5.5) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc parslet (2.0.0) @@ -763,7 +766,6 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) posix-spawn (0.3.15) - power_converter (0.1.2) prometheus-client (4.2.1) pry (0.14.2) coderay (~> 1.1) @@ -788,20 +790,31 @@ GEM rdf racc (1.7.1) rack (2.2.8) + rack-linkeddata (3.3.0) + linkeddata (~> 3.3) + rack (>= 2.2, < 4) + rack-rdf (~> 3.3) + rack-protection (2.2.4) + rack + rack-rdf (3.3.0) + rack (>= 2.2, < 4) + rdf (~> 3.3) rack-test (2.1.0) rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) - bundler (>= 1.3.0) - railties (= 5.2.8.1) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + bundler (>= 1.15.0) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -818,76 +831,90 @@ GEM actionview (> 3.1) activesupport (> 3.1) railties (> 3.1) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdf (3.2.11) + rdf (3.3.1) + bcp47_spec (~> 0.2) link_header (~> 0.0, >= 0.0.8) - rdf-aggregate-repo (3.2.1) - rdf (~> 3.2) - rdf-isomorphic (3.2.1) - rdf (~> 3.2) - rdf-json (3.2.0) + rdf-aggregate-repo (3.3.0) + rdf (~> 3.3) + rdf-hamster-repo (3.3.0) + hamster (~> 3.0) + rdf (~> 3.3) + rdf-isomorphic (3.3.0) + rdf (~> 3.3) + rdf-json (3.3.0) + rdf (~> 3.3) + rdf-ldp (2.1.0) + json-ld (~> 3.2) + ld-patch (~> 3.2) + link_header (~> 0.0, >= 0.0.8) + rack (~> 2.2) + rack-linkeddata (~> 3.1) rdf (~> 3.2) - rdf-microdata (3.2.1) + rdf-turtle (~> 3.2) + rdf-vocab (~> 3.2) + sinatra (~> 2.1) + rdf-microdata (3.3.0) htmlentities (~> 4.3) - nokogiri (~> 1.13) - rdf (~> 3.2) - rdf-rdfa (~> 3.2) - rdf-xsd (~> 3.2) - rdf-n3 (3.2.1) - ebnf (~> 2.2) - rdf (~> 3.2) - sparql (~> 3.2) - sxp (~> 1.2) - rdf-normalize (0.6.1) - rdf (~> 3.2) - rdf-ordered-repo (3.2.1) - rdf (~> 3.2, >= 3.2.1) - rdf-rdfa (3.2.3) - haml (>= 5.2, < 7) + nokogiri (~> 1.15, >= 1.15.4) + rdf (~> 3.3) + rdf-rdfa (~> 3.3) + rdf-xsd (~> 3.3) + rdf-n3 (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.3) + rdf-normalize (0.7.0) + rdf (~> 3.3) + rdf-ordered-repo (3.3.0) + rdf (~> 3.3) + rdf-rdfa (3.3.0) + haml (~> 6.1) htmlentities (~> 4.3) - rdf (~> 3.2) - rdf-aggregate-repo (~> 3.2) - rdf-vocab (~> 3.2) - rdf-xsd (~> 3.2) - rdf-rdfxml (3.2.2) - builder (~> 3.2) + rdf (~> 3.3) + rdf-aggregate-repo (~> 3.3) + rdf-vocab (~> 3.3) + rdf-xsd (~> 3.3) + rdf-rdfxml (3.3.0) + builder (~> 3.2, >= 3.2.4) htmlentities (~> 4.3) - rdf (~> 3.2) - rdf-xsd (~> 3.2) - rdf-reasoner (0.8.0) - rdf (~> 3.2) - rdf-xsd (~> 3.2) - rdf-tabular (3.1.1) - addressable (~> 2.3) - bcp47 (~> 0.3, >= 0.3.3) - json-ld (~> 3.1) - rdf (~> 3.1) - rdf-vocab (~> 3.1) - rdf-xsd (~> 3.1) - rdf-trig (3.2.0) - ebnf (~> 2.2) - rdf (~> 3.2) - rdf-turtle (~> 3.2) - rdf-trix (3.2.0) - rdf (~> 3.2) - rdf-xsd (~> 3.2) - rdf-turtle (3.2.1) - ebnf (~> 2.3) - rdf (~> 3.2) - rdf-vocab (3.2.7) - rdf (~> 3.2, >= 3.2.4) - rdf-xsd (3.2.1) - rdf (~> 3.2) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-reasoner (0.9.0) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-tabular (3.3.0) + addressable (~> 2.8) + bcp47_spec (~> 0.2) + json-ld (~> 3.3) + rdf (~> 3.3) + rdf-vocab (~> 3.3) + rdf-xsd (~> 3.3) + rdf-trig (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + rdf-turtle (~> 3.3) + rdf-trix (3.3.0) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-turtle (3.3.0) + ebnf (~> 2.4) + rdf (~> 3.3) + rdf-vocab (3.3.0) + rdf (~> 3.3) + rdf-xsd (3.3.0) + rdf (~> 3.3) rexml (~> 3.2) recaptcha (5.15.0) redic (1.5.3) @@ -897,21 +924,21 @@ GEM redis (>= 4) redlock (1.3.2) redis (>= 3.0.0, < 6.0) - reform (2.5.0) - disposable (>= 0.4.2, < 0.5.0) - representable (>= 2.4.0, < 3.1.0) + reform (2.6.2) + disposable (>= 0.5.0, < 1.0.0) + representable (>= 3.1.1, < 4) uber (< 0.2.0) reform-rails (0.2.6) activemodel (>= 5.0) reform (>= 2.3.1, < 3.0.0) - regexp_parser (2.8.1) - representable (3.0.4) + regexp_parser (2.8.2) + representable (3.2.0) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) request_store (1.5.1) rack (>= 1.4) - responders (3.1.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) @@ -935,14 +962,14 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) + rspec-rails (6.0.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) @@ -968,25 +995,13 @@ GEM ruby-next-core (0.15.3) ruby-oembed (0.16.1) ruby-progressbar (1.13.0) - ruby-saml (1.15.0) + ruby-saml (1.16.0) nokogiri (>= 1.13.10) rexml ruby2_keywords (0.0.5) - ruby_dep (1.5.0) rubyzip (2.3.2) - samvera-nesting_indexer (2.0.0) - dry-equalizer - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.1.0) - railties (>= 5.2.0) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -1000,23 +1015,23 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - shacl (0.1.1) - json-ld (~> 3.1, >= 3.1.7) - rdf (~> 3.1, >= 3.1.8) - sparql (~> 3.1) - sxp (~> 1.1) - shex (0.6.4) - ebnf (~> 2.1, >= 2.2) + shacl (0.4.0) + json-ld (~> 3.3) + rdf (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.2) + shex (0.8.0) + ebnf (~> 2.4) htmlentities (~> 4.3) - json-ld (~> 3.1) - json-ld-preloaded (~> 3.1) - rdf (~> 3.1) - rdf-xsd (~> 3.1) - sparql (~> 3.1) - sxp (~> 1.1) + json-ld (~> 3.3) + json-ld-preloaded (~> 3.3) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + sparql (~> 3.3) + sxp (~> 1.3) shoulda-matchers (4.5.1) activesupport (>= 4.2.0) - sidekiq (6.5.10) + sidekiq (6.5.12) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) @@ -1025,7 +1040,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simple_form (5.2.0) + simple_form (5.1.0) actionpack (>= 5.2) activemodel (>= 5.2) simplecov (0.16.1) @@ -1033,6 +1048,11 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) + sinatra (2.2.4) + mustermann (~> 2.0) + rack (~> 2.2) + rack-protection (= 2.2.4) + tilt (~> 2.0) slop (4.10.1) snaky_hash (2.0.1) hashie @@ -1040,18 +1060,18 @@ GEM sniffer (0.5.0) anyway_config (>= 1.0) dry-initializer (~> 3) - sparql (3.2.6) + sparql (3.3.0) builder (~> 3.2, >= 3.2.4) - ebnf (~> 2.3, >= 2.3.5) + ebnf (~> 2.4) logger (~> 1.5) - rdf (~> 3.2, >= 3.2.11) - rdf-aggregate-repo (~> 3.2, >= 3.2.1) - rdf-xsd (~> 3.2) - sparql-client (~> 3.2, >= 3.2.2) - sxp (~> 1.2, >= 1.2.4) - sparql-client (3.2.2) + rdf (~> 3.3) + rdf-aggregate-repo (~> 3.3) + rdf-xsd (~> 3.3) + sparql-client (~> 3.3) + sxp (~> 1.3) + sparql-client (3.3.0) net-http-persistent (~> 4.0, >= 4.0.2) - rdf (~> 3.2, >= 3.2.11) + rdf (~> 3.3) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -1067,16 +1087,16 @@ GEM stemmify (0.0.2) streamio-ffmpeg (3.0.2) multi_json (~> 1.8) - sxp (1.2.4) + sxp (1.3.0) matrix (~> 0.4) - rdf (~> 3.2) + rdf (~> 3.3) sync (0.5.0) - temple (0.10.2) + temple (0.10.3) term-ansicolor (1.7.1) tins (~> 1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) thread_safe (0.3.6) tilt (2.3.0) timeout (0.4.0) @@ -1084,14 +1104,11 @@ GEM sync tinymce-rails (5.10.7.1) railties (>= 3.1.1) - twitter-typeahead-rails (0.11.1.pre.corejavascript) - actionpack (>= 3.1) - jquery-rails - railties (>= 3.1) + trailblazer-option (0.1.2) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.11) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) tzinfo-data (1.2023.3) tzinfo (>= 1.0.0) uber (0.1.0) @@ -1103,14 +1120,13 @@ GEM unicode-display_width (1.8.0) unicode-types (1.9.0) validatable (1.6.7) - valkyrie (2.2.0) + valkyrie (3.1.1) activemodel activesupport - disposable (~> 0.4.5) - draper dry-struct dry-types (~> 1.0) - faraday (< 1.0) + faraday (>= 0.9, < 3, != 2.0.0) + faraday-multipart json json-ld railties @@ -1120,6 +1136,10 @@ GEM reform-rails vcr (5.1.0) version_gem (1.1.3) + view_component (2.74.1) + activesupport (>= 5.0.0, < 8.0) + concurrent-ruby (~> 1.0) + method_source (~> 1.0) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -1127,11 +1147,11 @@ GEM equalizer (~> 0.0, >= 0.0.9) warden (1.2.9) rack (>= 2.0.9) - web-console (3.7.0) - actionview (>= 5.0) - activemodel (>= 5.0) + web-console (4.2.1) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) bindex (>= 0.4.0) - railties (>= 5.0) + railties (>= 6.0.0) webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) @@ -1166,21 +1186,25 @@ GEM anyway_config (>= 1.3, < 3) sidekiq yabeda (~> 0.6) + yaml-ld (0.0.2) + json-ld (~> 3.2, >= 3.2.3) + psych (>= 3.3) + rdf (~> 3.2, >= 3.2.9) + rdf-xsd (~> 3.2) zeitwerk (2.6.12) zip_tricks (5.6.0) PLATFORMS aarch64-linux-musl - x86_64-linux DEPENDENCIES axe-matchers blacklight-oembed - blacklight_advanced_search (~> 6.4) + blacklight_advanced_search blacklight_dynamic_sitemap - blacklight_iiif_search (~> 1.0) + blacklight_iiif_search blacklight_oai_provider - blacklight_range_limit (~> 6) + bootstrap-sass browse-everything bulkrax! byebug @@ -1195,12 +1219,12 @@ DEPENDENCIES edtf (~> 3.0) equivalent-xml factory_bot_rails - faraday_middleware (~> 0.10.0) + faraday_middleware font-awesome-sass (~> 6.4, >= 6.4.2) honeycomb-beeline (>= 2.10.0) hydra-role-management - hyrax (= 3.6.0) - hyrax-migrator! + hyrax (= 5.0.0.rc2) + jquery-datatables-rails! jquery-rails libhoney (>= 2.1.0) listen (>= 3.0.5, < 3.2) @@ -1212,8 +1236,8 @@ DEPENDENCIES poltergeist pry-byebug pry-rails - puma (~> 5.6) - rails (~> 5.2) + puma + rails (~> 6.1) rails-controller-testing recaptcha rsolr (>= 1.0) @@ -1226,7 +1250,7 @@ DEPENDENCIES rubocop-rspec ruby-oembed rubyzip (~> 2) - sass-rails (~> 5.0) + sass-rails sassc-rails selenium-webdriver (~> 3) shoulda-matchers (~> 4) @@ -1250,4 +1274,4 @@ DEPENDENCIES zip_tricks (~> 5.3) BUNDLED WITH - 2.4.15 + 2.4.21 diff --git a/app/assets/html/401.html.haml b/app/assets/html/401.html.haml index 1c4e5d0ff..8dced3bc4 100644 --- a/app/assets/html/401.html.haml +++ b/app/assets/html/401.html.haml @@ -1,8 +1,6 @@ %html %head %title Oregon Digital - = stylesheet_link_tag 'application', media: 'all' - = javascript_include_tag 'application' %body %nav#masthead.navbar.navbar-inverse.navbar-static-top{ role: 'navigation', style: 'background-color: #dc4405;'} .container-fluid diff --git a/app/assets/html/403.html.haml b/app/assets/html/403.html.haml index 467a7d610..8c9d8cf67 100644 --- a/app/assets/html/403.html.haml +++ b/app/assets/html/403.html.haml @@ -1,8 +1,6 @@ %html %head %title Oregon Digital - = stylesheet_link_tag 'application', media: 'all' - = javascript_include_tag 'application' %body %nav#masthead.navbar.navbar-inverse.navbar-static-top{ role: 'navigation', style: 'background-color: #dc4405;'} .container-fluid diff --git a/app/assets/html/404.html.haml b/app/assets/html/404.html.haml index ef0ac6aa1..ade89e7d2 100644 --- a/app/assets/html/404.html.haml +++ b/app/assets/html/404.html.haml @@ -1,8 +1,6 @@ %html %head %title Oregon Digital - = stylesheet_link_tag 'application', media: 'all' - = javascript_include_tag 'application' %body %nav#masthead.navbar.navbar-inverse.navbar-static-top{ role: 'navigation', style: 'background-color: #dc4405;'} .container-fluid diff --git a/app/assets/html/418.html.haml b/app/assets/html/418.html.haml index ec9e8f35d..79d36c91e 100644 --- a/app/assets/html/418.html.haml +++ b/app/assets/html/418.html.haml @@ -1,8 +1,6 @@ %html %head %title Oregon Digital - = stylesheet_link_tag 'application', media: 'all' - = javascript_include_tag 'application' %body %nav#masthead.navbar.navbar-inverse.navbar-static-top{ role: 'navigation', style: 'background-color: #dc4405;'} .container-fluid diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index c6397d75d..820065378 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -24,6 +24,7 @@ //= require dataTables/jquery.dataTables //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap //= require blacklight/blacklight +//= require bootstrap-sprockets //= require_directory . //= require bulkrax/application @@ -31,12 +32,10 @@ //= require hyrax // Required for Hyrax override in assets/javascripts/hyrax/editor/controlled_vocabulary.es6 -//= require handlebars-v4.0.5 // For blacklight_range_limit built-in JS, if you don't want it you don't need // this: -//= require 'blacklight_range_limit' //= require cookieconsent diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 390a09862..c6bc953fd 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,11 +16,13 @@ *= require select2 *= require bulkrax/application *= require blacklight_advanced_search - *= require blacklight_range_limit *= require chosen *= require cookieconsent */ @import "*"; @import "blacklight/**/*"; -@import "oregon_digital/**/*"; \ No newline at end of file +@import "oregon_digital/**/*"; +@import "bootstrap-sprockets"; +@import "bootstrap"; +@import "dataTables/bootstrap/3/jquery.dataTables.bootstrap.scss"; \ No newline at end of file diff --git a/app/assets/stylesheets/hyrax.scss b/app/assets/stylesheets/hyrax.scss index 0e9cadd8e..0e77a8057 100644 --- a/app/assets/stylesheets/hyrax.scss +++ b/app/assets/stylesheets/hyrax.scss @@ -2,10 +2,4 @@ @import "bootstrap-sprockets"; @import 'bootstrap'; -@import 'blacklight/blacklight'; @import "font-awesome"; -@import "blacklight_gallery/gallery"; -@import "blacklight_gallery/masonry"; -@import "blacklight_gallery/slideshow"; -@import "blacklight_gallery/osd_viewer"; -@import 'hyrax/hyrax'; diff --git a/app/assets/stylesheets/oregon_digital/_breadcrumbs.scss b/app/assets/stylesheets/oregon_digital/_breadcrumbs.scss index dd47919d0..8f0b645e9 100644 --- a/app/assets/stylesheets/oregon_digital/_breadcrumbs.scss +++ b/app/assets/stylesheets/oregon_digital/_breadcrumbs.scss @@ -17,12 +17,12 @@ } // Dashboard nav needs to act like main content -.sidebar { - &.maximized + div nav.breadcrumb { - padding-left: $drawer-large + $gutter-width; - } - & + div nav.breadcrumb { - margin-left: 0; - padding-left: $drawer-small + $gutter-width; - } -} \ No newline at end of file +// .sidebar { +// &.maximized + div nav.breadcrumb { +// padding-left: $drawer-large + $gutter-width; +// } +// & + div nav.breadcrumb { +// margin-left: 0; +// padding-left: $drawer-small + $gutter-width; +// } +// } \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ef4867307..42d3331a2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -14,9 +14,6 @@ class ApplicationController < ActionController::Base with_themed_layout '1_column' - # Hyrax 2.1 migration - skip_after_action :discard_flash_if_xhr - protect_from_forgery with: :exception # Send user to 401/403 page rather than forward with flash message diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 0f4b347a6..453626708 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -4,7 +4,6 @@ # indexing, displays, and other various discovery methods class CatalogController < ApplicationController include BlacklightAdvancedSearch::Controller - include BlacklightRangeLimit::ControllerOverride include Hydra::Catalog include Hydra::Controller::ControllerBehavior include BlacklightOaiProvider::Controller diff --git a/app/controllers/concerns/oregon_digital/blacklight_config_behavior.rb b/app/controllers/concerns/oregon_digital/blacklight_config_behavior.rb index 3dde1bd4c..95fd0912f 100644 --- a/app/controllers/concerns/oregon_digital/blacklight_config_behavior.rb +++ b/app/controllers/concerns/oregon_digital/blacklight_config_behavior.rb @@ -67,7 +67,7 @@ def self.modified_field config.index.thumbnail_field = 'thumbnail_path_ss' # Remove the view type selector (masonry, grid, list, etc) from the sort/show section so we can add it somewhere else - config.index.collection_actions.delete_field 'view_type_group' + #config.index.collection_actions.delete_field 'view_type_group' # The generic_type isn't displayed on the facet list # It's used to give a label to the filter that comes from the user profile diff --git a/app/controllers/concerns/oregon_digital/works_controller_behavior.rb b/app/controllers/concerns/oregon_digital/works_controller_behavior.rb index 87d099186..33efe3895 100644 --- a/app/controllers/concerns/oregon_digital/works_controller_behavior.rb +++ b/app/controllers/concerns/oregon_digital/works_controller_behavior.rb @@ -16,8 +16,8 @@ def redirect_mismatched_work # We can use Hyrax::WorksControllerBehavior definition and add on additional params we want def attributes_for_actor attributes = super - oembed_urls = params.fetch(:oembed_urls, []) - attributes[:oembed_urls] = oembed_urls + #oembed_urls = params.fetch(:oembed_urls, []) + #attributes[:oembed_urls] = oembed_urls attributes end diff --git a/app/controllers/hyrax/admin/workflows_catalog_behavior.rb b/app/controllers/hyrax/admin/workflows_catalog_behavior.rb index 073f1853c..7497a6fcb 100644 --- a/app/controllers/hyrax/admin/workflows_catalog_behavior.rb +++ b/app/controllers/hyrax/admin/workflows_catalog_behavior.rb @@ -6,7 +6,6 @@ module Admin module WorkflowsCatalogBehavior extend ActiveSupport::Concern include BlacklightAdvancedSearch::Controller - include BlacklightRangeLimit::ControllerOverride include Hydra::Catalog include Hydra::Controller::ControllerBehavior include OregonDigital::BlacklightConfigBehavior diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb index fbea95d27..65b7b6c8e 100644 --- a/app/controllers/hyrax/homepage_controller.rb +++ b/app/controllers/hyrax/homepage_controller.rb @@ -4,7 +4,7 @@ class Hyrax::HomepageController < ApplicationController # Adds Hydra behaviors into the application controller include Blacklight::SearchContext - include Blacklight::SearchHelper + #include Blacklight::SearchHelper include Blacklight::AccessControls::Catalog # The search builder for finding recent documents @@ -19,36 +19,27 @@ def search_builder_class helper Hyrax::ContentBlockHelper def index - @presenter = presenter_class.new(current_ability, collections) + @presenter = presenter_class.new(current_ability, []) @featured_researcher = ContentBlock.for(:researcher) @marketing_text = ContentBlock.for(:marketing) @featured_work_list = FeaturedWorkList.new @announcement_text = ContentBlock.for(:announcement) - recent end private # OVERRIDE FROM HYRAX to increase number of collections rows # Return 8 collections - def collections(rows: 8) - # TODO: set CollectionSearchBuilder to retrieve collections from a curated list, instead of newest collections - builder = OregonDigital::NonUserCollectionsSearchBuilder.new(self) - .rows(rows) - .merge(sort: sort_field) - response = repository.search(builder) - response.documents - rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest - [] - end - - def recent - # OVERRIDE FROM HYRAX to increase number of recent document rows - # grab any recent documents - (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 6) - rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest - @recent_documents = [] - end + # def collections(rows: 8) + # # TODO: set CollectionSearchBuilder to retrieve collections from a curated list, instead of newest collections + # builder = OregonDigital::NonUserCollectionsSearchBuilder.new(self) + # .rows(rows) + # .merge(sort: sort_field) + # response = repository.search(builder) + # response.documents + # rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest + # [] + # end def sort_field 'system_create_dtsi desc' diff --git a/app/controllers/oregon_digital/explore_collections_controller.rb b/app/controllers/oregon_digital/explore_collections_controller.rb index 075988e76..9b4b3d2ca 100644 --- a/app/controllers/oregon_digital/explore_collections_controller.rb +++ b/app/controllers/oregon_digital/explore_collections_controller.rb @@ -4,7 +4,6 @@ module OregonDigital # Controller for explore collections interface class ExploreCollectionsController < ApplicationController include BlacklightAdvancedSearch::Controller - include BlacklightRangeLimit::ControllerOverride include Hydra::Catalog include Hydra::Controller::ControllerBehavior include OregonDigital::BlacklightConfigBehavior diff --git a/app/controllers/search_history_controller.rb b/app/controllers/search_history_controller.rb index aba3c746e..15ad7204c 100644 --- a/app/controllers/search_history_controller.rb +++ b/app/controllers/search_history_controller.rb @@ -5,6 +5,4 @@ class SearchHistoryController < ApplicationController include Blacklight::SearchHistory helper BlacklightAdvancedSearch::RenderConstraintsOverride - helper BlacklightRangeLimit::ViewHelperOverride - helper RangeLimitHelper end diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb index 61dd19e42..2bc8e7109 100644 --- a/app/models/search_builder.rb +++ b/app/models/search_builder.rb @@ -5,7 +5,6 @@ class SearchBuilder < Blacklight::SearchBuilder include Blacklight::Solr::SearchBuilderBehavior include Hydra::AccessControlsEnforcement include Hyrax::SearchFilters - include BlacklightRangeLimit::RangeLimitBuilder include BlacklightAdvancedSearch::AdvancedSearchBuilder self.default_processor_chain += %i[add_advanced_search_to_solr] diff --git a/app/models/user.rb b/app/models/user.rb index d9272cabb..8dce079bb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -8,13 +8,12 @@ class User < ApplicationRecord include Hyrax::UserUsageStats include Blacklight::User - attr_accessible :email, :password, :password_confirmation if Blacklight::Utils.needs_attr_accessible? before_create :role_from_devise # DISABLE RUBOCOP BECAUSE DEVISE REQUIRES A PARTICULAR FORMAT # rubocop:disable Style/SymbolArray # Include default devise modules. Others available are: - devise :database_authenticatable, :registerable, :recoverable, :confirmable, + devise :database_authenticatable, :registerable, :recoverable, :omniauthable, :validatable, omniauth_providers: [:cas, :saml] # rubocop:enable Style/SymbolArray diff --git a/app/views/_ga.html.erb b/app/views/_ga.html.erb index c4b830d25..866081395 100644 --- a/app/views/_ga.html.erb +++ b/app/views/_ga.html.erb @@ -1,10 +1 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/config/initializers/hyrax_migrator.rb b/config/initializers/hyrax_migrator.rb deleted file mode 100644 index 71c2af0b4..000000000 --- a/config/initializers/hyrax_migrator.rb +++ /dev/null @@ -1,95 +0,0 @@ -# frozen_string_literal:true - -Hyrax::Migrator.config do |config| - # The location to mount the migration application to, `migrator` would mount at http://domain/migrator - config.mount_at = 'migrator' - - # The redis queue name for background jobs to run in - # config.queue_name = 'hyrax_migrator' - - # Set a specific logger for the engine to use - config.logger = Rails.logger - - # Register models for migration - # config.register_model ::Models::Image - config.register_model Generic - config.register_model Image - config.register_model Video - config.register_model Document - config.register_model Audio - - # Migration user - config.migration_user = 'admin@example.org' - - # The model crosswalk used by ModelLookupService - config.model_crosswalk = File.join(Rails.root, 'config/initializers/migrator/model_crosswalk.yml') - - # The crosswalk metadata file that lists properties and predicates - config.crosswalk_metadata_file = File.join(Rails.root, 'config/initializers/migrator/crosswalk.yml') - - # The crosswalk overrides metadata file for properties and predicates that need special handling - config.crosswalk_overrides_file = ENV['CROSSWALK_OVERRIDES_FILE'] - - # The crosswalk file for associating primary sets in OD1 with admin sets in OD2 - config.crosswalk_admin_sets_file = File.join(Rails.root, 'config/initializers/migrator/crosswalk_admin_sets.yml') - - # The list of required fields - config.required_fields_file = "config/initializers/migrator/required_fields.yml" - - # Set to true for debugging - config.skip_field_mode = ENV['SKIP_FIELD_MODE'] - # Skip content if not found - config.content_file_can_be_nil = ENV['CONTENT_FILE_CAN_BE_NIL'] - - config.upload_storage_service = :file_system - config.ingest_storage_service = :file_system - # The service used to upload files ready for migration. It defaults to file_system for test and development. On production, it defaults to aws_s3 - # config.upload_storage_service = if Rails.env.production? - # :aws_s3 - # else - # :file_system - # end - - config.fields_map = "config/initializers/migrator/fields_map.yml" - - # The destination file system path used mainly for :file_system storage during file uploads. It defaults to environment BROWSEEVERYTHING_FILESYSTEM_PATH. - config.file_system_path = ENV['BROWSEEVERYTHING_FILESYSTEM_PATH'] - - # The service used to ingest bags during migration. It defaults to file_system for test and development. On production, it defaults to aws_s3 - # config.ingest_storage_service = if Rails.env.production? - # :aws_s3 - # else - # :file_system - # end - - # The file system path used mainly for :file_system storage during mass ingest. It defaults to environment INGEST_LOCAL_PATH. - config.ingest_local_path = ENV['INGEST_LOCAL_PATH'] - - # The AWS S3 bucket used for :aws_s3 storage during mass ingest. It defaults to environment AWS_S3_INGEST_BUCKET. - # config.aws_s3_ingest_bucket = ENV['AWS_S3_INGEST_BUCKET'] - - # The AWS S3 app key used for :aws_s3 service. It defaults to environment AWS_S3_APP_KEY. - # config.aws_s3_app_key = ENV['AWS_S3_APP_KEY'] - - # The AWS S3 app key used for :aws_s3 service. It defaults to environment AWS_S3_APP_SECRET. - # config.aws_s3_app_secret = ENV['AWS_S3_APP_SECRET'] - - # The AWS S3 bucket (destination) used for :aws_s3 storage service during file uploads. It defaults to environment AWS_S3_BUCKET - # config.aws_s3_bucket = ENV['AWS_S3_BUCKET'] - - # The AWS S3 region (destination) used for :aws_s3 service. It defaults to environment AWS_S3_REGION - # config.aws_s3_region = ENV['AWS_S3_REGION'] - - # The time a presigned_url is available after the upload in seconds (aws_s3 service). It defaults to 86400 seconds (24 hours). - # config.aws_s3_url_availability = 86400 - - # VerifyWorkService uses this config as the default list of verifications to run - config.verify_services = [ - Hyrax::Migrator::Services::VerifyMetadataService, - Hyrax::Migrator::Services::VerifyVisibilityService, - Hyrax::Migrator::Services::VerifyChecksumsService, - Hyrax::Migrator::Services::VerifyChildrenService, - Hyrax::Migrator::Services::VerifyDerivativesService, - Hyrax::Migrator::Services::VerifyLabelsExistService - ] -end diff --git a/config/routes.rb b/config/routes.rb index 5083391b0..7851d6e33 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,6 @@ Rails.application.routes.draw do - concern :range_searchable, BlacklightRangeLimit::Routes::RangeSearchable.new concern :iiif_search, BlacklightIiifSearch::Routes.new resources :collections, controller: 'oregon_digital/explore_collections', only: [] do collection do @@ -38,7 +37,6 @@ resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do concerns :searchable - concerns :range_searchable concerns :oai_provider end @@ -57,7 +55,6 @@ mount Hydra::RoleManagement::Engine => '/' mount Qa::Engine => '/authorities' mount Hyrax::Engine, at: '/' - mount Hyrax::Migrator::Engine, at: '/migrator' resources :welcome, only: 'index' root 'hyrax/homepage#index' curation_concerns_basic_routes @@ -75,7 +72,6 @@ scope module: 'hyrax' do namespace :admin do resource :workflows, only: [:index], as: 'workflows', path: '/workflows', controller: 'workflows' do - concerns :range_searchable end end end diff --git a/db/schema.rb b/db/schema.rb index aa4ff2b0c..26a1b6a8f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -39,7 +39,7 @@ t.datetime "last_error_at" t.datetime "last_succeeded_at" t.string "importerexporter_type", default: "Bulkrax::Importer" - t.index ["importerexporter_id"], name: "index_bulkrax_entries_on_importerexporter_id" + t.integer "import_attempts", default: 0 end create_table "bulkrax_exporter_runs", force: :cascade do |t| @@ -70,6 +70,8 @@ t.date "finish_date" t.string "work_visibility" t.string "workflow_status" + t.boolean "include_thumbnails", default: false + t.boolean "generated_metadata", default: false t.index ["user_id"], name: "index_bulkrax_exporters_on_user_id" end @@ -88,6 +90,11 @@ t.integer "processed_relationships", default: 0 t.integer "failed_relationships", default: 0 t.text "invalid_records" + t.integer "processed_file_sets", default: 0 + t.integer "failed_file_sets", default: 0 + t.integer "total_file_set_entries", default: 0 + t.integer "processed_works", default: 0 + t.integer "failed_works", default: 0 t.index ["importer_id"], name: "index_bulkrax_importer_runs_on_importer_id" end @@ -108,6 +115,16 @@ t.index ["user_id"], name: "index_bulkrax_importers_on_user_id" end + create_table "bulkrax_pending_relationships", force: :cascade do |t| + t.bigint "importer_run_id", null: false + t.string "parent_id", null: false + t.string "child_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "order", default: 0 + t.index ["importer_run_id"], name: "index_bulkrax_pending_relationships_on_importer_run_id" + end + create_table "bulkrax_statuses", force: :cascade do |t| t.string "status_message" t.string "error_class" @@ -710,6 +727,7 @@ add_foreign_key "bulkrax_exporter_runs", "bulkrax_exporters", column: "exporter_id" add_foreign_key "bulkrax_importer_runs", "bulkrax_importers", column: "importer_id" + add_foreign_key "bulkrax_pending_relationships", "bulkrax_importer_runs", column: "importer_run_id" add_foreign_key "collection_type_participants", "hyrax_collection_types" add_foreign_key "curation_concerns_operations", "users" add_foreign_key "mailboxer_conversation_opt_outs", "mailboxer_conversations", column: "conversation_id", name: "mb_opt_outs_on_conversations_id" diff --git a/docker-compose.yml b/docker-compose.yml index f6e726cee..5d36e7293 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -179,9 +179,9 @@ services: external: chrome: # x86 - image: selenium/node-chrome-debug:3.141.5-astatine + # image: selenium/node-chrome-debug:3.141.5-astatine # m1/arm - # image: seleniarm/node-chromium:105.0 + image: seleniarm/node-chromium:105.0 volumes: - ./spec/fixtures:/data/spec/fixtures depends_on: @@ -230,10 +230,10 @@ services: # Fedora repository server fcrepo: &fcrepo # x86 - image: ualbertalib/docker-fcrepo4:4.7 + #image: ualbertalib/docker-fcrepo4:4.7 # m1/arm - # build: - # context: m1/fcrepo + build: + context: m1/fcrepo environment: - JAVA_OPTS=${JAVA_OPTS} -Dfcrepo.modeshape.configuration="classpath:/config/file-simple/repository.json" -Dfcrepo.object.directory="/data/objects" -Dfcrepo.binary.directory="/data/binaries" expose: @@ -254,8 +254,8 @@ services: # x86 image: lyrasis/blazegraph:2.1.5 # m1/arm - # build: - # context: m1/bg + build: + context: m1/bg expose: - 8080 networks: diff --git a/package.json b/package.json index 5157f82a5..5d4e1c8a8 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "repository": "git@github.com:samvera/hyrax.git", "dependencies": { + "handlebars": "4.0.5", "jquery": "3.5.0", "node-fetch": "2.6.7", "shx": "^0.3.2", @@ -16,4 +17,4 @@ "uv-install": "shx mkdir ./public/uv && cp -r ./node_modules/universalviewer/dist/* ./public/uv/", "uv-config": "shx cp ./config/uv/* ./public/uv/" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 5ac2935cd..7b2f87714 100644 --- a/yarn.lock +++ b/yarn.lock @@ -318,6 +318,15 @@ ajv@^6.1.0, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +align-text@^0.1.1, align-text@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" + integrity sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg== + dependencies: + kind-of "^3.0.2" + longest "^1.0.1" + repeat-string "^1.5.2" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -335,6 +344,11 @@ ansi-styles@^4.0.0: dependencies: color-convert "^2.0.1" +async@^1.4.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" + integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== + balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -358,6 +372,19 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +camelcase@^1.0.2: + version "1.2.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" + integrity sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g== + +center-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" + integrity sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ== + dependencies: + align-text "^0.1.3" + lazy-cache "^1.0.3" + classnames@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" @@ -378,6 +405,15 @@ clean-css@^5.2.2: dependencies: source-map "~0.6.0" +cliui@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" + integrity sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA== + dependencies: + center-align "^0.1.1" + right-align "^0.1.1" + wordwrap "0.0.2" + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -549,6 +585,11 @@ debug@^3.2.6: dependencies: ms "^2.1.1" +decamelize@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== + deep-diff@^0.3.5: version "0.3.8" resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" @@ -852,6 +893,17 @@ graceful-fs@^4.1.2: resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== +handlebars@4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.5.tgz#92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7" + integrity sha512-lLThw5yQrUydF7RydVKsSiGGbCzF2B3KN3Kltw+qetLjD5wTvuxL8o+LYEPM+b0wOLhb0yHDZICosz+BPAC3fA== + dependencies: + async "^1.4.0" + optimist "^0.6.1" + source-map "^0.4.4" + optionalDependencies: + uglify-js "^2.6" + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -916,6 +968,11 @@ ionicons@^4.6.3: resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-4.6.3.tgz#e4f3a3e9b66761eb8c0db27798cc1a8ce97777d2" integrity sha512-cgP+VIr2cTJpMfFyVHTerq6n2jeoiGboVoe3GlaAo5zoSBDAEXORwUZhv6m+lCyxlsHCS3nqPUE+MKyZU71t8Q== +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + is-core-module@^2.8.1: version "2.9.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" @@ -1010,11 +1067,23 @@ jszip@*, jszip@^3.1.5, jszip@^3.2.2: readable-stream "~2.3.6" setimmediate "^1.0.5" +kind-of@^3.0.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== + dependencies: + is-buffer "^1.1.5" + klona@^2.0.4: version "2.0.5" resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== +lazy-cache@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" + integrity sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ== + less-loader@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" @@ -1116,6 +1185,11 @@ lodash@^4.17.10, lodash@^4.17.21: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +longest@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + integrity sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg== + loose-envify@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -1225,6 +1299,11 @@ minimist@^1.2.0, minimist@^1.2.3: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== +minimist@~0.0.1: + version "0.0.10" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + integrity sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw== + mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" @@ -1293,6 +1372,14 @@ openseadragon@2.4.2: resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-2.4.2.tgz#f25d833d0ab9941599d65a3e2b44bec546c9f15c" integrity sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw== +optimist@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + integrity sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g== + dependencies: + minimist "~0.0.1" + wordwrap "~0.0.2" + pako@~1.0.2: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -1490,6 +1577,11 @@ regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +repeat-string@^1.5.2: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -1504,6 +1596,13 @@ resolve@^1.1.6: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +right-align@^0.1.1: + version "0.1.3" + resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" + integrity sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg== + dependencies: + align-text "^0.1.1" + round10@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/round10/-/round10-1.0.3.tgz#86110f46a10874a1931da7fdd5e06d1857a8e4d0" @@ -1604,7 +1703,7 @@ source-map-js@^1.0.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map@0.4.x: +source-map@0.4.x, source-map@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" integrity sha1-66T12pwNyZneaAMti092FzZSA2s= @@ -1616,6 +1715,11 @@ source-map@^0.6.1, source-map@~0.6.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +source-map@~0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -1731,6 +1835,21 @@ type@^2.5.0: resolved "https://registry.yarnpkg.com/type/-/type-2.6.0.tgz#3ca6099af5981d36ca86b78442973694278a219f" integrity sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ== +uglify-js@^2.6: + version "2.8.29" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" + integrity sha512-qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w== + dependencies: + source-map "~0.5.1" + yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" + +uglify-to-browserify@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" + integrity sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q== + unfetch@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" @@ -1842,6 +1961,21 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +window-size@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" + integrity sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg== + +wordwrap@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" + integrity sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q== + +wordwrap@~0.0.2: + version "0.0.3" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + integrity sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw== + worker-loader@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-1.1.1.tgz#920d74ddac6816fc635392653ed8b4af1929fd92" @@ -1915,6 +2049,16 @@ yargs@^16.1.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@~3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" + integrity sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A== + dependencies: + camelcase "^1.0.2" + cliui "^2.1.0" + decamelize "^1.0.0" + window-size "0.1.0" + zustand@^4.0.0-rc.0: version "4.0.0-rc.1" resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.0.0-rc.1.tgz#ec30a3afc03728adec7e1bd7bcc3592176372201" From ef5f08710039019254f3604c321d82d9be44868e Mon Sep 17 00:00:00 2001 From: straleyb Date: Wed, 25 Oct 2023 13:44:45 -0400 Subject: [PATCH 2/3] add back in ssl library --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c7ac0587e..3c9988291 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN apk --no-cache update && apk --no-cache upgrade && \ git sqlite sqlite-dev postgresql-dev libjpeg-turbo-dev libpng-dev \ libtool libgomp libreoffice java-common libc6-compat \ curl build-base tzdata zip autoconf automake libtool texinfo \ - bash bash-completion java-common openjdk11-jre-headless graphicsmagick \ + bash bash-completion java-common openjdk11-jre-headless libressl graphicsmagick \ poppler-utils ffmpeg tesseract-ocr openjpeg-dev openjpeg-tools openjpeg less\ libffi libffi-dev xz gcompat tini tmux libxslt-dev libxml2-dev From b1417099fb1e92ab0c52594dc1040db892ae319b Mon Sep 17 00:00:00 2001 From: straleyb Date: Mon, 13 Nov 2023 11:10:06 -0800 Subject: [PATCH 3/3] gemfile updates --- Gemfile | 1 + Gemfile.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index db850eb18..875b8b0dc 100644 --- a/Gemfile +++ b/Gemfile @@ -39,6 +39,7 @@ gem 'blacklight_dynamic_sitemap' gem 'triplestore-adapter', git: 'https://github.com/osulp/triplestore-adapter' gem 'faraday_middleware' gem 'blacklight_iiif_search' +gem 'blacklight_range_limit' gem 'rubyzip', '~> 2' gem 'zip_tricks', '~> 5.3' gem 'bulkrax', github: 'samvera-labs/bulkrax', ref: 'd9bc39781b9c542a766b9ff2f7a7cce2d736debd' #5.2.1 diff --git a/Gemfile.lock b/Gemfile.lock index 457441f52..3f73d222e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,6 +214,9 @@ GEM blacklight (~> 7.0) oai (~> 1.2) rexml + blacklight_range_limit (8.3.0) + blacklight (>= 7.25.2, < 9) + deprecation bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -1204,6 +1207,7 @@ DEPENDENCIES blacklight_dynamic_sitemap blacklight_iiif_search blacklight_oai_provider + blacklight_range_limit bootstrap-sass browse-everything bulkrax!