diff --git a/.circleci/config.yml b/.circleci/config.yml index 61357bf13d..d31ad46c96 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,8 @@ jobs: - image: avalonmediasystem/avalon:develop environment: - DATABASE_URL=postgresql://postgres@localhost:5432/postgres - - FEDORA_URL=http://localhost:8080/fcrepo/rest + - FEDORA_URL=http://fedoraAdmin:fedoraAdmin@localhost:8080/fcrepo/rest + - FEDORA_BASE_PATH=/test - FEDORA_TIMEOUT=300 - RAILS_ENV=test # Secondary container image on common network. @@ -17,9 +18,9 @@ jobs: - POSTGRES_USER=postgres - POSTGRES_DB=avalon - POSTGRES_PASSWORD=password - - image: ualbertalib/docker-fcrepo4:4.7 + - image: fcrepo/fcrepo:6.5-tomcat9 environment: - CATALINA_OPTS: '-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC' + CATALINA_OPTS: -Dfcrepo.autoversioning.enabled=false - image: zookeeper:3.9 environment: ZOO_ADMINSERVER_ENABLED: false @@ -142,7 +143,7 @@ jobs: default: 4 docker: # Primary container image where all steps run. - - image: avalonmediasystem/avalon:7.5.0-dev-ruby3 + - image: avalonmediasystem/avalon:7.8.0-dev working_directory: /home/app/avalon @@ -165,10 +166,10 @@ workflows: build_test_report: jobs: - build: - ruby_ver: '3.2' - name: 'Ruby3-2' + ruby_ver: '3.3' + name: 'Ruby3-3' parallelism: 4 - upload-coverage: parallelism: 4 requires: - - Ruby3-2 + - Ruby3-3 diff --git a/Dockerfile b/Dockerfile index 0942a04acc..da75951dd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base stage for building gems -FROM ruby:3.2-bullseye as bundle +FROM ruby:3.3-bullseye as bundle LABEL stage=build LABEL project=avalon RUN apt-get update && apt-get upgrade -y build-essential && apt-get autoremove \ @@ -10,6 +10,7 @@ RUN apt-get update && apt-get upgrade -y build-essential && apt-get autor git \ ffmpeg \ libsqlite3-dev \ + libjemalloc2 \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean @@ -19,8 +20,11 @@ COPY Gemfile.lock ./Gemfile.lock RUN gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" \ && bundle config build.nokogiri --use-system-libraries -ENV RUBY_THREAD_MACHINE_STACK_SIZE 8388608 -ENV RUBY_THREAD_VM_STACK_SIZE 8388608 +ENV RUBY_THREAD_MACHINE_STACK_SIZE 8388608 \ + RUBY_THREAD_VM_STACK_SIZE 8388608 \ + LD_PRELOAD="libjemalloc.so.2" \ + MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true" \ + RUBY_YJIT_ENABLE=1 # Build development gems @@ -33,7 +37,7 @@ RUN bundle config set --local without 'production' \ # Download binaries in parallel -FROM ruby:3.2-bullseye as download +FROM ruby:3.3-bullseye as download LABEL stage=build LABEL project=avalon RUN curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz | tar xvz -C /usr/bin/ @@ -46,7 +50,7 @@ RUN apt-get -y update && apt-get install -y ffmpeg # Base stage for building final images -FROM ruby:3.2-slim-bullseye as base +FROM ruby:3.3-slim-bullseye as base LABEL stage=build LABEL project=avalon RUN echo "deb http://ftp.us.debian.org/debian/ bullseye main contrib non-free" > /etc/apt/sources.list.d/bullseye.list \ @@ -77,6 +81,7 @@ RUN apt-get update && \ zip \ dumb-init \ libsqlite3-dev \ + libjemalloc2 \ && apt-get -y install mediainfo \ && ln -s /usr/bin/lsof /usr/sbin/ @@ -84,6 +89,10 @@ RUN useradd -m -U app \ && su -s /bin/bash -c "mkdir -p /home/app/avalon" app WORKDIR /home/app/avalon +ENV LD_PRELOAD="libjemalloc.so.2" \ + MALLOC_CONF="dirty_decay_ms:1000,narenas:2,background_thread:true" \ + RUBY_YJIT_ENABLE=1 + # Build devevelopment image FROM base as dev diff --git a/Gemfile b/Gemfile index e108dde2c8..012299b183 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'bootsnap', require: false gem 'listen' gem 'net-smtp', require: false gem 'psych', '< 4' -gem 'rails', '~>7.0.8' +gem 'rails', '~>7.2.2' gem 'sprockets', '~>3.7.2' #gem 'sprockets-rails', require: 'sprockets/railtie' gem 'sqlite3' @@ -13,7 +13,7 @@ gem 'sqlite3' gem 'mail', '> 2.8.0.1' # Assets -gem 'bootstrap', '~> 4.0' +gem 'bootstrap', '4.6.2' gem 'coffee-rails', '~> 5.0' gem "font-awesome-rails" gem 'jquery-datatables' @@ -29,11 +29,13 @@ gem 'terser' gem 'shakapacker' # Core Samvera -gem 'active-fedora', '~> 14.0', '>= 14.0.1' -gem 'active_fedora-datastreams', '~> 0.5' -gem 'hydra-head', '~> 12.0' +#gem 'active-fedora', '~> 15.0' +#gem 'active_fedora-datastreams', '~> 0.5' +gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'fedora6_rebase' +gem 'active_fedora-datastreams', git: 'https://github.com/samvera-labs/active_fedora-datastreams.git', branch: 'fedora6_rebase' +gem 'hydra-head', '~> 13.0' gem 'ldp', '~> 1.1.0' -gem 'noid-rails', '~> 3.1' +gem 'noid-rails', '~> 3.2' gem 'om', git: 'https://github.com/avalonmediasystem/om.git', tag: 'v3.2.0-ruby3' gem 'rdf-rdfxml' @@ -45,11 +47,11 @@ gem 'rsolr', '~> 2.0' # Rails & Samvera Plugins gem 'about_page', git: 'https://github.com/avalonmediasystem/about_page.git', tag: 'avalon-r6.5' -gem 'active_annotations', '~> 0.4' +gem 'active_annotations', '~> 0.5.0' gem 'activerecord-session_store', '>= 2.0.0' gem 'acts_as_list' gem 'api-pagination' -gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git', tag: 'avalon-r7.7' +gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git', tag: 'avalon-r8.0' #gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers gem 'bootstrap-toggle-rails' gem 'bootstrap_form' @@ -57,11 +59,11 @@ gem 'iiif_manifest', '~> 1.6' gem 'rack-cors', require: 'rack/cors' gem 'rails_same_site_cookie' gem 'recaptcha', require: 'recaptcha/rails' -gem 'samvera-persona', '~> 0.4', '>= 0.4.1' -gem 'speedy-af', '~> 0.3' +gem 'samvera-persona', '~> 0.5.0' +gem 'speedy-af', git: 'https://github.com/samvera-labs/speedy_af.git', branch: 'empty_reflection' # Avalon Components -gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r6.5' +gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r8.0' # Authentication & Authorization gem 'devise', '~> 4.8' @@ -71,14 +73,13 @@ gem 'net-ldap' gem 'omniauth', '~> 2.0' gem 'omniauth-identity', '>= 2.0.0' gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git", tag: 'avalon-r4' -gem "omniauth-saml", "~> 2.0" +gem "omniauth-saml", "~> 2.0", ">= 2.2.1" # Media Access & Transcoding -gem 'active_encode', '>= 1.2.2' +gem 'active_encode', '~> 1.2' gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform' -gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon' +gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'sharepoint_integration' gem 'fastimage' -gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", tag: 'v0.7.1-avalon' gem 'rest-client', '~> 2.0' gem 'roo' gem 'wavefile', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index a1027bec21..d4e74213ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,43 +8,35 @@ GIT GIT remote: https://github.com/avalonmediasystem/avalon-about.git - revision: cc8d816b9751d6a04750399d9ef828a33e7ac7eb - tag: avalon-r7.7 + revision: f3106d139d9092ffb0e9ca468fac9e85188ad339 + tag: avalon-r8.0 specs: avalon-about (0.1.0) about_page - mediainfo GIT remote: https://github.com/avalonmediasystem/avalon-workflow.git - revision: 1c188a2be9255ebd8b0b959f04dbf5f888715fb9 - tag: avalon-r6.5 + revision: 503f5fd195359ca73e7facf79843381c611cfa0b + tag: avalon-r8.0 specs: avalon-workflow (0.0.3) GIT remote: https://github.com/avalonmediasystem/browse-everything.git - revision: 51ac41d1631eba86b123222d9bfeef342f25ec56 - branch: v1.2-avalon + revision: eefa721865f392cd3b58f679a9761cbb3e4b5cc9 + branch: sharepoint_integration specs: - browse-everything (1.2.0) + browse-everything (1.4.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.1) + rails (>= 4.2, < 8.0) ruby-box signet (~> 0.8) typhoeus -GIT - remote: https://github.com/avalonmediasystem/mediainfo.git - revision: bea9479d33328c6b483ee19c008730f939d98266 - tag: v0.7.1-avalon - specs: - mediainfo (0.7.1) - GIT remote: https://github.com/avalonmediasystem/om.git revision: ffde890b4187a7d8be41ae387264cd6eb20b6ba8 @@ -65,184 +57,225 @@ GIT ims-lti omniauth +GIT + remote: https://github.com/samvera-labs/active_fedora-datastreams.git + revision: 3e1b54f60e6d6316e114f608ee5c50c85d6598c6 + branch: fedora6_rebase + specs: + active_fedora-datastreams (0.5.0) + active-fedora (>= 11.0.0.pre) + activemodel (>= 5.2) + nom-xml (>= 0.5.1) + om (~> 3.1) + rdf (~> 3.2) + rdf-rdfa (= 3.2.0) + rdf-rdfxml (~> 3.2) + +GIT + remote: https://github.com/samvera-labs/speedy_af.git + revision: 223abe9e2a7cdc68b033398bf69922523aeff47e + branch: empty_reflection + specs: + speedy-af (0.3.0) + activesupport (> 5.2) + +GIT + remote: https://github.com/samvera/active_fedora.git + revision: 0f5ccb1536224efec750941ce9a1f58f2e09cd3c + branch: fedora6_rebase + specs: + active-fedora (15.0.1) + active-triples (>= 0.11.0, < 2.0.0) + activemodel (>= 6.1) + activesupport (>= 6.1) + deprecation + faraday (>= 2.0) + faraday-encoding (>= 0.0.5) + faraday-follow_redirects + ldp (>= 0.7.0, < 2) + mutex_m + rsolr (>= 1.1.2, < 3) + ruby-progressbar (~> 1.0) + GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + actioncable (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) - rack (~> 2.0, >= 2.2.4) + zeitwerk (~> 2.6) + actionmailbox (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) + actionmailer (7.2.2) + actionpack (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activesupport (= 7.2.2) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.2) + actionview (= 7.2.2) + activesupport (= 7.2.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.2) + actionpack (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.2.2) + activesupport (= 7.2.2) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.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 (>= 1.0) - faraday-encoding (>= 0.0.5) - ldp (>= 0.7.0, < 2) - rsolr (>= 1.1.2, < 3) - ruby-progressbar (~> 1.0) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) active-triples (1.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rdf (>= 2.0.2, < 4.0) rdf-vocab (>= 2.0, < 4.0) - active_annotations (0.4.0) + active_annotations (0.5.0) json-ld - rails (>= 5.2, < 7.1) + rails (>= 5.2, < 7.3) rdf-vocab (>= 2.1.0) - active_elastic_job (3.2.0) + active_elastic_job (3.3.0) aws-sdk-sqs (~> 1) - rails (>= 5.2.6, < 7.1) - active_encode (1.2.2) + rails (>= 5.2.6, < 8) + active_encode (1.2.3) addressable (~> 2.8) rails - active_fedora-datastreams (0.5.0) - active-fedora (>= 11.0.0.pre) - activemodel (>= 5.2) - nom-xml (>= 0.5.1) - om (~> 3.1) - rdf (~> 3.2) - rdf-rdfxml (~> 3.2) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + activejob (7.2.2) + activesupport (= 7.2.2) globalid (>= 0.3.6) activejob-traffic_control (0.1.3) activejob (>= 4.2) activesupport (>= 4.2) suo - activejob-uniqueness (0.2.5) - activejob (>= 4.2, < 7.1) - redlock (>= 1.2, < 2) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activerecord-session_store (2.0.0) - actionpack (>= 5.2.4.1) - activerecord (>= 5.2.4.1) + activejob-uniqueness (0.3.2) + activejob (>= 4.2, < 7.3) + redlock (>= 2.0, < 3) + activemodel (7.2.2) + activesupport (= 7.2.2) + activerecord (7.2.2) + activemodel (= 7.2.2) + activesupport (= 7.2.2) + timeout (>= 0.4.0) + activerecord-session_store (2.1.0) + actionpack (>= 6.1) + activerecord (>= 6.1) + cgi (>= 0.3.6) multi_json (~> 1.11, >= 1.11.2) - rack (>= 2.0.8, < 3) - railties (>= 5.2.4.1) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + rack (>= 2.0.8, < 4) + railties (>= 6.1) + activestorage (7.2.2) + actionpack (= 7.2.2) + activejob (= 7.2.2) + activerecord (= 7.2.2) + activesupport (= 7.2.2) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - acts_as_list (1.1.0) - activerecord (>= 4.2) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.4.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + acts_as_list (1.2.2) + activerecord (>= 6.1) + activesupport (>= 6.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + airbrussh (1.5.2) sshkit (>= 1.6.1, != 1.7.0) - api-pagination (5.0.0) + api-pagination (6.0.0) ast (2.4.2) audio_waveform-ruby (1.0.7) json (~> 2.3) - autoprefixer-rails (10.4.7.0) + autoprefixer-rails (10.4.19.0) execjs (~> 2) - aws-eventstream (1.2.0) - aws-partitions (1.801.0) - aws-record (2.10.1) - aws-sdk-dynamodb (~> 1.18) - aws-sdk-cloudfront (1.76.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.171.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) + aws-eventstream (1.3.0) + aws-partitions (1.976.0) + aws-record (2.13.2) + aws-sdk-dynamodb (~> 1, >= 1.85.0) + aws-sdk-cloudfront (1.96.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sigv4 (~> 1.5) + aws-sdk-core (3.206.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-dynamodb (1.81.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-elastictranscoder (1.40.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-kms (1.63.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-rails (3.7.1) + aws-sdk-dynamodb (1.118.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-elastictranscoder (1.57.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-kms (1.91.0) + aws-sdk-core (~> 3, >= 3.205.0) + aws-sigv4 (~> 1.5) + aws-sdk-rails (4.0.3) + actionmailbox (>= 7.0.0) aws-record (~> 2) - aws-sdk-ses (~> 1) - aws-sdk-sesv2 (~> 1) - aws-sdk-sqs (~> 1) + aws-sdk-s3 (~> 1, >= 1.123.0) + aws-sdk-ses (~> 1, >= 1.50.0) + aws-sdk-sesv2 (~> 1, >= 1.34.0) + aws-sdk-sns (~> 1, >= 1.61.0) + aws-sdk-sqs (~> 1, >= 1.56.0) aws-sessionstore-dynamodb (~> 2) - concurrent-ruby (~> 1) - railties (>= 5.2.0) - aws-sdk-s3 (1.122.0) - aws-sdk-core (~> 3, >= 3.165.0) + concurrent-ruby (~> 1.3, >= 1.3.1) + railties (>= 7.0.0) + aws-sdk-s3 (1.162.0) + aws-sdk-core (~> 3, >= 3.205.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sdk-ses (1.49.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-sesv2 (1.31.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.55.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sessionstore-dynamodb (2.0.1) - aws-sdk-dynamodb (~> 1) - rack (~> 2) - aws-sigv4 (1.6.0) + aws-sigv4 (~> 1.5) + aws-sdk-ses (1.69.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-sesv2 (1.56.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-sns (1.82.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-sqs (1.80.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sessionstore-dynamodb (2.2.0) + aws-sdk-dynamodb (~> 1, >= 1.85.0) + rack (>= 2, < 4) + rack-session (>= 1, < 3) + aws-sigv4 (1.10.0) aws-eventstream (~> 1, >= 1.0.2) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) - bcrypt (3.1.18) - bigdecimal (3.1.6) + base64 (0.2.0) + bcp47_spec (0.2.1) + bcrypt (3.1.20) + benchmark (0.4.0) + bigdecimal (3.1.8) bindex (0.8.1) bixby (5.0.2) rubocop (= 1.28.2) @@ -250,7 +283,7 @@ GEM rubocop-performance rubocop-rails rubocop-rspec - blacklight (7.33.1) + blacklight (7.38.0) deprecation globalid hashdiff @@ -258,31 +291,31 @@ GEM jbuilder (~> 2.7) kaminari (>= 0.15) ostruct (>= 0.3.2) - rails (>= 5.1, < 7.1) - view_component (~> 2.66) + rails (>= 5.1, < 7.3) + view_component (>= 2.66, < 4) blacklight-access_controls (6.0.1) blacklight (> 6.0, < 8) cancancan (>= 1.8) deprecation (~> 1.0) - bootsnap (1.16.0) + bootsnap (1.18.4) msgpack (~> 1.2) bootstrap (4.6.2) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.16.1, < 2) sassc-rails (>= 2.0.0) bootstrap-toggle-rails (2.2.1.0) - bootstrap_form (5.2.3) - actionpack (>= 6.0) - activemodel (>= 6.0) + bootstrap_form (5.4.0) + actionpack (>= 6.1) + activemodel (>= 6.1) builder (3.3.0) byebug (11.1.3) - cancancan (3.4.0) - capistrano (3.17.3) + cancancan (3.6.1) + capistrano (3.19.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.1.0) + capistrano-bundler (2.1.1) capistrano (~> 3.1) capistrano-passenger (0.2.1) capistrano (~> 3.0) @@ -298,15 +331,16 @@ GEM sidekiq (>= 6.0) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) + cgi (0.4.1) childprocess (3.0.0) cloudfront-signer (3.0.2) codeclimate-test-reporter (1.0.7) @@ -319,19 +353,19 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.3) - config (4.2.1) + concurrent-ruby (1.3.4) + config (5.5.1) deep_merge (~> 1.2, >= 1.2.1) - dry-validation (~> 1.0, >= 1.0.0) - connection_pool (2.3.0) - crack (0.4.5) + connection_pool (2.4.1) + crack (1.0.0) + bigdecimal rexml crass (1.0.6) daemons (1.4.1) - dalli (3.2.3) + dalli (3.2.8) database_cleaner (2.0.2) database_cleaner-active_record (>= 2, < 3) - database_cleaner-active_record (2.0.1) + database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -340,7 +374,7 @@ GEM deep_merge (1.2.2) deprecation (1.1.0) activesupport - devise (4.9.2) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -349,149 +383,126 @@ GEM devise_invitable (2.0.9) actionmailer (>= 5.0) devise (>= 4.6) - diff-lcs (1.5.0) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.8.1) - dotenv-rails (2.8.1) - dotenv (= 2.8.1) - railties (>= 3.2) + diff-lcs (1.5.1) + docile (1.4.1) + domain_name (0.6.20240107) + dotenv (3.1.2) + dotenv-rails (3.1.2) + dotenv (= 3.1.2) + railties (>= 6.1) + drb (2.2.1) dropbox_api (0.1.21) faraday (< 3.0) oauth2 (~> 1.1) - dry-configurable (1.0.1) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-core (1.0.0) - concurrent-ruby (~> 1.0) - zeitwerk (~> 2.6) - dry-inflector (1.0.0) - dry-initializer (3.1.1) - dry-logic (1.5.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-schema (1.13.0) - concurrent-ruby (~> 1.0) - dry-configurable (~> 1.0, >= 1.0.1) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-logic (>= 1.5, < 2) - dry-types (>= 1.7, < 2) - zeitwerk (~> 2.6) - dry-types (1.7.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - dry-inflector (~> 1.0, < 2) - dry-logic (>= 1.4, < 2) - zeitwerk (~> 2.6) - dry-validation (1.10.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-schema (>= 1.12, < 2) - zeitwerk (~> 2.6) - ebnf (2.3.2) + ebnf (2.5.0) htmlentities (~> 4.3) - rdf (~> 3.2) + rdf (~> 3.3) scanf (~> 1.0) - sxp (~> 1.2) + sxp (~> 2.0) unicode-types (~> 1.8) edtf (3.1.1) activesupport (>= 3.0, < 8.0) - email_spec (2.2.2) + email_spec (2.3.0) htmlentities (~> 4.3.3) - launchy (~> 2.1) + launchy (>= 2.1, < 4.0) mail (~> 2.7) equivalent-xml (0.6.0) nokogiri (>= 1.4.3) erubi (1.13.0) - et-orbi (1.2.7) + et-orbi (1.2.11) tzinfo ethon (0.16.0) ffi (>= 1.15.0) - execjs (2.8.1) - factory_bot (6.2.1) + execjs (2.9.1) + factory_bot (6.4.6) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) fakefs (2.5.0) - faker (3.2.0) + faker (3.4.2) i18n (>= 1.8.11, < 2) - faraday (2.7.4) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-encoding (0.0.5) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger + faraday-encoding (0.0.6) faraday - faraday-net_http (3.0.2) - fastimage (2.2.7) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.3.0) + net-http + fastimage (2.3.1) fcrepo_wrapper (0.9.0) ruby-progressbar - ffi (1.15.5) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) + ffi (1.17.0) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) rake font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) - fugit (1.8.1) - et-orbi (~> 1, >= 1.2.7) + fugit (1.11.1) + et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) globalid (1.2.1) activesupport (>= 6.1) google-analytics-rails (1.1.0) - google-apis-core (0.11.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) + googleauth (~> 1.9) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-drive_v3 (0.37.0) - google-apis-core (>= 0.11.0, < 2.a) - googleauth (1.5.0) - faraday (>= 0.17.3, < 3.a) + google-apis-drive_v3 (0.59.0) + google-apis-core (>= 0.15.0, < 2.a) + google-cloud-env (2.2.1) + faraday (>= 1.0, < 3.a) + googleauth (1.11.2) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - hashdiff (1.0.1) + haml (5.2.2) + temple (>= 0.8.0) + tilt + hashdiff (1.1.1) hashie (5.0.0) hooks (0.4.1) uber (~> 0.0.14) htmlentities (4.3.4) - http-2-next (1.0.3) - http (5.1.1) + http-2 (1.0.1) + http (5.2.0) addressable (~> 2.8) + base64 (~> 0.1) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) + llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) http_logger (0.7.0) httpclient (2.8.3) - httpx (1.2.2) - http-2-next (>= 1.0.3) - hydra-access-controls (12.1.0) + httpx (1.3.1) + http-2 (>= 1.0.0) + hydra-access-controls (13.0.0) active-fedora (>= 10.0.0) - activesupport (>= 5.2, < 7.1) + activesupport (>= 6.1, < 8.0) blacklight-access_controls (~> 6.0) cancancan (>= 1.8, < 4) deprecation (~> 1.0) - hydra-core (12.1.0) - hydra-access-controls (= 12.1.0) - railties (>= 5.2, < 7.1) - hydra-head (12.1.0) - hydra-access-controls (= 12.1.0) - hydra-core (= 12.1.0) - rails (>= 5.2, < 7.1) - i18n (1.14.5) + hydra-core (13.0.0) + hydra-access-controls (= 13.0.0) + railties (>= 6.1, < 8.0) + hydra-head (13.0.0) + hydra-access-controls (= 13.0.0) + hydra-core (= 13.0.0) + rails (>= 6.1, < 8.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) iconv (1.0.8) iiif_manifest (1.6.0) @@ -499,7 +510,11 @@ GEM ims-lti (1.1.13) builder oauth (>= 0.4.5, < 0.6) - jbuilder (2.11.5) + io-console (0.7.2) + irb (1.14.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jbuilder (2.12.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) @@ -510,16 +525,18 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (7.0.0) railties (>= 3.2.16) - json (2.6.3) - json-canonicalization (0.3.1) - json-ld (3.2.3) + json (2.7.2) + json-canonicalization (1.0.0) + json-ld (3.3.2) htmlentities (~> 4.3) - json-canonicalization (~> 0.3) + json-canonicalization (~> 1.0) link_header (~> 0.0, >= 0.0.8) multi_json (~> 1.15) - rack (~> 2.2) - rdf (~> 3.2, >= 3.2.9) - jwt (2.7.0) + rack (>= 2.2, < 4) + rdf (~> 3.3) + rexml (~> 3.2) + jwt (2.9.3) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -546,13 +563,14 @@ GEM rdf-vocab (>= 0.8) slop link_header (0.0.8) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - llhttp-ffi (0.4.0) + llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) - lograge (0.13.0) + logger (1.6.1) + lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -571,40 +589,45 @@ GEM unf marcel (1.0.4) matrix (0.4.2) - memoist (0.16.2) method_source (1.1.0) - mime-types (3.4.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) + mime-types-data (3.2024.0820) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitar (0.9) - minitest (5.24.1) - msgpack (1.6.0) + minitar (1.0.2) + minitest (5.25.1) + msgpack (1.7.2) multi_json (1.15.0) - multi_xml (0.6.0) - multipart-post (2.3.0) - mysql2 (0.5.5) - net-imap (0.4.14) + multi_xml (0.7.1) + bigdecimal (~> 3.1) + multipart-post (2.4.1) + mutex_m (0.2.0) + mysql2 (0.5.6) + net-http (0.4.1) + uri + net-imap (0.4.16) date net-protocol - net-ldap (0.18.0) + net-ldap (0.19.0) net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.5.0) net-protocol - net-ssh (7.0.1) + net-ssh (7.2.3) netrc (0.11.0) 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.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) nom-xml (1.2.0) @@ -617,66 +640,74 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) - okcomputer (1.18.4) - omniauth (2.1.1) + okcomputer (1.18.5) + omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection omniauth-identity (3.0.9) bcrypt omniauth - omniauth-saml (2.1.0) - omniauth (~> 2.0) - ruby-saml (~> 1.12) + omniauth-saml (2.2.1) + omniauth (~> 2.1) + ruby-saml (~> 1.17) orm_adapter (0.5.0) os (1.1.4) - ostruct (0.5.5) - parallel (1.23.0) - paranoia (2.6.1) - activerecord (>= 5.1, < 7.1) - parser (3.2.1.0) + ostruct (0.6.0) + package_json (0.1.0) + parallel (1.26.3) + paranoia (3.0.0) + activerecord (>= 6, < 8.1) + parser (3.3.4.2) ast (~> 2.4.1) - pg (1.5.3) + racc + pg (1.5.7) popper_js (1.16.1) - pretender (0.4.0) - actionpack (>= 5.2) + pretender (0.5.0) + actionpack (>= 6.1) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - pry-rails (0.3.9) - pry (>= 0.10.4) + pry-rails (0.3.11) + pry (>= 0.13.0) psych (3.3.4) - public_suffix (5.0.1) - puma (6.4.2) + public_suffix (6.0.1) + puma (6.4.3) nio4r (~> 2.0) raabro (1.4.0) - racc (1.8.0) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-cors (2.0.2) rack (>= 2.0.0) - rack-protection (3.0.5) - rack - rack-proxy (0.7.6) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rack-proxy (0.7.7) rack + rack-session (1.0.2) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rackup (1.0.0) + rack (< 3) + webrick + rails (7.2.2) + actioncable (= 7.2.2) + actionmailbox (= 7.2.2) + actionmailer (= 7.2.2) + actionpack (= 7.2.2) + actiontext (= 7.2.2) + actionview (= 7.2.2) + activejob (= 7.2.2) + activemodel (= 7.2.2) + activerecord (= 7.2.2) + activestorage (= 7.2.2) + activesupport (= 7.2.2) bundler (>= 1.15.0) - railties (= 7.0.8.4) + railties (= 7.2.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -691,73 +722,92 @@ GEM rails_same_site_cookie (0.1.9) rack (>= 1.5) user_agent_parser (~> 2.6) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source + railties (7.2.2) + actionpack (= 7.2.2) + activesupport (= 7.2.2) + irb (~> 1.13) + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) rb-readline (0.5.5) - rdf (3.2.11) + rdf (3.3.2) + bcp47_spec (~> 0.2) + bigdecimal (~> 3.1, >= 3.1.5) link_header (~> 0.0, >= 0.0.8) - rdf-isomorphic (3.2.1) - rdf (~> 3.2) + rdf-aggregate-repo (3.3.0) + rdf (~> 3.3) + rdf-isomorphic (3.3.0) + rdf (~> 3.3) rdf-ldp (0.1.0) deprecation rdf - rdf-rdfxml (3.2.2) - builder (~> 3.2) + rdf-rdfa (3.2.0) + haml (~> 5.2) htmlentities (~> 4.3) rdf (~> 3.2) + rdf-aggregate-repo (~> 3.2) + rdf-vocab (~> 3.2) rdf-xsd (~> 3.2) - rdf-turtle (3.2.1) - ebnf (~> 2.3) - rdf (~> 3.2) - rdf-vocab (3.2.3) - rdf (~> 3.2, >= 3.2.4) - rdf-xsd (3.2.1) - rdf (~> 3.2) + rdf-rdfxml (3.3.0) + builder (~> 3.2, >= 3.2.4) + htmlentities (~> 4.3) + rdf (~> 3.3) + rdf-xsd (~> 3.3) + rdf-turtle (3.3.1) + base64 (~> 0.2) + bigdecimal (~> 3.1, >= 3.1.5) + ebnf (~> 2.5) + rdf (~> 3.3) + rdf-vocab (3.3.1) + rdf (~> 3.3) + rdf-xsd (3.3.0) + rdf (~> 3.3) rexml (~> 3.2) - react-rails (2.7.1) + rdoc (6.3.4.1) + react-rails (3.2.1) babel-transpiler (>= 0.7.0) connection_pool execjs railties (>= 3.2) tilt - recaptcha (5.14.0) + recaptcha (5.17.0) redis (4.8.1) - redis-actionpack (5.3.0) + redis-actionpack (5.4.0) actionpack (>= 5, < 8) - redis-rack (>= 2.1.0, < 3) + redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) - redis-rack (2.1.4) - rack (>= 2.0.8, < 3) + redis-client (0.22.2) + connection_pool + redis-rack (3.0.0) + rack-session (>= 0.2.0) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.9.1) - redis (>= 4, < 5) - redlock (1.3.2) - redis (>= 3.0.0, < 6.0) - regexp_parser (2.7.0) + redis-store (1.11.0) + redis (>= 4, < 6) + redlock (2.0.6) + redis-client (>= 0.14.1, < 1.0.0) + regexp_parser (2.9.2) + reline (0.5.10) + io-console (~> 0.5) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) - request_store (1.5.1) + request_store (1.7.0) rack (>= 1.4) - responders (3.1.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) rest-client (2.1.0) @@ -766,36 +816,35 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) - rexml (3.3.1) - strscan - roo (2.10.0) + rexml (3.3.9) + roo (2.10.1) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) - rsolr (2.5.0) + rsolr (2.6.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rspec-core (3.12.1) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-its (1.3.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.3) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.0.3) + rspec-support (~> 3.13.0) + rspec-rails (6.1.4) 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-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.0) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.28.2) @@ -807,9 +856,9 @@ GEM rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-performance (1.16.0) + rubocop-ast (1.32.1) + parser (>= 3.3.1.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.15.2) @@ -824,17 +873,16 @@ GEM multipart-post oauth2 ruby-progressbar (1.13.0) - ruby-saml (1.15.0) + ruby-saml (1.17.0) nokogiri (>= 1.13.10) rexml - ruby2_keywords (0.0.5) rubyzip (1.3.0) - samvera-persona (0.4.1) + samvera-persona (0.5.0) devise (~> 4.6) devise_invitable (>= 1.7, < 3.0) - paranoia (~> 2.2) + paranoia (~> 3.0) pretender - rails (>= 5.2.4.3, < 7.1) + rails (>= 5.2.4.3, < 8.0) sass (3.4.22) sassc (2.4.0) ffi (~> 1.9) @@ -846,28 +894,30 @@ GEM tilt scanf (1.0.0) scrub_rb (1.0.1) + securerandom (0.3.1) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) semantic_range (3.0.0) - sequel (5.77.0) + sequel (5.83.1) bigdecimal - shakapacker (7.0.2) + shakapacker (8.0.1) activesupport (>= 5.2) + package_json rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) - shoulda-matchers (5.3.0) + shoulda-matchers (6.4.0) activesupport (>= 5.2.0) sidekiq (6.5.12) connection_pool (>= 2.2.5, < 3) rack (~> 2.0) redis (>= 4.5.0, < 5) - sidekiq-cron (1.10.1) + sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) sidekiq (>= 6) - signet (0.17.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -890,63 +940,63 @@ GEM nokogiri stomp xml-simple - speedy-af (0.3.0) - active-fedora (>= 11.0.0) - activesupport (> 5.2) - sprockets (3.7.2) + sprockets (3.7.3) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.2) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - sqlite3 (1.6.3) + sqlite3 (2.0.4) mini_portile2 (~> 2.8.0) - sshkit (1.21.3) + sshkit (1.23.0) + base64 net-scp (>= 1.1.2) + net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) stomp (1.4.10) - strscan (3.1.0) suo (0.4.0) dalli msgpack redis - sxp (1.2.3) + sxp (2.0.0) matrix (~> 0.4) - rdf (~> 3.2) - terser (1.2.0) + rdf (~> 3.3) + temple (0.10.3) + terser (1.2.3) execjs (>= 0.3.0, < 3) - thor (1.3.1) - tilt (2.0.11) + thor (1.3.2) + tilt (2.4.0) timeout (0.4.1) trailblazer-option (0.1.2) twitter-typeahead-rails (0.11.1.pre.corejavascript) actionpack (>= 3.1) jquery-rails railties (>= 3.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.0.15) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.4.2) - unicode-types (1.8.0) - user_agent_parser (2.14.0) - view_component (2.83.0) + unf (0.2.0) + unicode-display_width (2.5.0) + unicode-types (1.10.0) + uri (0.13.1) + user_agent_parser (2.18.0) + useragent (0.16.10) + view_component (3.14.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) warden (1.2.9) rack (>= 2.0.9) wavefile (1.0.1) - web-console (4.2.0) + web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) @@ -955,11 +1005,11 @@ GEM nokogiri (~> 1.6) rubyzip (~> 1.0) selenium-webdriver (~> 3.0) - webmock (3.18.1) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.1) + webrick (1.8.2) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -968,7 +1018,7 @@ GEM rexml xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.16) + zeitwerk (2.6.18) zk (1.10.0) zookeeper (~> 1.5.0) zookeeper (1.5.5) @@ -979,11 +1029,11 @@ PLATFORMS DEPENDENCIES about_page! - active-fedora (~> 14.0, >= 14.0.1) - active_annotations (~> 0.4) + active-fedora! + active_annotations (~> 0.5.0) active_elastic_job - active_encode (>= 1.2.2) - active_fedora-datastreams (~> 0.5) + active_encode (~> 1.2) + active_fedora-datastreams! activejob-traffic_control activejob-uniqueness activerecord-session_store (>= 2.0.0) @@ -1004,7 +1054,7 @@ DEPENDENCIES blacklight (~> 7.25) blacklight-access_controls (>= 6.0.1) bootsnap - bootstrap (~> 4.0) + bootstrap (= 4.6.2) bootstrap-toggle-rails bootstrap_form browse-everything! @@ -1037,7 +1087,7 @@ DEPENDENCIES hashdiff (>= 1.0) hooks httpx - hydra-head (~> 12.0) + hydra-head (~> 13.0) iconv (~> 1.0.6) iiif_manifest (~> 1.6) ims-lti (~> 1.1.13) @@ -1050,17 +1100,16 @@ DEPENDENCIES lograge mail (> 2.8.0.1) marc - mediainfo! mysql2 net-ldap net-smtp - noid-rails (~> 3.1) + noid-rails (~> 3.2) okcomputer om! omniauth (~> 2.0) omniauth-identity (>= 2.0.0) omniauth-lti! - omniauth-saml (~> 2.0) + omniauth-saml (~> 2.0, >= 2.2.1) parallel pg pry-byebug @@ -1068,7 +1117,7 @@ DEPENDENCIES psych (< 4) puma (>= 6.4.2) rack-cors - rails (~> 7.0.8) + rails (~> 7.2.2) rails-controller-testing rails_same_site_cookie rb-readline @@ -1084,7 +1133,7 @@ DEPENDENCIES rspec-rails rspec-retry rspec_junit_formatter - samvera-persona (~> 0.4, >= 0.4.1) + samvera-persona (~> 0.5.0) sass (= 3.4.22) selenium-webdriver sequel @@ -1094,7 +1143,7 @@ DEPENDENCIES sidekiq-cron (~> 1.9) simplecov solr_wrapper (>= 0.16) - speedy-af (~> 0.3) + speedy-af! sprockets (~> 3.7.2) sprockets-es6 sqlite3 diff --git a/app/assets/javascripts/player_listeners.js b/app/assets/javascripts/player_listeners.js index fb66f3fceb..858b28f440 100644 --- a/app/assets/javascripts/player_listeners.js +++ b/app/assets/javascripts/player_listeners.js @@ -17,6 +17,7 @@ let canvasIndex = -1; let currentSectionLabel = undefined; let addToPlaylistListenersAdded = false; +let searchFieldListenerAdded = false let firstLoad = true; let streamId = ''; let isMobile = false; @@ -35,6 +36,51 @@ let isPlaying = false; function addActionButtonListeners(player, mediaObjectId, sectionIds) { if (player && player.player != undefined) { let currentIndex = parseInt(player.dataset.canvasindex); + /* Ensure we only add player listeners once */ + if (firstLoad === true) { + /* Add player event listeners to update UI components on the page */ + // Listen to 'seeked' event to udate add to playlist form when using while media is playing or manually seeking + player.player.on('seeked', () => { + if (getActiveItem() != undefined) { + activeTrack = getActiveItem(false); + if (activeTrack != undefined) { + streamId = activeTrack.streamId; + } + disableEnableCurrentTrack(activeTrack, player.player.currentTime(), isPlaying, currentSectionLabel); + } + }); + + player.player.on('play', () => { isPlaying = true; }); + + player.player.on('pause', () => { isPlaying = false; }); + + /* + Disable action buttons tied to player related information on player's 'emptied' event which functions + parallel to the player's src changes. So, that the user doesn't interact with them get corrupted data + in the UI when player is loading the new section media into it. + Once the player is fully loaded these buttons are enabled as needed. + */ + player.player.on('emptied', () => { + resetAllActionButtons(); + }); + + /* + Enable action buttons on player's 'loadstart' event which functions parallel to the player's src changes. + Sometimes the player event to disable the buttons is triggered after the function to enable the buttons, + resulting in the buttons never enabling. Since the enabling of the action buttons occurs before the player + is emptied, it is also possible that the information populating the buttons is for the old canvas, so we + run `buildActionButtons` again rather than just enabling the buttons. + */ + player.player.on('loadstart', () => { + let addToPlaylistBtn = document.getElementById('addToPlaylistBtn'); + let thumbnailBtn = document.getElementById('thumbnailBtn'); + let timelineBtn = document.getElementById('timelineBtn'); + + if (addToPlaylistBtn.disabled && thumbnailBtn.disabled && timelineBtn.disabled) { + buildActionButtons(player, mediaObjectId, sectionIds); + } + }); + } /* For both Android and iOS, player.readyState() is 0 until media playback is started. Therefore, use player.src() to check whether there's a playable media @@ -69,32 +115,6 @@ function addActionButtonListeners(player, mediaObjectId, sectionIds) { resetAllActionButtons(); } - /* Add player event listeners to update UI components on the page */ - // Listen to 'seeked' event to udate add to playlist form - player.player.on('seeked', () => { - if (getActiveItem() != undefined) { - activeTrack = getActiveItem(false); - if (activeTrack != undefined) { - streamId = activeTrack.streamId; - } - disableEnableCurrentTrack(activeTrack, player.player.currentTime(), isPlaying, currentSectionLabel); - } - }); - - player.player.on('play', () => { isPlaying = true; }); - - player.player.on('pause', () => { isPlaying = false; }); - - /* - Disable action buttons tied to player related information on player's 'loadstart' event which functions - parallel to the player's src changes. So, that the user doesn't interact with them get corrupted data - in the UI when player is loading the new section media into it. - Once the player is fully loaded these buttons are enabled as needed. - */ - player.player.on('loadstart', () => { - resetAllActionButtons(); - }); - // Collapse sub-panel related to the selected option in the add to playlist form when it is collapsed let playlistSection = $('#playlistitem_scope_section'); let playlistTrack = $('#playlistitem_scope_track'); @@ -324,6 +344,23 @@ function addToPlaylistListeners(sectionIds, mediaObjectId) { } }); + // Set playlist search box to readonly in mobile browsers to prevent + // keyboard from popping up when opening playlist dropdown. + $('.select2-selection').on("click", function () { + const IS_TOUCH_ONLY = navigator.maxTouchPoints && navigator.maxTouchPoints > 2 && !window.matchMedia("(pointer: fine").matches; + let searchField = $('.select2-search__field'); + if ((/Mobi|iPhone/i.test(window.navigator.userAgent) || IS_TOUCH_ONLY) && searchField.length > 0) { + searchField.attr('readonly', 'readonly') + if (!searchFieldListenerAdded) { + searchField.on('click', function(e) { + searchField.removeAttr('readonly').select(); + }); + + searchFieldListenerAdded = true + } + } + }); + addToPlaylistListenersAdded = true; } diff --git a/app/assets/javascripts/supplemental_files.js b/app/assets/javascripts/supplemental_files.js index 891efcd16f..f8b68237ff 100644 --- a/app/assets/javascripts/supplemental_files.js +++ b/app/assets/javascripts/supplemental_files.js @@ -73,6 +73,8 @@ $('.supplemental-file-form') .on('ajax:success', (event, data, status, xhr) => { var $row = $(event.currentTarget.parentElement); const { masterfileId, fileId } = event.currentTarget.dataset; + // Get machine-generated checkbox input on form submission + var isMachineGen = $row.find(`input[id="machine_generated_${fileId}"]`)[0].checked; // Set the label to the new value var newLabel = $row @@ -90,6 +92,10 @@ $('.supplemental-file-form') // Show flash message for success $row.find('.message-content').html('Successfully updated.'); + // Show/hide icon based on the updated machine-generated form check + isMachineGen + ? $row.find('.fa-gears').removeClass('d-none') + : $row.find('.fa-gears').addClass('d-none'); $row.find('.icon-success').removeClass('d-none'); $row.find('.visible-inline').addClass('alert'); }) diff --git a/app/assets/stylesheets/avalon.scss b/app/assets/stylesheets/avalon.scss index 2a686d88f2..0ce28ecb98 100644 --- a/app/assets/stylesheets/avalon.scss +++ b/app/assets/stylesheets/avalon.scss @@ -935,6 +935,9 @@ h5.card-title { .form-group { margin-bottom: 0.2rem; } + .fa-gears { + display: none; + } display: flex; } margin-top: 0.75rem; diff --git a/app/assets/stylesheets/avalon/_modals.scss b/app/assets/stylesheets/avalon/_modals.scss index e865cc55d8..6ba97fa9cc 100644 --- a/app/assets/stylesheets/avalon/_modals.scss +++ b/app/assets/stylesheets/avalon/_modals.scss @@ -37,21 +37,25 @@ .special-access label { display: block; - - input, - select { - display: inline; - width: auto; - min-width: 300px; - } - p { margin: 10px 0 5px 0; } + input, + select, .twitter-typeahead { - width: auto; + width: fit-content; + min-width: 375px; } + + input.form-control.date-input { + width: fit-content; + min-width: 0; + } + } + + .special-access .d-flex { + gap: 0.5em; } } diff --git a/app/assets/stylesheets/blacklight.scss b/app/assets/stylesheets/blacklight.scss index 0615b155f4..3729d2fee0 100644 --- a/app/assets/stylesheets/blacklight.scss +++ b/app/assets/stylesheets/blacklight.scss @@ -65,4 +65,4 @@ img.no-icon { .page-item span.page-link { color: $dark !important; -} +} \ No newline at end of file diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb index f6938628dd..a6697fe514 100644 --- a/app/controllers/bookmarks_controller.rb +++ b/app/controllers/bookmarks_controller.rb @@ -157,7 +157,7 @@ def status_action documents else case params['action'] when 'publish' - if media_object.title.nil? || media_object.date_issued.nil? + if media_object.title.nil? errors += ["#{id}, Unable to Publish Item. Missing required fields."] else success_ids << id diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 3371bbb4db..19eb71c8e9 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -102,6 +102,8 @@ class CatalogController < ApplicationController config.add_facet_field 'has_captions_bsi', label: 'Has Captions', if: Proc.new {|context, config, opts| context.current_ability.can? :create, MediaObject}, group: "workflow", helper_method: :display_has_caption_or_transcript config.add_facet_field 'has_transcripts_bsi', label: 'Has Transcripts', if: Proc.new {|context, config, opts| context.current_ability.can? :create, MediaObject}, group: "workflow", helper_method: :display_has_caption_or_transcript + config.add_facet_field 'subject_ssim', label: 'Subject', if: false + # Have BL send all facet field names to Solr, which has been the default # previously. Simply remove these lines if you'd rather use Solr request # handler defaults, or have no facets. @@ -113,7 +115,8 @@ class CatalogController < ApplicationController # solr fields to be displayed in the index (search results) view # The ordering of the field names is the order of the display config.add_index_field 'title_tesi', label: 'Title', if: Proc.new {|context, _field_config, _document| context.request.format == :json } - config.add_index_field 'date_issued_ssi', label: 'Date', helper_method: :combined_display_date + config.add_index_field 'date_issued_ssi', label: 'Date', if: Proc.new {|_context, _field_config, document| document[:date_issued_ssi].present? } + config.add_index_field 'date_created_ssi', label: 'Date', if: Proc.new {|_context, _field_config, document| document[:date_created_ssi].present? && document[:date_issued_ssi].blank? } config.add_index_field 'creator_ssim', label: 'Main contributors', helper_method: :contributor_index_display config.add_index_field 'abstract_ssi', label: 'Summary', helper_method: :description_index_display config.add_index_field 'duration_ssi', label: 'Duration', if: Proc.new {|context, _field_config, _document| context.request.format == :json } diff --git a/app/controllers/encode_records_controller.rb b/app/controllers/encode_records_controller.rb index 263c81d1d3..a7e5646913 100644 --- a/app/controllers/encode_records_controller.rb +++ b/app/controllers/encode_records_controller.rb @@ -71,7 +71,7 @@ def paged_index "recordsFiltered": filtered_records_total, "data": @encode_records.collect do |encode| encode_presenter = EncodePresenter.new(encode) - encode_status = encode_presenter.status.downcase + encode_status = encode_presenter.status&.downcase unless encode_status == 'completed' progress_class = 'progress-bar-striped' end @@ -117,7 +117,7 @@ def set_encode_record def format_progress(presenter) # Set progress = 100.0 when job failed - if presenter.status.casecmp("failed") == 0 + if presenter.status&.casecmp("failed") == 0 100.0 else presenter.progress diff --git a/app/controllers/master_files_controller.rb b/app/controllers/master_files_controller.rb index 1589b5d0ca..4e8d1f06df 100644 --- a/app/controllers/master_files_controller.rb +++ b/app/controllers/master_files_controller.rb @@ -246,6 +246,8 @@ def get_frame end if content send_data content, :filename => "#{params[:type]}-#{@master_file.id.split(':')[1]}", :disposition => :inline, :type => mimeType + elsif @master_file.is_video? + redirect_to ActionController::Base.helpers.asset_path('video_icon.png') else redirect_to ActionController::Base.helpers.asset_path('audio_icon.png') end @@ -342,7 +344,9 @@ def download_derivative # Use an AWS presigned URL to facilitate direct download of the derivative to avoid # having to download the file to the server as a tmp file and then sending that to # the client. Doing this reduces latency and server load. - redirect_to FileLocator::S3File.new(path).download_url + # Rails 7.0 adds a config option to protect against "open redirects". We override + # that here in case the s3 bucket is not local. + redirect_to FileLocator::S3File.new(path).download_url, allow_other_host: true else send_file path, filename: File.basename(path), disposition: 'attachment' end @@ -366,10 +370,10 @@ def set_masterfile end def set_masterfile_proxy - if params[:id].blank? || SpeedyAF::Proxy::MasterFile.find(params[:id]).nil? + @master_file = SpeedyAF::Proxy::MasterFile.find(params[:id], load_reflections: true) + if params[:id].blank? || @master_file.nil? flash[:notice] = "MasterFile #{params[:id]} does not exist" end - @master_file = SpeedyAF::Proxy::MasterFile.find(params[:id]) end # return deflated waveform content. deflate only if necessary diff --git a/app/controllers/media_objects_controller.rb b/app/controllers/media_objects_controller.rb index 0d6a36c329..8ed6e67940 100644 --- a/app/controllers/media_objects_controller.rb +++ b/app/controllers/media_objects_controller.rb @@ -203,7 +203,7 @@ def update_media_object error_messages = [] unless @media_object.valid? invalid_fields = @media_object.errors.attribute_names - required_fields = [:title, :date_issued] + required_fields = [:title] unless required_fields.any? { |f| invalid_fields.include? f } invalid_fields.each do |field| #NOTE this will erase all values for fields with multiple values @@ -230,7 +230,15 @@ def update_media_object master_file.date_digitized = DateTime.parse(file_spec[:date_digitized]).to_time.utc.iso8601 if file_spec[:date_digitized].present? master_file.identifier += Array(params[:files][index][:other_identifier]) master_file.comment += Array(params[:files][index][:comment]) - master_file.media_object = @media_object + begin + master_file.media_object = @media_object + rescue ActiveFedora::Rollback => e + file_location = file_spec.dig(:file_location) || '' + message = "Problem saving MasterFile for #{file_location}:" + error_messages += [message] + error_messages += [e.message] + break + end if file_spec[:files].present? if master_file.update_derivatives(file_spec[:files], false) master_file.update_stills_from_offset! @@ -413,7 +421,7 @@ def update_status begin case status when 'publish' - unless media_object.title.present? && media_object.date_issued.present? + unless media_object.title.present? errors += ["#{media_object&.title} (#{id}) (missing required fields)"] next end diff --git a/app/controllers/supplemental_files_controller.rb b/app/controllers/supplemental_files_controller.rb index 8b1adf6430..08fd53be77 100644 --- a/app/controllers/supplemental_files_controller.rb +++ b/app/controllers/supplemental_files_controller.rb @@ -87,7 +87,9 @@ def show if Settings.supplemental_files.proxy send_data @supplemental_file.file.download, filename: @supplemental_file.file.filename.to_s, type: @supplemental_file.file.content_type, disposition: 'attachment' else - redirect_to rails_blob_path(@supplemental_file.file, disposition: "attachment") + # Rails 7.0 adds a config option to protect against "open redirects". We override + # that here in case the active storage db is not local. + redirect_to rails_blob_path(@supplemental_file.file, disposition: "attachment"), allow_other_host: true end } format.json { render json: @supplemental_file.as_json } diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index 1205dd554f..d016d51199 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -15,10 +15,7 @@ class Users::SessionsController < Devise::SessionsController def new if Avalon::Authentication::VisibleProviders.length == 1 && params[:admin].blank? - omniauth_params = params.reject { |k,v| ['controller','action'].include?(k) } - omniauth_params.permit! - login_path = user_omniauth_authorize_path(Avalon::Authentication::VisibleProviders.first[:provider], omniauth_params) - redirect_to login_path + render :omniauth_new, layout: false else super end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2f3e8e3c7f..789d996260 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -139,8 +139,9 @@ def user_key current_user.user_key if current_user end - # the mediainfo gem returns duration as milliseconds - # see attr_reader.rb line 48 in the mediainfo source + # We are converting FFprobe's duration output to milliseconds for + # uniformity with existing metadata and consequently leaving these + # conversion methods in place for now. def milliseconds_to_formatted_time(milliseconds, include_fractions = true) total_seconds = milliseconds / 1000 hours = total_seconds / (60 * 60) diff --git a/app/helpers/media_objects_helper.rb b/app/helpers/media_objects_helper.rb index 04b0d60968..9ca5edd012 100644 --- a/app/helpers/media_objects_helper.rb +++ b/app/helpers/media_objects_helper.rb @@ -51,18 +51,6 @@ def dropbox_url collection ic.iconv(url) end - def combined_display_date media_object - (issued,created) = case media_object - when MediaObject, SpeedyAF::Proxy::MediaObject - [media_object.date_issued, media_object.date_created] - when Hash - [media_object[:document]['date_issued_ssi'], media_object[:document]['date_created_ssi']] - end - result = issued - result += " (Creation date: #{created})" if created.present? - result - end - def display_other_identifiers media_object # bibliographic_id has form [:type,"value"], other_identifier has form [[:type,"value],[:type,"value"],...] ids = media_object.bibliographic_id.present? ? [media_object.bibliographic_id] : [] diff --git a/app/javascript/components/MediaObjectRamp.jsx b/app/javascript/components/MediaObjectRamp.jsx index 250e4d3ef1..c876dd65d2 100644 --- a/app/javascript/components/MediaObjectRamp.jsx +++ b/app/javascript/components/MediaObjectRamp.jsx @@ -28,20 +28,9 @@ import "@samvera/ramp/dist/ramp.css"; import { Col, Row, Tab, Tabs } from 'react-bootstrap'; import './Ramp.scss'; -const ExpandCollapseArrow = () => { - return ( - - - - ); -}; - const Ramp = ({ urls, sections_count, - has_structure, title, share, timeline, @@ -53,10 +42,6 @@ const Ramp = ({ const [manifestUrl, setManifestUrl] = React.useState(''); const [startCanvasId, setStartCanvasId] = React.useState(); const [startCanvasTime, setStartCanvasTime] = React.useState(); - const [isClosed, setIsClosed] = React.useState(false); - - let expandCollapseBtnRef = React.useRef(); - let interval; React.useEffect(() => { const { base_url, fullpath_url } = urls; @@ -79,71 +64,15 @@ const Ramp = ({ : undefined ); setManifestUrl(url); - - // Attach player event listeners when there's structure - if (has_structure) { - interval = setInterval(addPlayerEventListeners, 500); - } - - // Clear interval upon component unmounting - return () => clearInterval(interval); }, []); - /** - * Listen to player's events to update the structure navigation - * UI - */ - const addPlayerEventListeners = () => { - let player = document.getElementById('iiif-media-player'); - if (player && player.player != undefined && !player.player.isDisposed()) { - let playerInst = player.player; - playerInst.on('loadedmetadata', () => { - playerInst.on('timeupdate', () => { - setIsClosed(false); - }); - }); - // Expand sections when a new Canvas is loaded into the player - playerInst.on('ready', () => { - setIsClosed(false); - }); - } - }; - - React.useEffect(() => { - expandCollapseSections(isClosed); - }, [isClosed]); - - const handleCollapseExpand = () => { - setIsClosed(isClosed => !isClosed); - }; - - const expandCollapseSections = (isClosing) => { - const allSections = $('div[class*="ramp--structured-nav__section"]'); - allSections.each(function (index, section) { - let sectionUl = section.nextSibling; - if (sectionUl) { - if (isClosing) { - sectionUl.classList.remove('expanded'); - sectionUl.classList.add('closed'); - expandCollapseBtnRef.current.classList.remove('expanded'); - expandCollapseBtnRef.current.classList.add('closed'); - } else { - sectionUl.classList.remove('closed'); - sectionUl.classList.add('expanded'); - expandCollapseBtnRef.current.classList.remove('closed'); - expandCollapseBtnRef.current.classList.add('expanded'); - } - } - }); - }; - return ( - + {(cdl.enabled && !cdl.can_stream) ? (
@@ -208,19 +137,6 @@ const Ramp = ({ } - {has_structure && - - - - }
@@ -237,14 +153,14 @@ const Ramp = ({ - + } ) } - + {cdl.enabled &&
} diff --git a/app/javascript/components/PlaylistRamp.jsx b/app/javascript/components/PlaylistRamp.jsx index fb8e5927e9..01cbc69f9d 100644 --- a/app/javascript/components/PlaylistRamp.jsx +++ b/app/javascript/components/PlaylistRamp.jsx @@ -159,10 +159,10 @@ const Ramp = ({ emptyManifestMessage='This playlist currently has no playable items.' startCanvasId={startCanvasId}> - + {playlist_item_ids?.length > 0 && ( - +

{activeItemTitle}

{activeItemSummary &&
{activeItemSummary}
} @@ -194,7 +194,7 @@ const Ramp = ({ )} - + diff --git a/app/javascript/components/Ramp.scss b/app/javascript/components/Ramp.scss index 1956294053..ca93afc3dd 100644 --- a/app/javascript/components/Ramp.scss +++ b/app/javascript/components/Ramp.scss @@ -19,6 +19,10 @@ } .ramp--all-components { + .ramp--structured-nav.display>.ramp--structured-nav__sections { + align-items: center; + } + .ramp--media_player { .video-js .vjs-big-play-button { left: 55% !important; @@ -278,7 +282,8 @@ .ramp--structured-nav { margin-top: 0px; min-width: inherit; - max-height: inherit; + max-height: 100%; + overflow: hidden; } .tab-pane { @@ -323,6 +328,15 @@ } .ramp--playlist-accordion { + // Set accordion with to fit player's minimum width + min-width: 490px; + &.mobile-view { + min-width: 380px; + } + + border-radius: 0 0 0.25em 0.25em; + border-top: none; + .accordion .card { border: none; border-bottom: 1px solid rgba(0, 0, 0, 0.125); diff --git a/app/javascript/components/ReactButtonContainer.scss b/app/javascript/components/ReactButtonContainer.scss index 1dcd151890..1647ca63e4 100644 --- a/app/javascript/components/ReactButtonContainer.scss +++ b/app/javascript/components/ReactButtonContainer.scss @@ -23,7 +23,7 @@ } .modal-open .modal { - height: 100vh; + height: calc(100vh - 80px); overflow: scroll; } diff --git a/app/javascript/components/embeds/EmbeddedRamp.jsx b/app/javascript/components/embeds/EmbeddedRamp.jsx index 867bc07a96..102bad16a9 100644 --- a/app/javascript/components/embeds/EmbeddedRamp.jsx +++ b/app/javascript/components/embeds/EmbeddedRamp.jsx @@ -110,12 +110,14 @@ const Ramp = ({ }; return ( - - - +
+ + + +
); }; diff --git a/app/javascript/components/embeds/Ramp.scss b/app/javascript/components/embeds/Ramp.scss index 4a54fa8771..4f3c100eb8 100644 --- a/app/javascript/components/embeds/Ramp.scss +++ b/app/javascript/components/embeds/Ramp.scss @@ -18,18 +18,44 @@ font-family: Arial, Helvetica, sans-serif; } -.ramp--media_player { +// Scope CSS to only embedded player +.embedded-ramp .ramp--media_player { .video-js .vjs-big-play-button { left: 55% !important; } + .video-js.vjs-audio-only-mode { + // Player height to the height of iframe container in embeds + max-height: 40px !important; + // Disable tooltips for volume and progress in embedded // audio. Viewport is too small to display them. .vjs-volume-panel:hover .vjs-mouse-display, - .vjs-custom-progress-bar .tooltiptext { + .vjs-custom-progress-bar .vjs-time-tooltip { display: none !important; } + + // Display progress-bar inline with player controls + .vjs-custom-progress-bar { + position: relative; + top: 0.475em; + margin: 0 0.15em; + } + + .vjs-volume-horizontal .vjs-volume-level span.vjs-icon-placeholder { + margin-top: 0.15em; + } + + // Set control-bar to player's width and remove spacers & offset + .vjs-control-bar { + &::after, &::before { + content: none; + } + width: 100% !important; + left: 0; + } } + @media (max-width: 585px) { .video-js .vjs-big-play-button { scale: 1.5; diff --git a/app/jobs/bulk_action_jobs.rb b/app/jobs/bulk_action_jobs.rb index a1ca94efe3..6e068b999a 100644 --- a/app/jobs/bulk_action_jobs.rb +++ b/app/jobs/bulk_action_jobs.rb @@ -134,6 +134,9 @@ def perform(documents, _params) successes = [] documents.each do |id| media_object = MediaObject.find(id) + supplemental_files = media_object.supplemental_files + DeleteChildFiles.perform_now(supplemental_files, nil) + if media_object.destroy successes += [media_object] else @@ -144,6 +147,19 @@ def perform(documents, _params) end end + class DeleteChildFiles < ActiveJob::Base + def perform(documents, _params) + documents.each do |doc| + begin + doc.destroy + rescue + logger.error("Failed to delete supplemental file #{doc.id}") + next + end + end + end + end + class Move < ActiveJob::Base def perform(documents, params) collection = Admin::Collection.find( params[:target_collection_id] ) diff --git a/app/jobs/master_file_management_jobs.rb b/app/jobs/master_file_management_jobs.rb index 72c4c1a819..f35de08acd 100644 --- a/app/jobs/master_file_management_jobs.rb +++ b/app/jobs/master_file_management_jobs.rb @@ -81,14 +81,8 @@ def perform(id) when 'file' then File.delete(oldpath) when 's3' then FileLocator::S3File.new(locator.source).object.delete end - masterfile.file_location = "" - masterfile.save Rails.logger.info "#{oldpath} has been deleted" else - unless masterfile.file_location.empty? - masterfile.file_location = "" - masterfile.save - end Rails.logger.warn "MasterFile #{oldpath} does not exist" end end diff --git a/app/models/access_control_step.rb b/app/models/access_control_step.rb index 4a4ad6f582..6a888eb547 100644 --- a/app/models/access_control_step.rb +++ b/app/models/access_control_step.rb @@ -90,8 +90,8 @@ def execute context end if context['remove_lease'].present? limited_access_submit = true - lease = Lease.find( context['remove_lease'] ) - media_object.governing_policies.delete( lease ) + lease = Lease.find(context['remove_lease']) + media_object.governing_policies.delete(lease) lease.destroy end @@ -108,21 +108,6 @@ def execute context end end - media_object.save! - - #Setup these values in the context because the edit partial is being rendered without running the controller's #edit (VOV-2978) - media_object.reload - context[:users] = media_object.read_users - context[:groups] = media_object.read_groups - context[:virtual_groups] = media_object.virtual_read_groups - context[:ip_groups] = media_object.ip_read_groups - context[:group_leases] = media_object.leases('local') - context[:user_leases] = media_object.leases('user') - context[:virtual_leases] = media_object.leases('external') - context[:ip_leases] = media_object.leases('ip') - context[:addable_groups] = Admin::Group.non_system_groups.reject { |g| context[:groups].include? g.name } - context[:addable_courses] = Course.all.reject { |c| context[:virtual_groups].include? c.context_id } - context[:lending_period] = media_object.lending_period context end diff --git a/app/models/batch_entries.rb b/app/models/batch_entries.rb index 8b5ea83bf3..a62a02226e 100644 --- a/app/models/batch_entries.rb +++ b/app/models/batch_entries.rb @@ -27,7 +27,7 @@ class BatchEntries < ActiveRecord::Base def ensure_mininum_viable_metadata return nil if minimal_viable_metadata? self.error = true - self.error_message = 'To successfully ingest, either title and date issued must be set or a bibliographic id must be provided' + self.error_message = 'To successfully ingest, either title must be set or a bibliographic id must be provided' end def queue @@ -54,7 +54,7 @@ def minimal_viable_metadata? return false if payload.nil? # nil guard fields = JSON.parse(payload)['fields'] return false if fields.blank? - return false if (fields['date_issued'].blank? || fields['title'].blank?) && fields['bibliographic_id'].blank? + return false if fields['title'].blank? && fields['bibliographic_id'].blank? true end diff --git a/app/models/concerns/iiif_supplemental_file_behavior.rb b/app/models/concerns/iiif_supplemental_file_behavior.rb index c9a6e4c433..48dbabba6f 100644 --- a/app/models/concerns/iiif_supplemental_file_behavior.rb +++ b/app/models/concerns/iiif_supplemental_file_behavior.rb @@ -33,7 +33,7 @@ def supplemental_files_rendering(object) end def object_supplemental_file_url(object, supplemental_file) - if object.is_a? MasterFile + if object.is_a?(MasterFile) || object.is_a?(SpeedyAF::Proxy::MasterFile) Rails.application.routes.url_helpers.master_file_supplemental_file_url(id: supplemental_file.id, master_file_id: object.id) else Rails.application.routes.url_helpers.media_object_supplemental_file_url(id: supplemental_file.id, media_object_id: object.id) diff --git a/app/models/concerns/media_object_mods.rb b/app/models/concerns/media_object_mods.rb index 17261d173a..44bca2b5cd 100644 --- a/app/models/concerns/media_object_mods.rb +++ b/app/models/concerns/media_object_mods.rb @@ -488,6 +488,7 @@ def record_identifier=(value) # Put the pieces into the right order and validate to make sure that there are no # syntactic errors def normalize_desc_metadata! + return unless descMetadata.content_changed? descMetadata.ensure_identifier_exists!(self.uri) descMetadata.update_change_date! descMetadata.reorder_elements! @@ -495,6 +496,11 @@ def normalize_desc_metadata! end def delete_all_values(*field_name) + # Manually mark the content as changed when deleteing values. + # Adding values causes calls into active_fedora-datastreams which markes the content as changed. + # The ng_xml_will_change! call here covers the case when all values are deleted and none are added back. + # This also markes the content as changed. + descMetadata.ng_xml_will_change! descMetadata.find_by_terms(*field_name).each &:remove end end diff --git a/app/models/derivative.rb b/app/models/derivative.rb index a39d22b5b7..fdb078469b 100644 --- a/app/models/derivative.rb +++ b/app/models/derivative.rb @@ -106,8 +106,8 @@ def self.from_output(output, managed = true) derivative.managed = managed derivative.track_id = output[:id] derivative.duration = output[:duration].to_i - # FIXME: Implement this in ActiveEncode - # derivative.mime_type = output[:mime_type] + # FIXME: Implement this in ActiveEncode or determine mimetype here + derivative.mime_type = output[:mime_type].presence derivative.quality = output[:label].sub(/quality-/, '') derivative.audio_bitrate = output[:audio_bitrate] diff --git a/app/models/iiif_canvas_presenter.rb b/app/models/iiif_canvas_presenter.rb index 53688984bd..d0245cadf1 100644 --- a/app/models/iiif_canvas_presenter.rb +++ b/app/models/iiif_canvas_presenter.rb @@ -27,7 +27,7 @@ def initialize(master_file:, stream_info:, media_fragment: nil) delegate :derivative_ids, :id, to: :master_file def to_s - master_file.display_title + master_file.structure_title end def range @@ -98,21 +98,29 @@ def service def video_content # @see https://github.com/samvera-labs/iiif_manifest - stream_urls.collect { |quality, _url| video_display_content(quality) } + stream_urls.collect { |quality, url, mimetype| video_display_content(quality, url, mimetype) } end - def video_display_content(quality) - IIIFManifest::V3::DisplayContent.new(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality), - **manifest_attributes(quality, 'Video')) + def video_display_content(quality, url, mimetype) + if mimetype.present? && mimetype != 'application/x-mpegURL' + IIIFManifest::V3::DisplayContent.new(url, **manifest_attributes(quality, 'Video', mimetype: mimetype)) + else + IIIFManifest::V3::DisplayContent.new(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality), + **manifest_attributes(quality, 'Video')) + end end def audio_content - stream_urls.collect { |quality, _url| audio_display_content(quality) } + stream_urls.collect { |quality, url, mimetype| audio_display_content(quality, url, mimetype) } end - def audio_display_content(quality) - IIIFManifest::V3::DisplayContent.new(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality), - **manifest_attributes(quality, 'Sound')) + def audio_display_content(quality, url, mimetype) + if mimetype.present? && mimetype != 'application/x-mpegURL' + IIIFManifest::V3::DisplayContent.new(url, **manifest_attributes(quality, 'Sound', mimetype: mimetype)) + else + IIIFManifest::V3::DisplayContent.new(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality), + **manifest_attributes(quality, 'Sound')) + end end def supplementing_content_data(file) @@ -142,7 +150,7 @@ def supplementing_content_data(file) def stream_urls stream_info[:stream_hls].collect do |d| - [d[:quality], d[:url]] + [d[:quality], d[:url], d[:mimetype]] end end @@ -214,14 +222,14 @@ def parse_hour_min_sec(s) smh[0] + (60 * smh[1]) + (3600 * smh[2]) end - def manifest_attributes(quality, media_type) + def manifest_attributes(quality, media_type, mimetype: 'application/x-mpegURL') media_hash = { label: quality, width: (master_file.width || '1280').to_i, height: (master_file.height || MasterFile::AUDIO_HEIGHT).to_i, duration: stream_info[:duration], type: media_type, - format: 'application/x-mpegURL' + format: mimetype }.compact if master_file.media_object.visibility == 'public' diff --git a/app/models/iiif_manifest_presenter.rb b/app/models/iiif_manifest_presenter.rb index 4dab4f39b2..113a9b517a 100644 --- a/app/models/iiif_manifest_presenter.rb +++ b/app/models/iiif_manifest_presenter.rb @@ -45,7 +45,7 @@ def description end def to_s - media_object.title + media_object.title || media_object.id end def manifest_metadata @@ -100,6 +100,7 @@ def metadata_field(label, value, default = nil) end def combined_display_date(media_object) + #FIXME Does this need to change now that date_issued is not required and thus could be nil result = media_object.date_issued result += " (Creation date: #{media_object.date_created})" if media_object.date_created.present? result @@ -173,6 +174,13 @@ def series_url(series) Rails.application.routes.url_helpers.blacklight_url({ "f[collection_ssim][]" => media_object.collection.name, "f[series_ssim][]" => series }) end + def display_search_linked(solr_field, values) + Array(values).collect do |value| + url = Rails.application.routes.url_helpers.blacklight_url({ "f[#{solr_field}][]" => value }) + "#{value}" + end + end + def display_lending_period(media_object) return nil unless lending_enabled ActiveSupport::Duration.build(media_object.lending_period).to_day_hour_s @@ -180,14 +188,15 @@ def display_lending_period(media_object) def iiif_metadata_fields fields = [ - metadata_field('Title', media_object.title), - metadata_field('Date', combined_display_date(media_object), 'Not provided'), + metadata_field('Title', media_object.title, media_object.id), + metadata_field('Publication date', media_object.date_issued), + metadata_field('Creation date', media_object.date_created), metadata_field('Main contributor', media_object.creator), metadata_field('Summary', display_summary(media_object)), metadata_field('Contributor', media_object.contributor), metadata_field('Publisher', media_object.publisher), metadata_field('Genre', media_object.genre), - metadata_field('Subject', media_object.topical_subject), + metadata_field('Subject', display_search_linked("subject_ssim", media_object.topical_subject)), metadata_field('Time period', media_object.temporal_subject), metadata_field('Location', media_object.geographic_subject), metadata_field('Collection', display_collection(media_object)), diff --git a/app/models/iiif_playlist_canvas_presenter.rb b/app/models/iiif_playlist_canvas_presenter.rb index 887c0793fe..64b2038dad 100644 --- a/app/models/iiif_playlist_canvas_presenter.rb +++ b/app/models/iiif_playlist_canvas_presenter.rb @@ -115,21 +115,29 @@ def metadata_field(label, value, default = nil) def video_content # @see https://github.com/samvera-labs/iiif_manifest - stream_urls.collect { |quality, _url| video_display_content(quality) } + stream_urls.collect { |quality, url, mimetype| video_display_content(quality, url, mimetype) } end - def video_display_content(quality) - IIIFManifest::V3::DisplayContent.new(CGI.unescape(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality, anchor: fragment_identifier)), - **manifest_attributes(quality, 'Video')) + def video_display_content(quality, url, mimetype) + if mimetype.present? && mimetype != 'application/x-mpegURL' + IIIFManifest::V3::DisplayContent.new(URI.join(url, "##{fragment_identifier}").to_s, **manifest_attributes(quality, 'Video', mimetype: mimetype)) + else + IIIFManifest::V3::DisplayContent.new(CGI.unescape(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality, anchor: fragment_identifier)), + **manifest_attributes(quality, 'Video')) + end end def audio_content - stream_urls.collect { |quality, _url| audio_display_content(quality) } + stream_urls.collect { |quality, url, mimetype| audio_display_content(quality, url, mimetype) } end - def audio_display_content(quality) - IIIFManifest::V3::DisplayContent.new(CGI.unescape(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality, anchor: fragment_identifier)), - **manifest_attributes(quality, 'Sound')) + def audio_display_content(quality, url, mimetype) + if mimetype.present? && mimetype != 'application/x-mpegURL' + IIIFManifest::V3::DisplayContent.new(URI.join(url, "##{fragment_identifier}").to_s, **manifest_attributes(quality, 'Sound', mimetype: mimetype)) + else + IIIFManifest::V3::DisplayContent.new(CGI.unescape(Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality, anchor: fragment_identifier)), + **manifest_attributes(quality, 'Sound')) + end end def marker_content(marker) @@ -174,7 +182,7 @@ def supplemental_attributes(file) def stream_urls stream_info[:stream_hls].collect do |d| - [d[:quality], d[:url]] + [d[:quality], d[:url], d[:mimetype]] end end @@ -192,14 +200,14 @@ def simple_iiif_range(label = stream_info[:embed_title]) ) end - def manifest_attributes(quality, media_type) + def manifest_attributes(quality, media_type, mimetype: 'application/x-mpegURL') media_hash = { label: quality, width: (master_file.width || '1280').to_i, height: (master_file.height || MasterFile::AUDIO_HEIGHT).to_i, duration: stream_info[:duration], type: media_type, - format: 'application/x-mpegURL' + format: mimetype }.compact if master_file.media_object.visibility == 'public' diff --git a/app/models/master_file.rb b/app/models/master_file.rb index 789471d64c..51e8706eae 100644 --- a/app/models/master_file.rb +++ b/app/models/master_file.rb @@ -15,6 +15,7 @@ require 'fileutils' require 'hooks' require 'open-uri' +require 'avalon/ffprobe' require 'avalon/file_resolver' require 'avalon/m3u8_reader' @@ -164,6 +165,7 @@ def error after_save :update_stills_from_offset!, if: Proc.new { |mf| mf.previous_changes.include?("poster_offset") || mf.previous_changes.include?("thumbnail_offset") } before_destroy :stop_processing! before_destroy :update_parent! + before_destroy :remove_child_files define_hooks :after_transcoding, :after_processing after_update_index { |mf| mf.media_object&.enqueue_long_indexing } @@ -562,12 +564,14 @@ def stop_processing! ActiveEncodeJobs::CancelEncodeJob.perform_later(workflow_id, id) if workflow_id.present? && !finished_processing? end - protected - - def mediainfo - Mediainfo.new(FileLocator.new(file_location).location, headers: @auth_header) + # Delete does not trigger callbacks so override method to ensure deletion of child supplemental files + def delete + remove_child_files + super end + protected + def find_frame_source(options={}) options[:offset] ||= 2000 @@ -589,7 +593,7 @@ def find_frame_source(options={}) end def create_frame_source_hls_temp_file(offset) - playlist_url = self.stream_details[:stream_hls].find { |d| d[:quality] == 'high' }[:url] + playlist_url = self.hls_streams.find { |d| d[:quality] == 'high' || d[:quality] == 'medium' || d[:quality] == 'low' }[:url] secure_url = SecurityHandler.secure_url(playlist_url, target: self.id) playlist = Avalon::M3U8Reader.read(secure_url) details = playlist.at(offset) @@ -722,33 +726,33 @@ def saveDerivativesHash(derivative_hash) end def reloadTechnicalMetadata! - #Reset mediainfo - @mediainfo = mediainfo + # Reset ffprobe + @ffprobe = Avalon::FFprobe.new(FileLocator.new(file_location)) # Formats like MP4 can be caught as both audio and video # so the case statement flows in the preferred order - self.file_format = if @mediainfo.video? + self.file_format = if @ffprobe.video? 'Moving image' - elsif @mediainfo.audio? + elsif @ffprobe.audio? 'Sound' else 'Unknown' end self.duration = begin - @mediainfo.duration.to_s + @ffprobe.duration.to_s rescue nil end - unless @mediainfo.video.streams.empty? - display_aspect_ratio_s = @mediainfo.video.streams.first.display_aspect_ratio + unless !@ffprobe.video? + display_aspect_ratio_s = @ffprobe.display_aspect_ratio if ':'.in? display_aspect_ratio_s self.display_aspect_ratio = display_aspect_ratio_s.split(/:/).collect(&:to_f).reduce(:/).to_s else self.display_aspect_ratio = display_aspect_ratio_s end - self.original_frame_size = @mediainfo.video.streams.first.frame_size + self.original_frame_size = @ffprobe.original_frame_size end end @@ -792,6 +796,10 @@ def update_parent! end end + def remove_child_files + BulkActionJobs::DeleteChildFiles.perform_later(supplemental_files, nil) + end + private def generate_waveform diff --git a/app/models/media_object.rb b/app/models/media_object.rb index c1eb6aa305..e9e7085248 100644 --- a/app/models/media_object.rb +++ b/app/models/media_object.rb @@ -79,7 +79,6 @@ class MediaObject < ActiveFedora::Base # validates :governing_policies, presence: true if Proc.new { |mo| mo.changes["governing_policy_ids"].empty? } validates :title, presence: true, if: :resource_description_active? - validates :date_issued, presence: true, if: :resource_description_active? validate :validate_language, if: :resource_description_active? validate :validate_related_items, if: :resource_description_active? validate :validate_dates, if: :resource_description_active? @@ -182,6 +181,10 @@ def section_ids return [] if self.section_list.nil? @section_ids = JSON.parse(self.section_list) end + + def published? + !avalon_publisher.blank? + end def destroy # attempt to stop the matterhorn processing job @@ -301,6 +304,13 @@ def fill_in_solr_fields_that_need_sections(solr_doc) solr_doc['all_comments_ssim'] = all_comments end + def fill_in_solr_fields_needing_leases(solr_doc) + solr_doc['read_access_virtual_group_ssim'] = virtual_read_groups + leases('external').map(&:inherited_read_groups).flatten + solr_doc['read_access_ip_group_ssim'] = collect_ips_for_index(ip_read_groups + leases('ip').map(&:inherited_read_groups).flatten) + solr_doc[Hydra.config.permissions.read.group] ||= [] + solr_doc[Hydra.config.permissions.read.group] += solr_doc['read_access_ip_group_ssim'] + end + # Enqueue background job to do a full indexing including more costly fields that read from children def enqueue_long_indexing MediaObjectIndexingJob.perform_later(id) @@ -311,10 +321,6 @@ def to_solr(include_child_fields: false) solr_doc[ActiveFedora.index_field_mapper.solr_name("workflow_published", :facetable, type: :string)] = published? ? 'Published' : 'Unpublished' solr_doc[ActiveFedora.index_field_mapper.solr_name("collection", :symbol, type: :string)] = collection.name if collection.present? solr_doc[ActiveFedora.index_field_mapper.solr_name("unit", :symbol, type: :string)] = collection.unit if collection.present? - solr_doc['read_access_virtual_group_ssim'] = virtual_read_groups + leases('external').map(&:inherited_read_groups).flatten - solr_doc['read_access_ip_group_ssim'] = collect_ips_for_index(ip_read_groups + leases('ip').map(&:inherited_read_groups).flatten) - solr_doc[Hydra.config.permissions.read.group] ||= [] - solr_doc[Hydra.config.permissions.read.group] += solr_doc['read_access_ip_group_ssim'] solr_doc["title_ssort"] = self.title solr_doc["creator_ssort"] = Array(self.creator).join(', ') solr_doc["date_ingested_ssim"] = self.create_date.strftime "%F" if self.create_date.present? @@ -327,9 +333,10 @@ def to_solr(include_child_fields: false) solr_doc['section_id_ssim'] = section_ids if include_child_fields fill_in_solr_fields_that_need_sections(solr_doc) + fill_in_solr_fields_needing_leases(solr_doc) elsif id.present? # avoid error in test suite # Fill in other identifier so these values aren't stripped from the solr doc while waiting for the background job - mf_docs = ActiveFedora::SolrService.query("isPartOf_ssim:#{id}", rows: 1_000_000) + mf_docs = ActiveFedora::SolrService.query("isPartOf_ssim:#{id}", rows: 100_000) solr_doc["other_identifier_sim"] += mf_docs.collect { |h| h['identifier_ssim'] }.flatten end @@ -470,7 +477,7 @@ def section_solr_docs # in the section_list return [] unless section_ids.present? query = "id:" + section_ids.join(" id:") - @section_docs ||= ActiveFedora::SolrService.query(query, rows: 1_000_000) + @section_docs ||= ActiveFedora::SolrService.query(query, rows: 100_000) end def calculate_duration diff --git a/app/models/resource_description_step.rb b/app/models/resource_description_step.rb index d357f11562..57010c6091 100644 --- a/app/models/resource_description_step.rb +++ b/app/models/resource_description_step.rb @@ -24,9 +24,8 @@ def execute context media_object.descMetadata.populate_from_catalog!(context[:media_object_params][:bibliographic_id][:id],context[:media_object_params][:bibliographic_id][:source]) else media_object.permalink = context[:media_object_params].delete(:permalink) - media_object.update_attributes(context[:media_object_params]) + media_object.assign_attributes(context[:media_object_params]) end - media_object.save context end end diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb index 6b02d50579..891d2d13fa 100644 --- a/app/models/search_builder.rb +++ b/app/models/search_builder.rb @@ -65,7 +65,8 @@ def term_frequency_counts(solr_parameters) transcripts_present = SupplementalFile.with_tag('transcript').any? # List of fields for displaying on search results (Blacklight index fields) - fl = ['id', 'has_model_ssim', 'title_tesi', 'date_issued_ssi', 'creator_ssim', 'abstract_ssi', 'duration_ssi', 'section_id_ssim', 'avalon_resource_type_ssim'] + fl = ['id', 'has_model_ssim', 'title_tesi', 'date_issued_ssi', 'creator_ssim', 'abstract_ssi', 'duration_ssi', 'section_id_ssim', 'avalon_resource_type_ssim', + 'descMetadata_modified_dtsi', 'timestamp'] # Add a field for matching child sections fl << "sections:[subquery]" diff --git a/app/models/structure_step.rb b/app/models/structure_step.rb index aa35b0935f..2475a75817 100644 --- a/app/models/structure_step.rb +++ b/app/models/structure_step.rb @@ -19,9 +19,8 @@ def initialize(step = 'structure', title = "Structure", summary = "Organization def execute context media_object = context[:media_object] - if ! context[:master_file_ids].nil? + if context[:master_file_ids].present? media_object.section_ids = context[:master_file_ids] - media_object.save end context end diff --git a/app/models/supplemental_file.rb b/app/models/supplemental_file.rb index e000c73eb8..a324532f74 100644 --- a/app/models/supplemental_file.rb +++ b/app/models/supplemental_file.rb @@ -25,7 +25,7 @@ class SupplementalFile < ApplicationRecord validates :parent_id, presence: true validate :validate_file_type, if: :caption? - serialize :tags, Array + serialize :tags, type: Array # Need to prepend so this runs before the callback added by `has_one_attached` above # See https://github.com/rails/rails/issues/37304 diff --git a/app/presenters/admin/collection_presenter.rb b/app/presenters/admin/collection_presenter.rb index c4b07064bb..7bc4fec13b 100644 --- a/app/presenters/admin/collection_presenter.rb +++ b/app/presenters/admin/collection_presenter.rb @@ -44,15 +44,15 @@ def unpublished_media_object_count end def managers - @managers ||= document["edit_access_person_ssim"] & (document["collection_managers_ssim"] || []) + @managers ||= Array(document["edit_access_person_ssim"]) & Array(document["collection_managers_ssim"]) end def editors - @editors ||= document["edit_access_person_ssim"] - managers + @editors ||= Array(document["edit_access_person_ssim"]) - managers end def depositors - document["read_access_person_ssim"] + Array(document["read_access_person_ssim"]) end def manager_count diff --git a/app/presenters/encode_presenter.rb b/app/presenters/encode_presenter.rb index 96b85b9953..37b78b8220 100644 --- a/app/presenters/encode_presenter.rb +++ b/app/presenters/encode_presenter.rb @@ -29,7 +29,7 @@ def initialize(encode_record) delegate :id, :adapter, :display_title, :master_file_id, :media_object_id, :created_at, :progress, to: :encode_record def status - @encode_record.state.capitalize + @encode_record.state&.capitalize end def global_id diff --git a/app/services/file_locator.rb b/app/services/file_locator.rb index 6b6740c079..65041c88c3 100644 --- a/app/services/file_locator.rb +++ b/app/services/file_locator.rb @@ -118,10 +118,19 @@ def reader when 'file' File.open(location,'r') else - Kernel::open(uri.to_s, 'r') + open_uri end end + # Ruby 3.0 removed URI#open from being called by Kernel#open. + # Prioritize using URI#open, attempt to fallback to Kernel#open + # if URI fails. + def open_uri + URI.open(uri, 'r') + rescue + Kernel::open(uri.to_s, 'r') + end + def attachment case uri.scheme when 's3' diff --git a/app/services/waveform_service.rb b/app/services/waveform_service.rb index fc0ce6f93b..4100443a87 100644 --- a/app/services/waveform_service.rb +++ b/app/services/waveform_service.rb @@ -75,33 +75,37 @@ def empty_waveform(master_file) def get_normalized_peaks(uri) wave_io = get_wave_io(uri.to_s) - peaks = gather_peaks(wave_io) + peaks = [] + reader = nil + abs_max = 0 + begin + reader = WaveFile::Reader.new(wave_io) + reader.each_buffer(@samples_per_pixel) do |buffer| + sample_min, sample_max = buffer.samples.minmax + peaks << [sample_min, sample_max] + abs_max = [abs_max, sample_min.abs, sample_max.abs].max + end + rescue WaveFile::InvalidFormatError + # ffmpeg generated no wavefile data + end return [] if peaks.blank? - max_peak = peaks.flatten.map(&:abs).max res = 2**(@bit_res - 1) - factor = max_peak.zero? ? 1 : res / max_peak.to_f - peaks.map { |peak| peak.collect { |num| (num * factor).to_i } } + factor = abs_max.zero? ? 1 : res / abs_max.to_f + peaks.each do |peak| + peak[0] = (peak[0] * factor).to_i + peak[1] = (peak[1] * factor).to_i + end + peaks ensure - Process.wait(wave_io.pid) if wave_io&.pid + reader&.close + wave_io&.close end def get_wave_io(uri) headers = "-headers $'Referer: #{Rails.application.routes.url_helpers.root_url}\r\n'" if uri.starts_with? "http" normalized_uri = uri.starts_with?("file") ? Addressable::URI.unencode(uri) : uri timeout = 60000000 # Must be in microseconds. Current value = 1 minute. - cmd = "#{Settings.ffmpeg.path} #{headers} -rw_timeout #{timeout} -i '#{normalized_uri}' -f wav -ar 44100 - 2> /dev/null" + cmd = "#{Settings.ffmpeg.path} #{headers} -rw_timeout #{timeout} -i '#{normalized_uri}' -f wav -ar 44100 -ac 1 - 2> /dev/null" IO.popen(cmd) end - - def gather_peaks(wav_file) - peaks = [] - begin - WaveFile::Reader.new(wav_file).each_buffer(@samples_per_pixel) do |buffer| - peaks << [buffer.samples.flatten.min, buffer.samples.flatten.max] - end - rescue WaveFile::InvalidFormatError - # ffmpeg generated no wavefile data - end - peaks - end end diff --git a/app/views/bookmarks/update_access_control.html.erb b/app/views/bookmarks/update_access_control.html.erb index e63eb8e4b8..06f16a4d42 100644 --- a/app/views/bookmarks/update_access_control.html.erb +++ b/app/views/bookmarks/update_access_control.html.erb @@ -74,51 +74,61 @@ Unless required by applicable law or agreed to in writing, software distributed Special Access <%= label_tag "user" do %> <%= render partial: "modules/tooltip", locals: { form: form, field: 'user', tooltip: t("access_control.user"), options: {display_label: t("access_control.userlabel").html_safe} } %> -
+
<%= hidden_field_tag "user" %> <%= text_field_tag "user_display", nil, class: "typeahead from-model form-control", - data: { model: 'user', target: "user" } %>
- <%= text_field_tag "add_user_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
+ data: { model: 'user', target: "user" } %> + <%= text_field_tag "add_user_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %> <%= text_field_tag "add_user_end", nil, placeholder: 'End Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
- <%= button_tag "Add", name: 'submit_add_user', class:'btn btn-outline', value: 'Add' %> - <%= button_tag "Remove", name: 'submit_remove_user', class:'btn btn-outline remove_access', value: 'Remove' %> +
+ <%= button_tag "Add", name: 'submit_add_user', class:'btn btn-outline', value: 'Add' %> + <%= button_tag "Remove", name: 'submit_remove_user', class:'btn btn-outline remove_access', value: 'Remove' %> +
<% end %> <%= label_tag "group" do %> <%= render partial: "modules/tooltip", locals: { form: form, field: 'group', tooltip: t("access_control.group"), options: {display_label: t("access_control.grouplabel").html_safe} } %> - <% dropdown_values = [Admin::Group.non_system_groups, 'name', 'name'] %> - <% dropdown_values = options_from_collection_for_select(*dropdown_values) %> - <%= select_tag "group", - dropdown_values, - { include_blank: true, class: "form-control"}%>
- <%= text_field_tag "add_group_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
- <%= text_field_tag "add_group_end", nil, placeholder: 'End Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %> - <%= button_tag "Add", name: 'submit_add_group', class:'btn btn-outline', value: 'Add' %> - <%= button_tag "Remove", name: 'submit_remove_group', class:'btn btn-outline remove_access', value: 'Remove' %> +
+ <% dropdown_values = [Admin::Group.non_system_groups, 'name', 'name'] %> + <% dropdown_values = options_from_collection_for_select(*dropdown_values) %> + <%= select_tag "group", + dropdown_values, + { include_blank: true, class: "form-control"}%> + <%= text_field_tag "add_group_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %> + <%= text_field_tag "add_group_end", nil, placeholder: 'End Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %> +
+
+ <%= button_tag "Add", name: 'submit_add_group', class:'btn btn-outline', value: 'Add' %> + <%= button_tag "Remove", name: 'submit_remove_group', class:'btn btn-outline remove_access', value: 'Remove' %> +
<% end %> <%= label_tag "class" do %> <%= render partial: "modules/tooltip", locals: { form: form, field: 'class', tooltip: t("access_control.class"), options: {display_label: t("access_control.classlabel").html_safe} } %> -
+
<%= hidden_field_tag "class" %> <%= text_field_tag "class_display", nil, class: "typeahead from-model form-control", - data: { model: 'externalGroup', target: "class" } %>
- <%= text_field_tag "add_class_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
+ data: { model: 'externalGroup', target: "class" } %> + <%= text_field_tag "add_class_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %> <%= text_field_tag "add_class_end", nil, placeholder: 'End Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
- <%= button_tag "Add", name: 'submit_add_class', class:'btn btn-outline', value: 'Add' %> - <%= button_tag "Remove", name: 'submit_remove_class', class:'btn btn-outline remove_access', value: 'Remove' %> +
+ <%= button_tag "Add", name: 'submit_add_class', class:'btn btn-outline', value: 'Add' %> + <%= button_tag "Remove", name: 'submit_remove_class', class:'btn btn-outline remove_access', value: 'Remove' %> +
<% end %> <%= label_tag "ipaddress" do %> <%= render partial: "modules/tooltip", locals: { form: form, field: 'ipaddress', tooltip: t("access_control.ipaddress"), options: {display_label: t("access_control.ipaddresslabel").html_safe} } %> -
- <%= text_field_tag "ipaddress", nil, class: "form-control" %>
- <%= text_field_tag "add_ipaddress_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
+
+ <%= text_field_tag "ipaddress", nil, class: "form-control" %> + <%= text_field_tag "add_ipaddress_begin", nil, placeholder: 'Begin Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %> <%= text_field_tag "add_ipaddress_end", nil, placeholder: 'End Date (yyyy-mm-dd)', class: 'form-control date-input access_date', autocomplete: 'off' %>
- <%= button_tag "Add", name: 'submit_add_ipaddress', class:'btn btn-outline', value: 'Add' %> - <%= button_tag "Remove", name: 'submit_remove_ipaddress', class:'btn btn-outline remove_access', value: 'Remove' %> +
+ <%= button_tag "Add", name: 'submit_add_ipaddress', class:'btn btn-outline', value: 'Add' %> + <%= button_tag "Remove", name: 'submit_remove_ipaddress', class:'btn btn-outline remove_access', value: 'Remove' %> +
<% end %>
diff --git a/app/views/media_objects/_item_view.html.erb b/app/views/media_objects/_item_view.html.erb index 872a449881..40bbec1a19 100644 --- a/app/views/media_objects/_item_view.html.erb +++ b/app/views/media_objects/_item_view.html.erb @@ -43,7 +43,6 @@ Unless required by applicable law or agreed to in writing, software distributed { urls: { base_url: request.protocol + request.host_with_port, fullpath_url: request.fullpath }, sections_count: @media_object.sections.size, - has_structure: @media_object.sections.any?{ |mf| mf.has_structuralMetadata? }, title: { content: render('title') }, share: { canShare: (will_partial_list_render? :share), content: lending_enabled?(@media_object) ? (render('share') if can_stream) : render('share') }, timeline: { canCreate: (current_ability.can? :create, Timeline), content: lending_enabled?(@media_object) ? (render('timeline') if can_stream) : render('timeline') }, diff --git a/app/views/media_objects/_resource_description.html.erb b/app/views/media_objects/_resource_description.html.erb index 904c836c1c..446d1bd9fe 100644 --- a/app/views/media_objects/_resource_description.html.erb +++ b/app/views/media_objects/_resource_description.html.erb @@ -37,7 +37,7 @@ Unless required by applicable law or agreed to in writing, software distributed <%= render partial: 'text_field', locals: {form: form, field: :date_issued, - options: {display_label: 'Publication date', required: true}} %> + options: {display_label: 'Publication date'}} %> <%= render partial: 'text_field', locals: {form: form, field: :creator, diff --git a/app/views/media_objects/_supplemental_files_list.html.erb b/app/views/media_objects/_supplemental_files_list.html.erb index 39d8b3ce0f..c9ff8b6dfb 100644 --- a/app/views/media_objects/_supplemental_files_list.html.erb +++ b/app/views/media_objects/_supplemental_files_list.html.erb @@ -98,6 +98,7 @@ Unless required by applicable law or agreed to in writing, software distributed
<%# Update button %> + <%= button_tag name: 'edit_label', class:'btn btn-outline btn-sm edit_label display-item', type: 'button' do %> Edit <% end %> diff --git a/app/views/media_objects/_title.html.erb b/app/views/media_objects/_title.html.erb index 647d81a893..c028b4995e 100644 --- a/app/views/media_objects/_title.html.erb +++ b/app/views/media_objects/_title.html.erb @@ -17,7 +17,7 @@ Unless required by applicable law or agreed to in writing, software distributed

<% unless @media_object.title.blank? %> - <%= @media_object.title %><%= " / #{@media_object.statement_of_responsibility}" if @media_object.statement_of_responsibility.present? %> + <%= @media_object.title %> <% else %> <%= @media_object.id %> <% end %> diff --git a/app/views/playlist_items/_current_item.html.erb b/app/views/playlist_items/_current_item.html.erb index 8317720d78..dea93086f5 100644 --- a/app/views/playlist_items/_current_item.html.erb +++ b/app/views/playlist_items/_current_item.html.erb @@ -39,7 +39,8 @@ Unless required by applicable law or agreed to in writing, software distributed

- <%= display_metadata('Date', combined_display_date(@current_mediaobject), 'Not provided') %> + <%= display_metadata('Publication date', @current_mediaobject.date_issued) %> + <%= display_metadata('Creation date', @current_mediaobject.date_created) %> <%= display_metadata('Main contributor', @current_mediaobject.creator) %> <% unless @current_mediaobject.abstract.blank? %>
Summary
diff --git a/app/views/users/sessions/omniauth_new.html.erb b/app/views/users/sessions/omniauth_new.html.erb new file mode 100644 index 0000000000..b5a42bc611 --- /dev/null +++ b/app/views/users/sessions/omniauth_new.html.erb @@ -0,0 +1,11 @@ + + + <%= csrf_meta_tags %> + + +<%= button_to 'Login', user_omniauth_authorize_path(Avalon::Authentication::VisibleProviders.first[:provider], params.slice(:provider).permit!), form: { name: 'form1' } %> + + + diff --git a/bin/brakeman b/bin/brakeman new file mode 100755 index 0000000000..ace1c9ba08 --- /dev/null +++ b/bin/brakeman @@ -0,0 +1,7 @@ +#!/usr/bin/env ruby +require "rubygems" +require "bundler/setup" + +ARGV.unshift("--ensure-latest") + +load Gem.bin_path("brakeman", "brakeman") diff --git a/bin/rubocop b/bin/rubocop new file mode 100755 index 0000000000..40330c0ff1 --- /dev/null +++ b/bin/rubocop @@ -0,0 +1,8 @@ +#!/usr/bin/env ruby +require "rubygems" +require "bundler/setup" + +# explicit rubocop config increases performance slightly while avoiding config confusion. +ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__)) + +load Gem.bin_path("rubocop", "rubocop") diff --git a/bin/setup b/bin/setup index 611b8d05ed..f9ba6e6c8c 100755 --- a/bin/setup +++ b/bin/setup @@ -3,9 +3,10 @@ require "fileutils" # path to your application root. APP_ROOT = File.expand_path("..", __dir__) +APP_NAME = "Avalon" def system!(*args) - system(*args) || abort("\n== Command #{args} failed ==") + system(*args, exception: true) end FileUtils.chdir APP_ROOT do @@ -33,4 +34,8 @@ FileUtils.chdir APP_ROOT do puts "\n== Restarting application server ==" system! "bin/rails restart" + + # puts "\n== Configuring puma-dev ==" + # system "ln -nfs #{APP_ROOT} ~/.puma-dev/#{APP_NAME}" + # system "curl -Is https://#{APP_NAME}.test/up | head -n 1" end diff --git a/config/application.rb b/config/application.rb index 475af9a286..44c2f0a5d9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ Bundler.require(*Rails.groups) module Avalon - VERSION = '7.8.0' + VERSION = '8.0.0' class Application < Rails::Application require 'avalon/configuration' @@ -19,12 +19,17 @@ class Application < Rails::Application end # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.0 + config.load_defaults 7.2 # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. + # Please, add to the `ignore` list any other `lib` subdirectories that do + # not contain `.rb` files, or that should not be reloaded or eager loaded. + # Common ones are `templates`, `generators`, or `middleware`, for example. + # config.autoload_lib(ignore: %w[assets avalon capistrano tasks]) + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' @@ -39,21 +44,31 @@ class Application < Rails::Application config.action_dispatch.default_headers = { 'X-Frame-Options' => 'ALLOWALL' } + # We have a number of serializers in place that have not previously had a :coder defined. + # Setting our global default to the old default :coder should maintain compatibility. + config.active_record.default_column_serializer = YAML + + # Rails recommends having this set to false, especially in zeitwerk mode. However, that + # currently causes issues with the Samvera gems (hydra-head, Blacklight) + config.add_autoload_paths_to_load_path = true + config.middleware.insert_before 0, Rack::Cors do allow do origins { |source| true } resource '/avalon_marker/*', headers: :any, credentials: true, methods: [:get, :post, :put, :delete] resource '/media_objects/*/manifest*', headers: :any, methods: [:get] resource '/master_files/*/thumbnail', headers: :any, methods: [:get] - resource '/master_files/*/transcript/*/*', headers: :any, methods: [:get] + resource '/master_files/*/transcript/*', headers: :any, methods: [:get] resource '/master_files/*/structure.json', headers: :any, methods: [:get, :post, :delete] resource '/master_files/*/waveform.json', headers: :any, methods: [:get] resource '/master_files/*/*.m3u8', headers: :any, credentials: true, methods: [:get, :head] resource '/master_files/*/captions', headers: :any, methods: [:get] resource '/master_files/*/supplemental_files/*', headers: :any, methods: [:get] - resource '/playlists/*/manifest.json', headers: :any, credentials: true, methods: [:get] - resource '/timelines/*/manifest.json', headers: :any, methods: [:get, :post] + resource '/playlists/*/manifest*', headers: :any, credentials: true, methods: [:get] + resource '/timelines/*/manifest*', headers: :any, methods: [:get, :post] resource '/master_files/*/search', headers: :any, methods: [:get] + resource '/rails/active_storage/blobs/*/*/*', headers: :any, methods: [:get] + resource '/rails/active_storage/disk/*/*', headers: :any, methods: [:get] end end diff --git a/config/browse_everything_providers.yml b/config/browse_everything_providers.yml index 4ac85e22f4..ad16b6f646 100644 --- a/config/browse_everything_providers.yml +++ b/config/browse_everything_providers.yml @@ -18,3 +18,9 @@ file_system: # sky_drive: # :client_id: YOUR_MS_LIVE_CONNECT_CLIENT_ID # :client_secret: YOUR_MS_LIVE_CONNECT_CLIENT_SECRET +# sharepoint: +# client_id: YOUR_MICROSOFT_GRAPH_CLIENT_ID +# client_secret: YOUR_MICROSOFT_GRAPH_CLIENT_SECRET +# tenant_id: YOUR_MICROSOFT_GRAPH_TENANT_ID +# scope: offline_access https://graph.microsoft.com/.default +# redirect_uri: https://example.com/browse/connect \ No newline at end of file diff --git a/config/environments/development.rb b/config/environments/development.rb index 067820227b..6b554fcb54 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -6,7 +6,7 @@ # In the development environment your application's code is reloaded any time # it changes. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. - config.cache_classes = false + config.enable_reloading = true # Do not eager load code on boot. config.eager_load = false @@ -14,7 +14,7 @@ # Show full error reports. config.consider_all_requests_local = true - # Enable server timing + # Enable server timing. config.server_timing = true # Enable/disable caching. By default caching is disabled. @@ -39,8 +39,12 @@ # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false + # Disable caching for Action Mailer templates even if Action Controller + # caching is enabled. config.action_mailer.perform_caching = false + config.action_mailer.default_url_options = { host: "localhost", port: 3000 } + config.action_mailer.show_previews = true # Print deprecation notices to the Rails logger. @@ -79,4 +83,10 @@ # Uncomment if you wish to allow Action Cable access from any origin. # config.action_cable.disable_request_forgery_protection = true + + # Raise error when a before_action's only/except options reference missing actions. + config.action_controller.raise_on_missing_callback_actions = true + + # Apply autocorrection by RuboCop to files generated by `bin/rails generate`. + # config.generators.apply_rubocop_autocorrect_after_generate! end diff --git a/config/environments/production.rb b/config/environments/production.rb index 1756dbaf7b..2bf1dca611 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -3,11 +3,8 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # Verifies that versions and hashed value of the package contents in the project's package.json - # config.webpacker.check_yarn_integrity = false - # Code is not reloaded between requests. - config.cache_classes = true + config.enable_reloading = false # Eager load code on boot. This eager loads most of Rails and # your application in memory, allowing both threaded web servers @@ -16,15 +13,14 @@ config.eager_load = true # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false + config.consider_all_requests_local = false config.action_controller.perform_caching = true - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key or an environment + # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files). # config.require_master_key = true - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. + # Disable serving static files from `/public`, relying on NGINX/Apache to do so instead. config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present? # Compress JavaScripts and CSS. @@ -33,7 +29,7 @@ # Compress CSS using a preprocessor. # config.assets.css_compressor = :sass - # Do not fallback to assets pipeline if a precompiled asset is missed. + # Do not fall back to assets pipeline if a precompiled asset is missed. config.assets.compile = true # Enable serving of images, stylesheets, and JavaScripts from an asset server. @@ -51,12 +47,15 @@ # config.action_cable.url = "wss://example.com/cable" # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ] + # Assume all access to the app is happening through a SSL-terminating reverse proxy. + # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies. + # config.assume_ssl = true + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # Include generic and useful information about system operation, but avoid logging too much - # information to avoid inadvertent exposure of personally identifiable information (PII). - config.log_level = :info + # Skip http-to-https redirect for the default health check endpoint. + # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "up" } } } # Suppress logger output for asset requests. config.assets.quiet = true @@ -64,15 +63,22 @@ # Prepend all log lines with the following tags. config.log_tags = [ :request_id ] + # "info" includes generic and useful information about system operation, but avoids logging too much + # information to avoid inadvertent exposure of personally identifiable information (PII). If you + # want to log everything, set the level to "debug". + config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info") + # Use a different cache store in production. # config.cache_store = :mem_cache_store # Use a real queuing backend for Active Job (and separate queues per environment). - # config.active_job.queue_adapter = :resque + # config.active_job.queue_adapter = :resque # config.active_job.queue_name_prefix = "avalon_production" - config.active_job.queue_adapter = Settings&.active_job&.queue_adapter || :sidekiq + config.active_job.queue_adapter = Settings&.active_job&.queue_adapter || :sidekiq require 'active_job/queue_adapters/better_active_elastic_job_adapter' if config.active_job.queue_adapter == :active_elastic_job + # Disable caching for Action Mailer templates even if Action Controller + # caching is enabled. config.action_mailer.perform_caching = false # Ignore bad email addresses and do not raise email delivery errors. @@ -94,11 +100,19 @@ # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name") if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) + config.logger = ActiveSupport::Logger.new(STDOUT) + .tap { |logger| logger.formatter = ::Logger::Formatter.new } + .then { |logger| ActiveSupport::TaggedLogging.new(logger) } end # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false + + # Enable DNS rebinding protection and other `Host` header attacks. + # config.hosts = [ + # "example.com", # Allow requests from example.com + # /.*\.example\.com/ # Allow requests from subdomains like `www.example.com` + # ] + # Skip DNS rebinding protection for the default health check endpoint. + # config.host_authorization = { exclude: ->(request) { request.path == "/up" } } end diff --git a/config/environments/test.rb b/config/environments/test.rb index 180c88aeaa..a55b30050f 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,12 +8,13 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. - # Turn false under Spring and add config.action_view.cache_template_loading = true. - config.cache_classes = true + # While tests run files are not watched, reloading is not necessary. + config.enable_reloading = false - # Eager loading loads your whole application. When running a single test locally, - # this probably isn't necessary. It's a good idea to do in a continuous integration - # system, or in some way before deploying your code. + # Eager loading loads your entire application. When running a single test locally, + # this is usually not necessary, and can slow down your test suite. However, it's + # recommended that you enable it in continuous integration systems to ensure eager + # loading is working properly before deploying your code. config.eager_load = ENV["CI"].present? # Configure public file server for tests with Cache-Control for performance. @@ -23,11 +24,12 @@ } # Show full error reports and disable caching. - config.consider_all_requests_local = true + config.consider_all_requests_local = true config.action_controller.perform_caching = false config.cache_store = :memory_store - # Raise exceptions instead of rendering exception templates. + # Render exception templates for rescuable exceptions and raise for other exceptions. + # config.action_dispatch.show_exceptions = :rescuable config.action_dispatch.show_exceptions = false # Disable request forgery protection in test environment. @@ -36,6 +38,8 @@ # Store uploaded files on the local file system in a temporary directory. config.active_storage.service = :test + # Disable caching for Action Mailer templates even if Action Controller + # caching is enabled. config.action_mailer.perform_caching = false # Tell Action Mailer not to deliver emails to the real world. @@ -43,6 +47,10 @@ # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test + # Unlike controllers, the mailer instance doesn't have any context about the + # incoming request so you'll need to provide the :host parameter yourself. + config.action_mailer.default_url_options = { host: "www.example.com" } + # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr @@ -57,4 +65,7 @@ # Annotate rendered view with file names. # config.action_view.annotate_rendered_view_with_filenames = true + + # Raise error when a before_action's only/except options reference missing actions. + config.action_controller.raise_on_missing_callback_actions = true end diff --git a/config/initializers/about_page.rb b/config/initializers/about_page.rb index 0c9ce12558..4685140e3f 100644 --- a/config/initializers/about_page.rb +++ b/config/initializers/about_page.rb @@ -9,7 +9,7 @@ config.fedora = AboutPage::Fedora.new(ActiveFedora.fedora.connection) config.solr = AboutPage::Solr.new(ActiveFedora.solr.conn, :numDocs => 1) config.database = Avalon::About::Database.new(User) - config.mediainfo = Avalon::About::MediaInfo.new(:version => '>=0.7.59') + config.mediainfo = Settings&.mediainfo&.path ? Avalon::About::MediaInfo.new(path: Settings.mediainfo.path) : Avalon::About::MediaInfo.new() config.streaming_server = Avalon::About::HLSServer.new(Settings.streaming.http_base) config.sidekiq = Avalon::About::Sidekiq.new(numProcesses: 1) config.redis = Avalon::About::Redis.new(Redis.new(Rails.application.config.cache_store[1])) diff --git a/config/initializers/ac_mediainfo.rb b/config/initializers/ac_mediainfo.rb index 899e06d87c..d65b28eb23 100644 --- a/config/initializers/ac_mediainfo.rb +++ b/config/initializers/ac_mediainfo.rb @@ -1,6 +1,2 @@ -require 'mediainfo' - -Mediainfo.path = Settings.mediainfo.path if Settings&.mediainfo&.path - # Set up for active_encode, need to happen before active_encode initializer -ENV["MEDIAINFO_PATH"] ||= Mediainfo.path \ No newline at end of file +ENV["MEDIAINFO_PATH"] ||= Settings.mediainfo.path if Settings&.mediainfo&.path \ No newline at end of file diff --git a/config/initializers/active_fedora_general.rb b/config/initializers/active_fedora_general.rb index fa8353b0fa..968cb63305 100644 --- a/config/initializers/active_fedora_general.rb +++ b/config/initializers/active_fedora_general.rb @@ -67,31 +67,53 @@ def access_control_reflections # Enable dirty tracking for the permissions attribute Rails.application.config.to_prepare do Hydra::AccessControl.define_attribute_methods :permissions -end # Override set_entities to notify ActiveModel::Dirty dirty tracking that the permissions attribute is changing -Hydra::AccessControls::Permissions.module_eval do - private - # @param [Symbol] permission either :discover, :read or :edit - # @param [Symbol] type either :person or :group - # @param [Array] values Values to set - # @param [Array] changeable Values we are allowed to change - def set_entities(permission, type, values, changeable) - (changeable - values).each do |entity| - for_destroy = search_by_type_and_mode(type, permission_to_uri(permission)).select { |p| p.agent_name == entity } - access_control.permissions_will_change! - permissions.delete(for_destroy) - end + Hydra::AccessControls::Permissions.module_eval do + private + # @param [Symbol] permission either :discover, :read or :edit + # @param [Symbol] type either :person or :group + # @param [Array] values Values to set + # @param [Array] changeable Values we are allowed to change + def set_entities(permission, type, values, changeable) + (changeable - values).each do |entity| + for_destroy = search_by_type_and_mode(type, permission_to_uri(permission)).select { |p| p.agent_name == entity } + access_control.permissions_will_change! + permissions.delete(for_destroy) + end - values.each do |agent_name| - exists = search_by_type_and_mode(type, permission_to_uri(permission)).select { |p| p.agent_name == agent_name } - access_control.permissions_will_change! - permissions.build(name: agent_name, access: permission.to_s, type: type) unless exists.present? + values.each do |agent_name| + exists = search_by_type_and_mode(type, permission_to_uri(permission)).select { |p| p.agent_name == agent_name } + access_control.permissions_will_change! + permissions.build(name: agent_name, access: permission.to_s, type: type) unless exists.present? + end end - end + end end # End of overrides for AccessControl dirty tracking and autosaving +class UUIDIdentifierService + def mint + SecureRandom.uuid + end +end +ActiveFedora::Base.identifier_service_class = UUIDIdentifierService + +ActiveFedora::Persistence.module_eval do + # This is only used when creating a new record. If the object doesn't have an id + # and assign_id can mint an id for the object, then assign it to the resource. + # Otherwise the resource will have the id assigned by the LDP server + def assign_rdf_subject + @ldp_source = if !id && new_id = assign_id + subject_uri = base_path_for_resource + self.class.id_to_uri(new_id).gsub(ActiveFedora.fedora.base_uri, '') if base_path_for_resource != ActiveFedora.fedora.base_uri + subject_uri ||= self.class.id_to_uri(new_id) + ActiveFedora::LdpResource.new(ActiveFedora.fedora.connection, subject_uri, @resource) + else + ActiveFedora::LdpResource.new(ActiveFedora.fedora.connection, @ldp_source.subject, @resource, base_path_for_resource) + end + end +end + # Override ActiveFedora::Associations::Builder::Orders::FixFirstLast to remove attempts to set first and last from list_source on saving ActiveFedora::Associations::Builder::Orders::FixFirstLast.module_eval do def save(*args) @@ -143,3 +165,47 @@ def predicate options[:has_member_relation] || ::RDF::Vocab::LDP.contains end end + +ActiveFedora::Associations::IndirectlyContainsAssociation.class_eval do + def insert_record(record, force = true, validate = true) + container.save! + if force + record.save! + else + return false unless record.save(validate: validate) + end + + save_through_record(record) + + # Add triples to the parent object + owner.send(:attribute_will_change!, reflection.name) + owner.resource << ::RDF::Statement(owner.resource, reflection.predicate, record.id) + owner.save + + true + end + + private + + def delete_record(record) + record_proxy_finder.find(record).delete + + # Remove triples from the parent object + owner.send(:attribute_will_change!, reflection.name) + owner.resource.delete({ predicate: reflection.predicate, object: record.id}) + owner.save + end +end + +ActiveFedora::WithMetadata::MetadataNode.class_eval do + # @param file [ActiveFedora::File] + def initialize(file) + @file = file + super(file.uri, ldp_source.graph) + # Override the guard to ensure there is a type present in the class + return unless self.class.type.present? && !type.include?(self.class.type) + attribute_will_change!(:type) if type.present? + # Workaround for https://github.com/ActiveTriples/ActiveTriples/issues/123 + get_values(:type) << self.class.type + end +end diff --git a/config/initializers/browse_everything.rb b/config/initializers/browse_everything.rb index cb838dd3d3..d20c4a112b 100644 --- a/config/initializers/browse_everything.rb +++ b/config/initializers/browse_everything.rb @@ -11,5 +11,15 @@ else settings['file_system'] = { name: 'File Dropbox', home: Settings.dropbox.path } end + if Settings.dropbox.sharepoint + settings['sharepoint'] = { client_id: Settings.dropbox.sharepoint.client_id, + client_secret: Settings.dropbox.sharepoint.client_secret, + tenant_id: Settings.dropbox.sharepoint.tenant_id, + grant_type: Settings.dropbox.sharepoint.grant_type, + scope: Settings.dropbox.sharepoint.scope, + redirect_uri: Settings.dropbox.sharepoint.redirect_uri, + filter_terms: Settings.dropbox.sharepoint.filter_terms + } + end BrowseEverything.configure(settings) end diff --git a/config/initializers/config.rb b/config/initializers/config.rb index c51f6429f0..42514b5907 100644 --- a/config/initializers/config.rb +++ b/config/initializers/config.rb @@ -28,4 +28,7 @@ # Parse numeric values as integers instead of strings. config.env_parse_values = true + + # Allow env variables for array settings + config.env_parse_arrays = true end diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 54f47cf15f..b3076b38fe 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -16,9 +16,9 @@ # # policy.report_uri "/csp-violation-report-endpoint" # end # -# # Generate session nonces for permitted importmap and inline scripts +# # Generate session nonces for permitted importmap, inline scripts, and inline styles. # config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s } -# config.content_security_policy_nonce_directives = %w(script-src) +# config.content_security_policy_nonce_directives = %w(script-src style-src) # # # Report violations without enforcing the policy. # # config.content_security_policy_report_only = true diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb index adc6568ce8..c010b83ddd 100644 --- a/config/initializers/filter_parameter_logging.rb +++ b/config/initializers/filter_parameter_logging.rb @@ -1,8 +1,8 @@ # Be sure to restart your server when you modify this file. -# Configure parameters to be filtered from the log file. Use this to limit dissemination of -# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported -# notations and behaviors. +# Configure parameters to be partially matched (e.g. passw matches password) and filtered from the log file. +# Use this to limit dissemination of sensitive information. +# See the ActiveSupport::ParameterFilter documentation for supported notations and behaviors. Rails.application.config.filter_parameters += [ - :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn + :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn ] diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb new file mode 100644 index 0000000000..3dc295db6d --- /dev/null +++ b/config/initializers/new_framework_defaults_7_1.rb @@ -0,0 +1,280 @@ +# Be sure to restart your server when you modify this file. +# +# This file eases your Rails 7.1 framework defaults upgrade. +# +# Uncomment each configuration one by one to switch to the new default. +# Once your application is ready to run with all new defaults, you can remove +# this file and set the `config.load_defaults` to `7.1`. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. +# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html + +### +# No longer add autoloaded paths into `$LOAD_PATH`. This means that you won't be able +# to manually require files that are managed by the autoloader, which you shouldn't do anyway. +# +# This will reduce the size of the load path, making `require` faster if you don't use bootsnap, or reduce the size +# of the bootsnap cache if you use it. +# +# To set this configuration, add the following line to `config/application.rb` (NOT this file): +# config.add_autoload_paths_to_load_path = false + +### +# Remove the default X-Download-Options headers since it is used only by Internet Explorer. +# If you need to support Internet Explorer, add back `"X-Download-Options" => "noopen"`. +#++ +# Rails.application.config.action_dispatch.default_headers = { +# "X-Frame-Options" => "SAMEORIGIN", +# "X-XSS-Protection" => "0", +# "X-Content-Type-Options" => "nosniff", +# "X-Permitted-Cross-Domain-Policies" => "none", +# "Referrer-Policy" => "strict-origin-when-cross-origin" +# } + +### +# Do not treat an `ActionController::Parameters` instance +# as equal to an equivalent `Hash` by default. +#++ +# Rails.application.config.action_controller.allow_deprecated_parameters_hash_equality = false + +### +# Active Record Encryption now uses SHA-256 as its hash digest algorithm. +# +# There are 3 scenarios to consider. +# +# 1. If you have data encrypted with previous Rails versions, and you have +# +config.active_support.key_generator_hash_digest_class+ configured as SHA1 (the default +# before Rails 7.0), you need to configure SHA-1 for Active Record Encryption too: +#++ +# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA1 +# +# 2. If you have +config.active_support.key_generator_hash_digest_class+ configured as SHA256 (the new default +# in 7.0), then you need to configure SHA-256 for Active Record Encryption: +#++ +# Rails.application.config.active_record.encryption.hash_digest_class = OpenSSL::Digest::SHA256 +# +# 3. If you don't currently have data encrypted with Active Record encryption, you can disable this setting to +# configure the default behavior starting 7.1+: +#++ +# Rails.application.config.active_record.encryption.support_sha1_for_non_deterministic_encryption = false + +### +# No longer run after_commit callbacks on the first of multiple Active Record +# instances to save changes to the same database row within a transaction. +# Instead, run these callbacks on the instance most likely to have internal +# state which matches what was committed to the database, typically the last +# instance to save. +#++ +# Rails.application.config.active_record.run_commit_callbacks_on_first_saved_instances_in_transaction = false + +### +# Configures SQLite with a strict strings mode, which disables double-quoted string literals. +# +# SQLite has some quirks around double-quoted string literals. +# It first tries to consider double-quoted strings as identifier names, but if they don't exist +# it then considers them as string literals. Because of this, typos can silently go unnoticed. +# For example, it is possible to create an index for a non existing column. +# See https://www.sqlite.org/quirks.html#double_quoted_string_literals_are_accepted for more details. +#++ +# Rails.application.config.active_record.sqlite3_adapter_strict_strings_by_default = true + +### +# Disable deprecated singular associations names. +#++ +# Rails.application.config.active_record.allow_deprecated_singular_associations_name = false + +### +# Enable the Active Job `BigDecimal` argument serializer, which guarantees +# roundtripping. Without this serializer, some queue adapters may serialize +# `BigDecimal` arguments as simple (non-roundtrippable) strings. +# +# When deploying an application with multiple replicas, old (pre-Rails 7.1) +# replicas will not be able to deserialize `BigDecimal` arguments from this +# serializer. Therefore, this setting should only be enabled after all replicas +# have been successfully upgraded to Rails 7.1. +#++ +# Rails.application.config.active_job.use_big_decimal_serializer = true + +### +# Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or +# `write` are given an invalid `expires_at` or `expires_in` time. +# Options are `true`, and `false`. If `false`, the exception will be reported +# as `handled` and logged instead. +#++ +# Rails.application.config.active_support.raise_on_invalid_cache_expiration_time = true + +### +# Specify whether Query Logs will format tags using the SQLCommenter format +# (https://open-telemetry.github.io/opentelemetry-sqlcommenter/), or using the legacy format. +# Options are `:legacy` and `:sqlcommenter`. +#++ +# Rails.application.config.active_record.query_log_tags_format = :sqlcommenter + +### +# Specify the default serializer used by `MessageEncryptor` and `MessageVerifier` +# instances. +# +# The legacy default is `:marshal`, which is a potential vector for +# deserialization attacks in cases where a message signing secret has been +# leaked. +# +# In Rails 7.1, the new default is `:json_allow_marshal` which serializes and +# deserializes with `ActiveSupport::JSON`, but can fall back to deserializing +# with `Marshal` so that legacy messages can still be read. +# +# In Rails 7.2, the default will become `:json` which serializes and +# deserializes with `ActiveSupport::JSON` only. +# +# Alternatively, you can choose `:message_pack` or `:message_pack_allow_marshal`, +# which serialize with `ActiveSupport::MessagePack`. `ActiveSupport::MessagePack` +# can roundtrip some Ruby types that are not supported by JSON, and may provide +# improved performance, but it requires the `msgpack` gem. +# +# For more information, see +# https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer +# +# If you are performing a rolling deploy of a Rails 7.1 upgrade, wherein servers +# that have not yet been upgraded must be able to read messages from upgraded +# servers, first deploy without changing the serializer, then set the serializer +# in a subsequent deploy. +#++ +# Rails.application.config.active_support.message_serializer = :json_allow_marshal + +### +# Enable a performance optimization that serializes message data and metadata +# together. This changes the message format, so messages serialized this way +# cannot be read by older versions of Rails. However, messages that use the old +# format can still be read, regardless of whether this optimization is enabled. +# +# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have +# not yet been upgraded must be able to read messages from upgraded servers, +# leave this optimization off on the first deploy, then enable it on a +# subsequent deploy. +#++ +# Rails.application.config.active_support.use_message_serializer_for_metadata = true + +### +# Set the maximum size for Rails log files. +# +# `config.load_defaults 7.1` does not set this value for environments other than +# development and test. +#++ +# if Rails.env.local? +# Rails.application.config.log_file_size = 100 * 1024 * 1024 +# end + +### +# Enable raising on assignment to attr_readonly attributes. The previous +# behavior would allow assignment but silently not persist changes to the +# database. +#++ +# Rails.application.config.active_record.raise_on_assign_to_attr_readonly = true + +### +# Enable validating only parent-related columns for presence when the parent is mandatory. +# The previous behavior was to validate the presence of the parent record, which performed an extra query +# to get the parent every time the child record was updated, even when parent has not changed. +#++ +# Rails.application.config.active_record.belongs_to_required_validates_foreign_key = false + +### +# Enable precompilation of `config.filter_parameters`. Precompilation can +# improve filtering performance, depending on the quantity and types of filters. +#++ +# Rails.application.config.precompile_filter_parameters = true + +### +# Enable before_committed! callbacks on all enrolled records in a transaction. +# The previous behavior was to only run the callbacks on the first copy of a record +# if there were multiple copies of the same record enrolled in the transaction. +#++ +# Rails.application.config.active_record.before_committed_on_all_records = true + +### +# Disable automatic column serialization into YAML. +# To keep the historic behavior, you can set it to `YAML`, however it is +# recommended to explicitly define the serialization method for each column +# rather than to rely on a global default. +#++ +# Rails.application.config.active_record.default_column_serializer = nil + +### +# Enable a performance optimization that serializes Active Record models +# in a faster and more compact way. +# +# To perform a rolling deploy of a Rails 7.1 upgrade, wherein servers that have +# not yet been upgraded must be able to read caches from upgraded servers, +# leave this optimization off on the first deploy, then enable it on a +# subsequent deploy. +#++ +# Rails.application.config.active_record.marshalling_format_version = 7.1 + +### +# Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model. +# This matches the behaviour of all other callbacks. +# In previous versions of Rails, they ran in the inverse order. +#++ +# Rails.application.config.active_record.run_after_transaction_callbacks_in_order_defined = true + +### +# Whether a `transaction` block is committed or rolled back when exited via `return`, `break` or `throw`. +#++ +# Rails.application.config.active_record.commit_transaction_on_non_local_return = true + +### +# Controls when to generate a value for has_secure_token declarations. +#++ +# Rails.application.config.active_record.generate_secure_token_on = :initialize + +### +# ** Please read carefully, this must be configured in config/application.rb ** +# +# Change the format of the cache entry. +# +# Changing this default means that all new cache entries added to the cache +# will have a different format that is not supported by Rails 7.0 +# applications. +# +# Only change this value after your application is fully deployed to Rails 7.1 +# and you have no plans to rollback. +# When you're ready to change format, add this to `config/application.rb` (NOT +# this file): +# config.active_support.cache_format_version = 7.1 + +### +# Configure Action View to use HTML5 standards-compliant sanitizers when they are supported on your +# platform. +# +# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action View to use HTML5-compliant +# sanitizers if they are supported, else fall back to HTML4 sanitizers. +# +# In previous versions of Rails, Action View always used `Rails::HTML4::Sanitizer` as its vendor. +#++ +# Rails.application.config.action_view.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor + +### +# Configure Action Text to use an HTML5 standards-compliant sanitizer when it is supported on your +# platform. +# +# `Rails::HTML::Sanitizer.best_supported_vendor` will cause Action Text to use HTML5-compliant +# sanitizers if they are supported, else fall back to HTML4 sanitizers. +# +# In previous versions of Rails, Action Text always used `Rails::HTML4::Sanitizer` as its vendor. +#++ +# Rails.application.config.action_text.sanitizer_vendor = Rails::HTML::Sanitizer.best_supported_vendor + +### +# Configure the log level used by the DebugExceptions middleware when logging +# uncaught exceptions during requests. +#++ +# Rails.application.config.action_dispatch.debug_exception_log_level = :error + +### +# Configure the test helpers in Action View, Action Dispatch, and rails-dom-testing to use HTML5 +# parsers. +# +# Nokogiri::HTML5 isn't supported on JRuby, so JRuby applications must set this to :html4. +# +# In previous versions of Rails, these test helpers always used an HTML4 parser. +#++ +# Rails.application.config.dom_testing_default_html_version = :html5 diff --git a/config/initializers/new_framework_defaults_7_2.rb b/config/initializers/new_framework_defaults_7_2.rb new file mode 100644 index 0000000000..b549c4a258 --- /dev/null +++ b/config/initializers/new_framework_defaults_7_2.rb @@ -0,0 +1,70 @@ +# Be sure to restart your server when you modify this file. +# +# This file eases your Rails 7.2 framework defaults upgrade. +# +# Uncomment each configuration one by one to switch to the new default. +# Once your application is ready to run with all new defaults, you can remove +# this file and set the `config.load_defaults` to `7.2`. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. +# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html + +### +# Controls whether Active Job's `#perform_later` and similar methods automatically defer +# the job queuing to after the current Active Record transaction is committed. +# +# Example: +# Topic.transaction do +# topic = Topic.create(...) +# NewTopicNotificationJob.perform_later(topic) +# end +# +# In this example, if the configuration is set to `:never`, the job will +# be enqueued immediately, even though the `Topic` hasn't been committed yet. +# Because of this, if the job is picked up almost immediately, or if the +# transaction doesn't succeed for some reason, the job will fail to find this +# topic in the database. +# +# If `enqueue_after_transaction_commit` is set to `:default`, the queue adapter +# will define the behaviour. +# +# Note: Active Job backends can disable this feature. This is generally done by +# backends that use the same database as Active Record as a queue, hence they +# don't need this feature. +#++ +# Rails.application.config.active_job.enqueue_after_transaction_commit = :default + +### +# Adds image/webp to the list of content types Active Storage considers as an image +# Prevents automatic conversion to a fallback PNG, and assumes clients support WebP, as they support gif, jpeg, and png. +# This is possible due to broad browser support for WebP, but older browsers and email clients may still not support +# WebP. Requires imagemagick/libvips built with WebP support. +#++ +# Rails.application.config.active_storage.web_image_content_types = %w[image/png image/jpeg image/gif image/webp] + +### +# Enable validation of migration timestamps. When set, an ActiveRecord::InvalidMigrationTimestampError +# will be raised if the timestamp prefix for a migration is more than a day ahead of the timestamp +# associated with the current time. This is done to prevent forward-dating of migration files, which can +# impact migration generation and other migration commands. +# +# Applications with existing timestamped migrations that do not adhere to the +# expected format can disable validation by setting this config to `false`. +#++ +# Rails.application.config.active_record.validate_migration_timestamps = true + +### +# Controls whether the PostgresqlAdapter should decode dates automatically with manual queries. +# +# Example: +# ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.select_value("select '2024-01-01'::date") #=> Date +# +# This query used to return a `String`. +#++ +# Rails.application.config.active_record.postgresql_adapter_decode_dates = true + +### +# Enables YJIT as of Ruby 3.3, to bring sizeable performance improvements. If you are +# deploying to a memory constrained environment you may want to set this to `false`. +#++ +# Rails.application.config.yjit = true diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb index 00f64d71b0..7db3b9577e 100644 --- a/config/initializers/permissions_policy.rb +++ b/config/initializers/permissions_policy.rb @@ -1,11 +1,13 @@ +# Be sure to restart your server when you modify this file. + # Define an application-wide HTTP permissions policy. For further -# information see https://developers.google.com/web/updates/2018/06/feature-policy -# -# Rails.application.config.permissions_policy do |f| -# f.camera :none -# f.gyroscope :none -# f.microphone :none -# f.usb :none -# f.fullscreen :self -# f.payment :self, "https://secure.example.com" +# information see: https://developers.google.com/web/updates/2018/06/feature-policy + +# Rails.application.config.permissions_policy do |policy| +# policy.camera :none +# policy.gyroscope :none +# policy.microphone :none +# policy.usb :none +# policy.fullscreen :self +# policy.payment :self, "https://secure.example.com" # end diff --git a/config/initializers/presenter_config.rb b/config/initializers/presenter_config.rb index 9aa9e49763..389756ecc2 100644 --- a/config/initializers/presenter_config.rb +++ b/config/initializers/presenter_config.rb @@ -103,6 +103,10 @@ def xpath(*args) ng_xml.xpath(*args) end end + + sp.config IndexedFile do + self.defaults = { original_name: nil } + end end SpeedyAF::Base.class_eval do @@ -115,4 +119,7 @@ def real_object @real_object end end + + # Reduce from 10_000_000 to reduce solr QTimes from triple digits to single digits + SpeedyAF::Base::SOLR_ALL = 100_000 end diff --git a/config/initializers/rsolr.rb b/config/initializers/rsolr.rb new file mode 100644 index 0000000000..05513c5917 --- /dev/null +++ b/config/initializers/rsolr.rb @@ -0,0 +1,24 @@ +RSolr::Client.class_eval do + def build_request path, opts + raise "path must be a string or symbol, not #{path.inspect}" unless [String,Symbol].include?(path.class) + path = path.to_s + opts[:proxy] = proxy unless proxy.nil? + # Avalon can produce requests that are too large for :get. + # Override method to use configurable http method to avoid + # having to override every instance that calls RSolr directly. + opts[:method] ||= ActiveFedora::SolrService.default_http_method + raise "The :data option can only be used if :method => :post" if opts[:method] != :post and opts[:data] + opts[:params] = params_with_wt(opts[:params]) + query = RSolr::Uri.params_to_solr(opts[:params]) unless opts[:params].empty? + opts[:query] = query + if opts[:data].is_a? Hash + opts[:data] = RSolr::Uri.params_to_solr opts[:data] + opts[:headers] ||= {} + opts[:headers]['Content-Type'] ||= 'application/x-www-form-urlencoded; charset=UTF-8' + end + opts[:path] = path + opts[:uri] = base_uri.merge(path.to_s + (query ? "?#{query}" : "")) if base_uri + + opts + end +end \ No newline at end of file diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb deleted file mode 100644 index bbfc3961bf..0000000000 --- a/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] -end - -# To enable root element in JSON for ActiveRecord objects. -# ActiveSupport.on_load(:active_record) do -# self.include_root_in_json = true -# end diff --git a/config/locales/en.yml b/config/locales/en.yml index a6c6b535c8..5564466311 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -73,10 +73,9 @@ en: href="http://www.loc.gov/standards/datetime/" target="_blank">Extended Date/Time Format (EDTF) Level 1. date_issued: | - Required field. Date should be the main publication date - associated with the item to be used for sorting browse and search results. - Enter date information in a format consistent with the options shown in Extended Date/Time Format (EDTF) Level 1. genre: | Genre can be used to categorize an item by form, style, or subject matter. For diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..60e1b9c67a --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,33 @@ +# This configuration file will be evaluated by Puma. The top-level methods that +# are invoked here are part of Puma's configuration DSL. For more information +# about methods provided by the DSL, see https://puma.io/puma/Puma/DSL.html. + +# Puma starts a configurable number of processes (workers) and each process +# serves each request in a thread from an internal thread pool. +# +# The ideal number of threads per worker depends both on how much time the +# application spends waiting for IO operations and on how much you wish to +# to prioritize throughput over latency. +# +# As a rule of thumb, increasing the number of threads will increase how much +# traffic a given process can handle (throughput), but due to CRuby's +# Global VM Lock (GVL) it has diminishing returns and will degrade the +# response time (latency) of the application. +# +# The default is set to 3 threads as it's deemed a decent compromise between +# throughput and latency for the average Rails application. +# +# Any libraries that use a connection pool or another resource pool should +# be configured to provide at least as many connections as the number of +# threads. This includes Active Record's `pool` parameter in `database.yml`. +threads_count = ENV.fetch("RAILS_MAX_THREADS", 3) +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +port ENV.fetch("PORT", 3000) + +# Allow puma to be restarted by `bin/rails restart` command. +plugin :tmp_restart + +# Only use a pidfile when requested +pidfile ENV["PIDFILE"] if ENV["PIDFILE"] diff --git a/config/settings.yml b/config/settings.yml index 5b5b039022..ef52e1131b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -17,6 +17,8 @@ mediainfo: path: '/usr/bin/mediainfo --urlencode' # Fixes mediainfo v20.03 bug with S3 presigned URL ffmpeg: path: '/usr/local/bin/ffmpeg' +ffprobe: + path: '/usr/bin/ffprobe' email: mailer: :smtp config: diff --git a/db/migrate/20240822194731_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20240822194731_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb new file mode 100644 index 0000000000..93c8b85ade --- /dev/null +++ b/db/migrate/20240822194731_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb @@ -0,0 +1,8 @@ +# This migration comes from active_storage (originally 20211119233751) +class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0] + def change + return unless table_exists?(:active_storage_blobs) + + change_column_null(:active_storage_blobs, :checksum, true) + end +end diff --git a/db/schema.rb b/db/schema.rb index fba55dcffe..ec4f8dd4f2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2024_06_24_204921) do +ActiveRecord::Schema[7.2].define(version: 2024_08_22_194731) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" diff --git a/docker-compose.yml b/docker-compose.yml index ee77c7a422..1ce064ce4f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.4' - volumes: database: fedora: @@ -28,19 +26,22 @@ services: volumes: [] fedora: &fedora - image: avalonmediasystem/fedora:4.7.5 + image: fcrepo/fcrepo:6.4.0 depends_on: - db volumes: - - fedora:/data + - fedora:/usr/local/tomcat/fcrepo-home environment: - - JAVA_OPTIONS=-Dfcrepo.modeshape.configuration=classpath:/config/file-simple/repository.json -Dfcrepo.home=/data + - CATALINA_OPTS=-Dfcrepo.autoversioning.enabled=false networks: + external: internal: + ports: + - '8080:8080' ulimits: nofile: - soft: 65536 - hard: 65536 + soft: "65536" + hard: "65536" fedora-test: <<: *fedora volumes: [] @@ -56,6 +57,10 @@ services: - /opt/solr/avalon_conf networks: internal: + ulimits: + nofile: + soft: "65536" + hard: "65536" solr-test: <<: *solr volumes: @@ -102,7 +107,8 @@ services: - DATABASE_URL=postgres://postgres:password@db/avalon - DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true - FEDORA_NAMESPACE=avalon - - FEDORA_URL=http://fedoraAdmin:fedoraAdmin@fedora:8080/fedora/rest + - FEDORA_URL=http://fedoraAdmin:fedoraAdmin@fedora:8080/fcrepo/rest + - FEDORA_BASE_PATH=/test - RAILS_ENV=development - RAILS_ADDITIONAL_HOSTS=avalon - SETTINGS__REDIS__HOST=redis @@ -154,7 +160,8 @@ services: - SETTINGS__FFMPEG__PATH=/usr/bin/ffmpeg - SETTINGS__REDIS__HOST=redis-test - SETTINGS__REDIS__PORT=6379 - - FEDORA_URL=http://fedora-test:8080/fedora/rest + - FEDORA_URL=http://fedoraAdmin:fedoraAdmin@fedora-test:8080/fcrepo/rest + - FEDORA_BASE_PATH=/test - SOLR_URL=http://solr-test:8983/solr/avalon - RAILS_ENV=test - BUNDLE_FLAGS=--with aws test postgres --without production diff --git a/docker_init.sh b/docker_init.sh index 8181cbeb70..5e11471598 100755 --- a/docker_init.sh +++ b/docker_init.sh @@ -8,3 +8,5 @@ cp config/controlled_vocabulary.yml.example config/controlled_vocabulary.yml rm -f tmp/pids/server.pid bundle exec rake db:migrate +#Ignore any errors with db:migrate and go ahead with startup +exit 0 diff --git a/lib/avalon/ffprobe.rb b/lib/avalon/ffprobe.rb new file mode 100644 index 0000000000..0322b8ec60 --- /dev/null +++ b/lib/avalon/ffprobe.rb @@ -0,0 +1,84 @@ +# Copyright 2011-2024, The Trustees of Indiana University and Northwestern +# University. Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed +# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +# CONDITIONS OF ANY KIND, either express or implied. See the License for the +# specific language governing permissions and limitations under the License. +# --- END LICENSE_HEADER BLOCK --- + +module Avalon + class FFprobe + # @param [FileLocator] media_file a file locator instance for the media file + def initialize(media_file) + @media_file = media_file + end + + def json_output + return @json_output unless @json_output.nil? + return @json_output = {} unless valid_content_type?(@media_file) + ffprobe = Settings&.ffprobe&.path || 'ffprobe' + raw_output = `#{ffprobe} -i "#{@media_file.location}" -v quiet -show_format -show_streams -of json` + # $? is a variable for the exit status of the last executed process. + # Success == 0, any other value means the command failed in some way. + unless $?.exitstatus == 0 + Rails.logger.error "File processing failed. Please ensure that FFprobe is installed and that the correct path is configured." + return @json_output = {} + end + @json_output = JSON.parse(raw_output).deep_symbolize_keys + @json_output + end + + def video_stream + return unless json_output.present? + @video_stream ||= json_output[:streams].select { |stream| stream[:codec_type] == 'video' }.first + end + + def audio_stream + return unless json_output.present? + @audio_stream ||= json_output[:streams].select { |stream| stream[:codec_type] == 'audio' }.first + end + + def video? + video_stream.present? + end + + def audio? + audio_stream.present? + end + + def duration + return unless video? || audio? + # ffprobe return duration as seconds. Existing Avalon logic expects milliseconds. + (json_output[:format][:duration].to_f * 1000).to_i + end + + def display_aspect_ratio + if video? && video_stream[:display_aspect_ratio].present? + video_stream[:display_aspect_ratio] + elsif video? + (video_stream[:width].to_f / video_stream[:height].to_f).to_s + end + end + + def original_frame_size + "#{video_stream[:width]}x#{video_stream[:height]}" if video? + end + + private + + def valid_content_type? media_file + # Remove S3 credentials or other params from extension output + extension = File.extname(media_file.location)&.gsub(/[\?#].*/, '') + # Fall back on file extension if magic bytes fail to identify file + content_type = Marcel::MimeType.for media_file.reader, extension: extension + + ['audio', 'video'].any? { |type| content_type.include?(type) } + end + end +end \ No newline at end of file diff --git a/lib/tasks/avalon_tools.rake b/lib/tasks/avalon_tools.rake index 8e19cd12c2..d3f99dcbd7 100644 --- a/lib/tasks/avalon_tools.rake +++ b/lib/tasks/avalon_tools.rake @@ -14,8 +14,8 @@ namespace :avalon do namespace :tools do - ffmpeg_path = Settings.ffmpeg.path || "/usr/bin/ffmpeg" - mediainfo_path = Settings.mediainfo.path || "/usr/bin/mediainfo" + ffmpeg_path = Settings&.ffmpeg&.path || "/usr/bin/ffmpeg" + mediainfo_path = Settings&.mediainfo&.path || "/usr/bin/mediainfo" DEFAULT_TOOLS = [ { name: "ffmpeg", path: ffmpeg_path, version_params: "-version", version_string: ">= 4", version_trim_pre: "ffmpeg version ", version_trim_last_char: "-" }, { name: "mediainfo", path: mediainfo_path, version_string: "> 18", version_line: 1, version_trim_pre: "MediaInfoLib - v" }, diff --git a/package.json b/package.json index 4f5aa1441a..0b814ebd4f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "@babel/plugin-proposal-object-rest-spread": "^7.20.7", "@babel/preset-react": "^7.0.0", "@babel/runtime": "7", - "@samvera/ramp": "^3.2.0", + "@samvera/ramp": "https://github.com/samvera-labs/ramp.git#25d3c47533c5a452dca4b129294f97c8ced24873", "babel-plugin-macros": "^3.1.0", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", "buffer": "^6.0.3", @@ -44,8 +44,8 @@ "cypress": "^13.7.1", "html-webpack-plugin": "^5.3.2", "prop-types": "^15.7.2", - "webpack-cli": "4", - "webpack-dev-server": "4" + "webpack-cli": "5", + "webpack-dev-server": "5" }, "resolutions": { "glob-parent": "^6.0.2", @@ -59,5 +59,6 @@ "start-collection-view": "webpack-dev-server --mode development --config config/webpack/collection_view.js --host 0.0.0.0", "cypress:open": "cypress open -C spec/cypress/cypress.config.js", "cypress:run": "cypress run -C spec/cypress/cypress.config.js" - } + }, + "packageManager": "yarn@1.22.19" } diff --git a/public/404.html b/public/404.html index b612547fc2..2be3af26fc 100644 --- a/public/404.html +++ b/public/404.html @@ -4,7 +4,7 @@ The page you were looking for doesn't exist (404) - +
diff --git a/public/406-unsupported-browser.html b/public/406-unsupported-browser.html new file mode 100644 index 0000000000..7cf1e168e6 --- /dev/null +++ b/public/406-unsupported-browser.html @@ -0,0 +1,66 @@ + + + + Your browser is not supported (406) + + + + + + +
+
+

Your browser is not supported.

+

Please upgrade your browser to continue.

+
+
+ + diff --git a/public/422.html b/public/422.html index a21f82b3bd..c08eac0d1d 100644 --- a/public/422.html +++ b/public/422.html @@ -4,7 +4,7 @@ The change you wanted was rejected (422) - +
diff --git a/public/500.html b/public/500.html index 061abc587d..78a030af22 100644 --- a/public/500.html +++ b/public/500.html @@ -4,7 +4,7 @@ We're sorry, but something went wrong (500) - +
diff --git a/public/icon.png b/public/icon.png new file mode 100644 index 0000000000..f3b5abcbde Binary files /dev/null and b/public/icon.png differ diff --git a/public/icon.svg b/public/icon.svg new file mode 100644 index 0000000000..78307ccd4b --- /dev/null +++ b/public/icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/robots.txt b/public/robots.txt index 3c9c7c01f3..c19f78ab68 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,5 +1 @@ -# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file -# -# To ban all spiders from the entire site uncomment the next two lines: -# User-agent: * -# Disallow: / +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/solr/config/_rest_managed.json b/solr/config/_rest_managed.json deleted file mode 100644 index e7ada3f6e4..0000000000 --- a/solr/config/_rest_managed.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "initArgs":{}, - "managedList":[]} \ No newline at end of file diff --git a/solr/config/admin-extra.html b/solr/config/admin-extra.html deleted file mode 100644 index 21b50901cb..0000000000 --- a/solr/config/admin-extra.html +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/solr/config/elevate.xml b/solr/config/elevate.xml deleted file mode 100644 index b91e75cec9..0000000000 --- a/solr/config/elevate.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/solr/config/mapping-ISOLatin1Accent.txt b/solr/config/mapping-ISOLatin1Accent.txt deleted file mode 100644 index 186ca313dc..0000000000 --- a/solr/config/mapping-ISOLatin1Accent.txt +++ /dev/null @@ -1,246 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Syntax: -# "source" => "target" -# "source".length() > 0 (source cannot be empty.) -# "target".length() >= 0 (target can be empty.) - -# example: -# "??" => "A" -# "\u00C0" => "A" -# "\u00C0" => "\u0041" -# "??" => "ss" -# "\t" => " " -# "\n" => "" - -# ?? => A -"\u00C0" => "A" - -# ?? => A -"\u00C1" => "A" - -# ?? => A -"\u00C2" => "A" - -# ?? => A -"\u00C3" => "A" - -# ?? => A -"\u00C4" => "A" - -# ?? => A -"\u00C5" => "A" - -# ?? => AE -"\u00C6" => "AE" - -# ?? => C -"\u00C7" => "C" - -# ?? => E -"\u00C8" => "E" - -# ?? => E -"\u00C9" => "E" - -# ?? => E -"\u00CA" => "E" - -# ?? => E -"\u00CB" => "E" - -# ?? => I -"\u00CC" => "I" - -# ?? => I -"\u00CD" => "I" - -# ?? => I -"\u00CE" => "I" - -# ?? => I -"\u00CF" => "I" - -# ?? => IJ -"\u0132" => "IJ" - -# ?? => D -"\u00D0" => "D" - -# ?? => N -"\u00D1" => "N" - -# ?? => O -"\u00D2" => "O" - -# ?? => O -"\u00D3" => "O" - -# ?? => O -"\u00D4" => "O" - -# ?? => O -"\u00D5" => "O" - -# ?? => O -"\u00D6" => "O" - -# ?? => O -"\u00D8" => "O" - -# ?? => OE -"\u0152" => "OE" - -# ?? -"\u00DE" => "TH" - -# ?? => U -"\u00D9" => "U" - -# ?? => U -"\u00DA" => "U" - -# ?? => U -"\u00DB" => "U" - -# ?? => U -"\u00DC" => "U" - -# ?? => Y -"\u00DD" => "Y" - -# ?? => Y -"\u0178" => "Y" - -# ?? => a -"\u00E0" => "a" - -# ?? => a -"\u00E1" => "a" - -# ?? => a -"\u00E2" => "a" - -# ?? => a -"\u00E3" => "a" - -# ?? => a -"\u00E4" => "a" - -# ?? => a -"\u00E5" => "a" - -# ?? => ae -"\u00E6" => "ae" - -# ?? => c -"\u00E7" => "c" - -# ?? => e -"\u00E8" => "e" - -# ?? => e -"\u00E9" => "e" - -# ?? => e -"\u00EA" => "e" - -# ?? => e -"\u00EB" => "e" - -# ?? => i -"\u00EC" => "i" - -# ?? => i -"\u00ED" => "i" - -# ?? => i -"\u00EE" => "i" - -# ?? => i -"\u00EF" => "i" - -# ?? => ij -"\u0133" => "ij" - -# ?? => d -"\u00F0" => "d" - -# ?? => n -"\u00F1" => "n" - -# ?? => o -"\u00F2" => "o" - -# ?? => o -"\u00F3" => "o" - -# ?? => o -"\u00F4" => "o" - -# ?? => o -"\u00F5" => "o" - -# ?? => o -"\u00F6" => "o" - -# ?? => o -"\u00F8" => "o" - -# ?? => oe -"\u0153" => "oe" - -# ?? => ss -"\u00DF" => "ss" - -# ?? => th -"\u00FE" => "th" - -# ?? => u -"\u00F9" => "u" - -# ?? => u -"\u00FA" => "u" - -# ?? => u -"\u00FB" => "u" - -# ?? => u -"\u00FC" => "u" - -# ?? => y -"\u00FD" => "y" - -# ?? => y -"\u00FF" => "y" - -# ??? => ff -"\uFB00" => "ff" - -# ??? => fi -"\uFB01" => "fi" - -# ??? => fl -"\uFB02" => "fl" - -# ??? => ffi -"\uFB03" => "ffi" - -# ??? => ffl -"\uFB04" => "ffl" - -# ??? => ft -"\uFB05" => "ft" - -# ??? => st -"\uFB06" => "st" diff --git a/solr/config/protwords.txt b/solr/config/protwords.txt deleted file mode 100644 index 5a32e50321..0000000000 --- a/solr/config/protwords.txt +++ /dev/null @@ -1,21 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# Use a protected word file to protect against the stemmer reducing two -# unrelated words to the same base word. - -# Some non-words that normally won't be encountered, -# just to test that they won't be stemmed. -dontstems -zwhacky - diff --git a/solr/config/schema.xml b/solr/config/schema.xml deleted file mode 100644 index dbd9cbc8d8..0000000000 --- a/solr/config/schema.xml +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id - - - - - - - - - - - - - - - - - - - - diff --git a/solr/config/scripts.conf b/solr/config/scripts.conf deleted file mode 100644 index f58b262ae0..0000000000 --- a/solr/config/scripts.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -user= -solr_hostname=localhost -solr_port=8983 -rsyncd_port=18983 -data_dir= -webapp_name=solr -master_host= -master_data_dir= -master_status_dir= diff --git a/solr/config/solrconfig.xml b/solr/config/solrconfig.xml deleted file mode 100644 index 904379ce51..0000000000 --- a/solr/config/solrconfig.xml +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - - 5.0.0 - - - - - - - - - - - - - - - ${solr.blacklight-core.data.dir:} - - - - - - - - - - *:* - - - - - ${solr.ulog.dir:} - - - - ${solr.autoCommit.maxTime:15000} - false - - - - ${solr.autoSoftCommit.maxTime:-1} - - - - - - - - edismax - explicit - *:* - OR - 2<-1 5<-2 6<90% - 1 - 2 - 0.01 - - - id - title_tesi^10.0 - section_label_tesim^5.0 - creator_ssim^3.0 - date_sim^3.0 - all_text_timv^1.0 - active_fedora_model_ssi - object_type_si - - - title_tesi^10.0 - section_label_tesim^5.0 - creator_ssim^3.0 - date_sim^3.0 - all_text_timv^1.0 - - - - author_tesim - - - - - title_tesim - - - - - subject_tesim - - - - - - *, - score - - - true - 1 - - true - default - true - true - false - 5 - - - - spellcheck - - - - - - off - all - 1 - {!raw f=id v=$id} - - id, - access_ssim, - discover_access_group_ssim,discover_access_person_ssim, - read_access_group_ssim,read_access_person_ssim, - edit_access_group_ssim,edit_access_person_ssim, - depositor_ti, - embargo_release_date_dtsi - inheritable_access_ssim, - inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim, - inheritable_read_access_group_ssim,inheritable_read_access_person_ssim, - inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim, - inheritable_embargo_release_date_dtsi - - - - - - - explicit - lucene - - - - - - - all - * - 1 - {!term f=id v=$id} - - - - - - - textSpell - - - - - - default - spell - ./spell - true - - - author - author_spell - ./spell_author - 0.7 - true - - - subject - subject_spell - ./spell_subject - 0.7 - true - - - title - title_spell - ./spell_title - 0.7 - true - - - - - - - - - - - - - - - - - last_modified - ignored_ - - - - - - - - - diff --git a/solr/config/spellings.txt b/solr/config/spellings.txt deleted file mode 100644 index 765190ae55..0000000000 --- a/solr/config/spellings.txt +++ /dev/null @@ -1,2 +0,0 @@ -pizza -history diff --git a/solr/config/stopwords.txt b/solr/config/stopwords.txt deleted file mode 100644 index 22f277fe0b..0000000000 --- a/solr/config/stopwords.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# a couple of test stopwords to test that the words are really being -# configured from this file: -stopworda -stopwordb - -#Standard english stop words taken from Lucene's StopAnalyzer -a -an -and -are -as -at -be -but -by -for -if -in -into -is -it -no -not -of -on -or -s -such -t -that -the -their -then -there -these -they -this -to -was -will -with - diff --git a/solr/config/stopwords_en.txt b/solr/config/stopwords_en.txt deleted file mode 100644 index 22f277fe0b..0000000000 --- a/solr/config/stopwords_en.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -# a couple of test stopwords to test that the words are really being -# configured from this file: -stopworda -stopwordb - -#Standard english stop words taken from Lucene's StopAnalyzer -a -an -and -are -as -at -be -but -by -for -if -in -into -is -it -no -not -of -on -or -s -such -t -that -the -their -then -there -these -they -this -to -was -will -with - diff --git a/solr/config/synonyms.txt b/solr/config/synonyms.txt deleted file mode 100644 index 453eb3139e..0000000000 --- a/solr/config/synonyms.txt +++ /dev/null @@ -1,31 +0,0 @@ -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#----------------------------------------------------------------------- -#some test synonym mappings unlikely to appear in real input text -aaa => aaaa -bbb => bbbb1 bbbb2 -ccc => cccc1,cccc2 -a\=>a => b\=>b -a\,a => b\,b -fooaaa,baraaa,bazaaa - -# Some synonym groups specific to this example -GB,gib,gigabyte,gigabytes -MB,mib,megabyte,megabytes -Television, Televisions, TV, TVs -#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming -#after us won't split it into two words. - -# Synonym mappings can be used for spelling correction too -pixima => pixma - diff --git a/solr/config/xslt/example.xsl b/solr/config/xslt/example.xsl deleted file mode 100644 index ff7cae746e..0000000000 --- a/solr/config/xslt/example.xsl +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - <xsl:value-of select="$title"/> - - - -

-
- This has been formatted by the sample "example.xsl" transform - - use your own XSLT to get a nicer page -
- - - - - - - -
- - - - -
-
- - - - - - - - - - - - - - - javascript:toggle("");? -
- - exp - - - - - - - - - - - - - - - - -
    - -
    • -     -
- - - - - - - - - - - - - - - - - - - - - - - - diff --git a/solr/config/xslt/example_atom.xsl b/solr/config/xslt/example_atom.xsl deleted file mode 100644 index dbc7afa3b7..0000000000 --- a/solr/config/xslt/example_atom.xsl +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - Example Solr Atom 1.0 Feed - - This has been formatted by the sample "example_atom.xsl" transform - - use your own XSLT to get a nicer Atom feed. - - - Apache Solr - solr-user@lucene.apache.org - - - - - - tag:localhost,2007:example - - - - - - - - - <xsl:value-of select="str[@name='name']"/> - - tag:localhost,2007: - - - - - - diff --git a/solr/config/xslt/example_rss.xsl b/solr/config/xslt/example_rss.xsl deleted file mode 100644 index b5bd0cf9fe..0000000000 --- a/solr/config/xslt/example_rss.xsl +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - Example Solr RSS 2.0 Feed - http://localhost:8983/solr - - This has been formatted by the sample "example_rss.xsl" transform - - use your own XSLT to get a nicer RSS feed. - - en-us - http://localhost:8983/solr - - - - - - - - - - - <xsl:value-of select="str[@name='name']"/> - - http://localhost:8983/solr/select?q=id: - - - - - - - http://localhost:8983/solr/select?q=id: - - - - diff --git a/solr/config/xslt/luke.xsl b/solr/config/xslt/luke.xsl deleted file mode 100644 index d3f71c6d82..0000000000 --- a/solr/config/xslt/luke.xsl +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - - - Solr Luke Request Handler Response - - - - - - - - - <xsl:value-of select="$title"/> - - - - - -

- -

-
- -
- -

Index Statistics

- - - -

Field Statistics

- - - -

Document statistics

- - - - - - - - - - -
- -
- - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
-

- -

- -
- -
- - - - -
- - 50 - 800 - 160 - blue - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- background-color: ; width: px; height: px; -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
  • - -
    • -     -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index b312d1e4b0..ee8e111464 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -82,7 +82,7 @@ def show end context 'raise_on_connection_error disabled' do - let(:request_context) { { body: "request_context" } } + let(:request_context) { { uri: Addressable::URI.parse("http://example.com"), body: "request_context" } } let(:e) { { body: "error_response" } } before :each do @@ -91,7 +91,13 @@ def show [RSolr::Error::ConnectionRefused, RSolr::Error::Timeout, Blacklight::Exceptions::ECONNREFUSED, Faraday::ConnectionFailed].each do |error_code| it "rescues #{error_code} errors" do - raised_error = error_code == RSolr::Error::Timeout ? error_code.new(request_context, e) : error_code + raised_error = if error_code == RSolr::Error::ConnectionRefused + error_code.new(request_context) + elsif error_code == RSolr::Error::Timeout + error_code.new(request_context, e) + else + error_code + end allow(controller).to receive(:show).and_raise(raised_error) allow_any_instance_of(Exception).to receive(:backtrace).and_return(["Test trace"]) allow_any_instance_of(Exception).to receive(:message).and_return('Connection reset by peer') @@ -101,7 +107,13 @@ def show it "renders error template for #{error_code} errors" do error_template = error_code == Faraday::ConnectionFailed ? 'errors/fedora_connection' : 'errors/solr_connection' - raised_error = error_code == RSolr::Error::Timeout ? error_code.new(request_context, e) : error_code + raised_error = if error_code == RSolr::Error::ConnectionRefused + error_code.new(request_context) + elsif error_code == RSolr::Error::Timeout + error_code.new(request_context, e) + else + error_code + end allow(controller).to receive(:show).and_raise(raised_error) get :show, params: { id: 'abc1234' } expect(response).to render_template(error_template) @@ -110,12 +122,18 @@ def show end context 'raise_on_connection_error enabled' do - let(:request_context) { { body: "request_context" } } + let(:request_context) { { uri: Addressable::URI.parse("http://example.com"), body: "request_context" } } let(:e) { { body: "error_response" } } [RSolr::Error::ConnectionRefused, RSolr::Error::Timeout, Blacklight::Exceptions::ECONNREFUSED, Faraday::ConnectionFailed].each do |error_code| it "raises #{error_code} errors" do - raised_error = error_code == RSolr::Error::Timeout ? error_code.new(request_context, e) : error_code + raised_error = if error_code == RSolr::Error::ConnectionRefused + error_code.new(request_context) + elsif error_code == RSolr::Error::Timeout + error_code.new(request_context, e) + else + error_code + end allow(Settings.app_controller.solr_and_fedora).to receive(:raise_on_connection_error).and_return(true) allow(controller).to receive(:show).and_raise(raised_error) allow_any_instance_of(Exception).to receive(:backtrace).and_return(["Test trace"]) diff --git a/spec/controllers/bookmarks_controller_spec.rb b/spec/controllers/bookmarks_controller_spec.rb index b85b1076ab..c110568a29 100644 --- a/spec/controllers/bookmarks_controller_spec.rb +++ b/spec/controllers/bookmarks_controller_spec.rb @@ -91,7 +91,6 @@ it "should show a warning for incomplete items" do invalid_mo = media_objects.first invalid_mo.title = nil - invalid_mo.date_issued = nil invalid_mo.save post 'publish' diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb index 4ad1437206..47ed27d264 100644 --- a/spec/controllers/catalog_controller_spec.rb +++ b/spec/controllers/catalog_controller_spec.rb @@ -15,6 +15,8 @@ require 'rails_helper' describe CatalogController do + include ActiveJob::TestHelper + describe "#index" do describe "as an un-authenticated user" do it "should show results for items that are public and published" do @@ -128,6 +130,7 @@ let!(:lti_group) { @controller.user_session[:virtual_groups].first } it "should show results for items visible to the lti virtual group" do mo = FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [lti_group]) + perform_enqueued_jobs(only: MediaObjectIndexingJob) get 'index', params: { :q => "read_access_virtual_group_ssim:#{lti_group}" } expect(response).to be_successful expect(response).to render_template('catalog/index') @@ -141,6 +144,7 @@ @user = login_as 'public' @ip_address1 = Faker::Internet.ip_v4_address @mo = FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [@ip_address1]) + perform_enqueued_jobs(only: MediaObjectIndexingJob) end it "should show no results when no items are visible to the user's IP address" do get 'index', params: { :q => "" } @@ -156,6 +160,7 @@ ip_address2 = Faker::Internet.ip_v4_address allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return(ip_address2) mo2 = FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [ip_address2+'/30']) + perform_enqueued_jobs(only: MediaObjectIndexingJob) get 'index', params: { :q => "" } expect(assigns(:response).documents.count).to be >= 1 expect(assigns(:response).documents.map(&:id)).to include mo2.id @@ -164,6 +169,7 @@ ip_address3 = Faker::Internet.ip_v6_address allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return(ip_address3) mo3 = FactoryBot.create(:published_media_object, visibility: 'private', read_groups: [ip_address3+'/ffff:ffff:ffff:ffff:ffff:ffff:ffff:ff00']) + perform_enqueued_jobs(only: MediaObjectIndexingJob) get 'index', params: { :q => "" } expect(assigns(:response).documents.count).to be >= 1 expect(assigns(:response).documents.map(&:id)).to include mo3.id @@ -257,7 +263,7 @@ MediaObjectIndexingJob.perform_now(media_object.id) end ["avalon_resource_type_ssim", "creator_ssim", "date_sim", "genre_ssim", "series_ssim", "collection_ssim", "unit_ssim", "language_ssim", "has_captions_bsi", "has_transcripts_bsi", - "workflow_published_sim", "avalon_uploader_ssi", "read_access_group_ssim", "read_access_virtual_group_ssim", "date_digitized_ssim", "date_ingested_ssim"].each do |field| + "workflow_published_sim", "avalon_uploader_ssi", "read_access_group_ssim", "read_access_virtual_group_ssim", "date_digitized_ssim", "date_ingested_ssim", "subject_ssim"].each do |field| it "should facet results on #{field}" do query = Array(media_object.to_solr(include_child_fields:true)[field]).first # The following line is to check that the test is using a valid solr field name @@ -291,8 +297,10 @@ end describe "atom feed" do - let!(:private_media_object) { FactoryBot.create(:media_object, visibility: 'private') } - let!(:public_media_object) { FactoryBot.create(:published_media_object, visibility: 'public') } + render_views + + let!(:private_media_object) { FactoryBot.create(:media_object, visibility: 'private', other_identifier: [{ id: "GR12345678", source: 'local' }]) } + let!(:public_media_object) { FactoryBot.create(:published_media_object, visibility: 'public', other_identifier: [{ id: "GR12345678", source: 'local' }]) } let(:administrator) { FactoryBot.create(:administrator) } context "with an api key" do @@ -305,8 +313,29 @@ expect(response).to be_successful expect(response).to render_template('catalog/index') expect(response.content_type).to eq "application/atom+xml; charset=utf-8" - expect(assigns(:response).documents.count).to eq 2 - expect(assigns(:response).documents.map(&:id)).to match_array [private_media_object.id, public_media_object.id] + documents = assigns(:response).documents + expect(documents.count).to eq 2 + expect(documents.map(&:id)).to match_array [private_media_object.id, public_media_object.id] + xml = Nokogiri::XML(response.body) + xml.remove_namespaces! + updated_times = xml.xpath('/feed/entry/updated/text()').map(&:to_s) + expect(updated_times).to be_present + expect(updated_times.all?(&:present?)).to eq true + end + it "should show results for all items" do + request.headers['Avalon-Api-Key'] = 'secret_token' + get 'index', params: { q: "other_identifier_sim:/GR[0-9]{8}/", sort: "timestamp+desc", rows: 100, page: 1, format: 'atom' } + expect(response).to be_successful + expect(response).to render_template('catalog/index') + expect(response.content_type).to eq "application/atom+xml; charset=utf-8" + documents = assigns(:response).documents + expect(documents.count).to eq 2 + expect(documents.map(&:id)).to match_array [private_media_object.id, public_media_object.id] + xml = Nokogiri::XML(response.body) + xml.remove_namespaces! + updated_times = xml.xpath('/feed/entry/updated/text()').map(&:to_s) + expect(updated_times).to be_present + expect(updated_times.all?(&:present?)).to eq true end context "when there are transcripts present" do let!(:transcript) { FactoryBot.create(:supplemental_file, :with_transcript_file, :with_transcript_tag, parent_id: private_media_object.id) } @@ -326,13 +355,19 @@ end end context "without api key" do - it "should not show results" do - get 'index', params: { q: "", format: 'atom' } + it "should only show visible results" do + get 'index', params: { q: "other_identifier_sim:/GR[0-9]{8}/", sort: "timestamp+desc", rows: 100, page: 1, format: 'atom' } expect(response).to be_successful expect(response.content_type).to eq "application/atom+xml; charset=utf-8" expect(response).to render_template('catalog/index') - expect(assigns(:response).documents.count).to eq 1 - expect(assigns(:response).documents.map(&:id)).to eq([public_media_object.id]) + documents = assigns(:response).documents + expect(documents.count).to eq 1 + expect(documents.map(&:id)).to match_array [public_media_object.id] + xml = Nokogiri::XML(response.body) + xml.remove_namespaces! + updated_times = xml.xpath('/feed/entry/updated/text()').map(&:to_s) + expect(updated_times).to be_present + expect(updated_times.all?(&:present?)).to eq true end end end diff --git a/spec/controllers/encode_records_controller_spec.rb b/spec/controllers/encode_records_controller_spec.rb index 1122f54a03..a7c04d04c8 100644 --- a/spec/controllers/encode_records_controller_spec.rb +++ b/spec/controllers/encode_records_controller_spec.rb @@ -63,6 +63,14 @@ expect(response).to render_template('errors/restricted_pid') end end + + context "when state is nil" do + let(:encode_record_test) { FactoryBot.create(:encode_record, state: nil) } + it "returns a success response" do + get :index, params: {}, session: valid_session + expect(response).to be_successful + end + end end describe "GET #show" do @@ -75,10 +83,18 @@ let(:user) { FactoryBot.create(:user) } it "redirects to restricted content page" do - get :index, params: {}, session: valid_session + get :show, params: { id: encode_record_test.to_param }, session: valid_session expect(response).to render_template('errors/restricted_pid') end end + + context "when state is nil" do + let(:encode_record_test) { FactoryBot.create(:encode_record, state: nil) } + it "returns a success response" do + get :show, params: { id: encode_record_test.to_param }, session: valid_session + expect(response).to be_successful + end + end end describe "POST #paged_index" do @@ -134,6 +150,20 @@ expect(parsed_response['data'][1][3]).to eq('Title 997') end end + + context "when state is nil" do + let(:params) { { start: 0, length: 20, order: { '0': { column: 3, dir: 'asc' } }, search: { value: '' } } } + before do + FactoryBot.create(:encode_record, state: nil) + end + + it "returns a success response" do + post :paged_index, format: 'json', params: params, session: valid_session + expect(response).to be_successful + parsed_response = JSON.parse(response.body) + expect(parsed_response['recordsTotal']).to eq(12) + end + end end describe "POST #progress" do diff --git a/spec/controllers/master_files_controller_spec.rb b/spec/controllers/master_files_controller_spec.rb index cebbcec7c7..18f82a11be 100644 --- a/spec/controllers/master_files_controller_spec.rb +++ b/spec/controllers/master_files_controller_spec.rb @@ -20,15 +20,11 @@ describe "#create" do let(:media_object) { FactoryBot.create(:media_object) } - # TODO: fill in the lets below with a legitimate values from mediainfo - # let(:mediainfo_video) { } - # let(:mediainfo_audio) { } before do # login_user media_object.collection.managers.first login_as :administrator disableCanCan! - # allow_any_instance_of(MasterFile).to receive(:mediainfo).and_return(mediainfo_output) end context "must provide a container id" do @@ -43,7 +39,6 @@ context "must provide a valid media object" do before do media_object.title = nil - media_object.date_issued = nil media_object.workflow.last_completed_step = 'file-upload' media_object.save(validate: false) end @@ -125,9 +120,12 @@ request.env["HTTP_REFERER"] = "/" file = fixture_file_upload('/public-domain-book.txt', 'application/json') + image = fixture_file_upload('/collection_poster.jpg', 'image/jpeg') expect { post :create, params: { Filedata: [file], original: 'any', container_id: media_object.id } }.not_to change { MasterFile.count } + expect(flash[:error]).not_to be_nil + expect { post :create, params: { Filedata: [image], original: 'any', container_id: media_object.id } }.not_to change { MasterFile.count } expect(flash[:error]).not_to be_nil end @@ -140,6 +138,13 @@ expect(flash[:error]).to be_nil end + + it "rejects when ffprobe is misconfigured" do + allow(Settings.ffprobe).to receive(:path).and_return('misconfigured/path') + file = fixture_file_upload('/jazz-performance.mp3', 'audio/mp3') + expect { post :create, params: { Filedata: [file], original: 'any', container_id: media_object.id } }.not_to change { MasterFile.count } + expect(flash[:error]).not_to be_nil + end end # rubocop:disable RSpec/ExampleLength @@ -228,6 +233,22 @@ class << file expect(controller.current_ability.can?(:destroy, master_file)).to be_falsey expect(post(:destroy, params: { id: master_file.id })).to render_template('errors/restricted_pid') end + + context "master file with child supplemental files" do + let!(:master_file) { FactoryBot.create(:master_file, :with_media_object, :cancelled_processing, supplemental_files: [supplemental_file]) } + let(:supplemental_file) { FactoryBot.create(:supplemental_file) } + + around(:example) do |example| + perform_enqueued_jobs { example.run } + end + + it "deletes child files" do + login_as :administrator + expect(SupplementalFile.exists?(supplemental_file.id)).to be_truthy + post :destroy, params: { id: master_file.id } + expect(SupplementalFile.exists?(supplemental_file.id)).to be_falsey + end + end end describe "#show" do @@ -373,6 +394,20 @@ class << file expect(response.body).to eq('fake image content') expect(response.headers['Content-Type']).to eq('image/jpeg') end + + context "video without thumbnail" do + subject(:mf) { FactoryBot.create(:master_file, :with_media_object) } + it "returns video_icon.png" do + expect(get :get_frame, params: { id: mf.id, type: 'thumbnail', size: 'bar' }).to redirect_to(ActionController::Base.helpers.asset_path('video_icon.png')) + end + end + + context "audio" do + subject(:mf) { FactoryBot.create(:master_file, :audio, :with_media_object) } + it "returns audio_icon.png" do + expect(get :get_frame, params: { id: mf.id, type: 'thumbnail', size: 'bar' }).to redirect_to(ActionController::Base.helpers.asset_path('audio_icon.png')) + end + end end context 'read from solr' do diff --git a/spec/controllers/media_objects_controller_spec.rb b/spec/controllers/media_objects_controller_spec.rb index d9ecc4bdfa..e81a697648 100644 --- a/spec/controllers/media_objects_controller_spec.rb +++ b/spec/controllers/media_objects_controller_spec.rb @@ -359,7 +359,7 @@ expect(new_media_object.bibliographic_id).to eq({source: "local", id: bib_id}) expect(new_media_object.title).to eq ex_media_object.title expect(new_media_object.creator).to eq [] #creator no longer required, so supplied value won't be used - expect(new_media_object.date_issued).to eq ex_media_object.date_issued + expect(new_media_object.date_issued).to eq nil #date_issued no longer required, so supplied value won't be used end it "should create a new media_object, removing invalid data for non-required fields" do media_object = FactoryBot.create(:media_object) @@ -618,13 +618,12 @@ media_object.save login_user media_object.collection.managers.first - put :update, params: { id: media_object.id, step: 'resource-description', media_object: {title: '', date_issued: ''} } + put :update, params: { id: media_object.id, step: 'resource-description', media_object: {title: ''} } expect(response.response_code).to eq(200) expect(flash[:error]).not_to be_empty media_object.reload expect(media_object.valid?).to be_truthy expect(media_object.title).not_to be_blank - expect(media_object.date_issued).not_to be_blank end end @@ -1374,6 +1373,23 @@ expect(flash[:notice]).to include('3 media objects') media_objects.each {|mo| expect(MediaObject.exists?(mo.id)).to be_falsey } end + + it "should remove child supplemental files" do + supplemental_file = FactoryBot.create(:supplemental_file) + media_object = FactoryBot.create(:media_object, collection: collection, supplemental_files: [supplemental_file] ) + expect(SupplementalFile.exists?(supplemental_file.id)).to be_truthy + delete :destroy, params: { id: media_object.id } + expect(SupplementalFile.exists?(supplemental_file.id)).to be_falsey + end + + it "should remove section supplemental files" do + supplemental_file = FactoryBot.create(:supplemental_file) + media_object = FactoryBot.create(:media_object, collection: collection ) + master_file = FactoryBot.create(:master_file, media_object: media_object, supplemental_files: [supplemental_file]) + expect(SupplementalFile.exists?(supplemental_file.id)).to be_truthy + delete :destroy, params: { id: media_object.id } + expect(SupplementalFile.exists?(supplemental_file.id)).to be_falsey + end end describe "#confirm_remove" do @@ -1453,7 +1469,6 @@ it "item is invalid" do media_object = FactoryBot.create(:media_object, collection: collection) media_object.title = nil - media_object.date_issued = nil media_object.workflow.last_completed_step = 'file-upload' media_object.save!(validate: false) get 'update_status', params: { id: media_object.id, status: 'publish' } @@ -1465,7 +1480,6 @@ it "item is invalid and no last_completed_step" do media_object = FactoryBot.create(:media_object, collection: collection) media_object.title = nil - media_object.date_issued = nil media_object.workflow.last_completed_step = '' media_object.save!(validate: false) get 'update_status', params: { id: media_object.id, status: 'publish' } @@ -1487,7 +1501,6 @@ it 'unpublishes invalid items' do media_object = FactoryBot.create(:published_media_object, collection: collection) media_object.title = nil - media_object.date_issued = nil media_object.save!(validate: false) get 'update_status', params: { id: media_object.id, status: 'unpublish' } media_object.reload @@ -1497,7 +1510,6 @@ it 'unpublishes invalid items and no last completed step' do media_object = FactoryBot.create(:published_media_object, collection: collection) media_object.title = nil - media_object.date_issued = nil media_object.workflow.last_completed_step = '' media_object.save!(validate: false) get 'update_status', params: { id: media_object.id, status: 'unpublish' } @@ -1853,6 +1865,34 @@ end describe '#manifest' do + before do + login_as :administrator + end + + context 'with supplemental files' do + let(:mf_supplemental_file) { FactoryBot.create(:supplemental_file) } + let(:mo_supplemental_file) { FactoryBot.create(:supplemental_file) } + let(:master_file) { FactoryBot.create(:master_file, media_object: media_object, supplemental_files: [mf_supplemental_file]) } + let(:media_object) { FactoryBot.create(:published_media_object, supplemental_files: [mo_supplemental_file]) } + + before do + mf_supplemental_file.parent_id = master_file.id + mo_supplemental_file.parent_id = media_object.id + mf_supplemental_file.save + mo_supplemental_file.save + end + + it 'should link to proper object route in rendering section' do + get 'manifest', params: { id: media_object.id, format: 'json' } + parsed_response = JSON.parse(response.body) + mo_rendering = parsed_response['rendering'].first + expect(mo_rendering['id']).to eq Rails.application.routes.url_helpers.media_object_supplemental_file_url(id: mo_supplemental_file.id, media_object_id: media_object.id) + item = parsed_response['items'].first + mf_rendering = item['rendering'].first + expect(mf_rendering['id']).to eq Rails.application.routes.url_helpers.master_file_supplemental_file_url(id: mf_supplemental_file.id, master_file_id: master_file.id) + end + end + context 'read from solr' do let!(:master_file) { FactoryBot.create(:master_file, :with_derivative, media_object: media_object) } let!(:media_object) { FactoryBot.create(:published_media_object, visibility: 'public') } diff --git a/spec/cypress/cypress.config.js b/spec/cypress/cypress.config.js index 0a19103ff7..0d6d245734 100644 --- a/spec/cypress/cypress.config.js +++ b/spec/cypress/cypress.config.js @@ -13,7 +13,7 @@ module.exports = defineConfig({ setupNodeEvents(on, config) { // implement node event listeners here - const environmentName = process.env.CYPRESS_ENV || 'local'; + const environmentName = process.env.CYPRESS_ENV || 'dev'; const environmentFilename = `cypress.env.${environmentName}.json`; const environmentPath = path.resolve(__dirname, environmentFilename); diff --git a/spec/cypress/cypress.env.dev.json b/spec/cypress/cypress.env.dev.json index 2de97baf9f..517672ad1a 100644 --- a/spec/cypress/cypress.env.dev.json +++ b/spec/cypress/cypress.env.dev.json @@ -4,11 +4,21 @@ "env": { "MEDIA_OBJECT_ID": "fj236208t", "MEDIA_OBJECT_TITLE":"Beginning Responsibility: Lunchroom Manners", - "SEARCH_COLLECTION":"7.7 regression test", - "USERS_ADMINISTRATOR_EMAIL": "admin_email", - "USERS_ADMINISTRATOR_PASSWORD": "placeholder_password", - "USERS_USER_EMAIL":"user_email", - "USERS_USER_PASSWORD": "placeholder_password", - "USER_MANAGER": "userstudy" + "MEDIA_OBJECT_ID_2": "sj1391978", + "MEDIA_OBJECT_TITLE_2":"Cypress automation test media object", + "MEDIA_OBJECT_CAPTION_2":"sample.vtt", + "SEARCH_COLLECTION":"_Cypress automation collection", + "USERS_ADMINISTRATOR_USERNAME":"admin username", + "USERS_ADMINISTRATOR_EMAIL": "admin email", + "USERS_ADMINISTRATOR_PASSWORD": "admin pass", + "USERS_USER_USERNAME":"some basic user's username", + "USERS_USER_EMAIL":"user email", + "USERS_USER_PASSWORD": "user password", + "USER_MANAGER_USERNAME": "placeholder manager name - must be manager of SEARCH_COLLECTION", + "USER_MANAGER_EMAIL": "manager email", + "USER_MANAGER_PASSWORD": "manager password", + "MEDIA_OBJECT_FIELD_MAIN_CONTRIBUTOR": "Coronet Films", + "MEDIA_OBJECT_FIELD_GENRE": "Automation genre", + "MEDIA_OBJECT_FIELD_LANGUAGE": "Spanish" } } \ No newline at end of file diff --git a/spec/cypress/cypress.env.local.json b/spec/cypress/cypress.env.local.json index 9b5140197c..4fa4355eb8 100644 --- a/spec/cypress/cypress.env.local.json +++ b/spec/cypress/cypress.env.local.json @@ -2,6 +2,23 @@ { "baseUrl": "http://localhost:3000", "env": { - + "MEDIA_OBJECT_ID": "11111111", + "MEDIA_OBJECT_TITLE":"Beginning Responsibility: Lunchroom Manners", + "MEDIA_OBJECT_ID_2": "12345679", + "MEDIA_OBJECT_TITLE_2":"Cypress automation test media object", + "MEDIA_OBJECT_CAPTION_2":"sample.vtt", + "SEARCH_COLLECTION":"_Cypress automation collection", + "USERS_ADMINISTRATOR_USERNAME":"admin username", + "USERS_ADMINISTRATOR_EMAIL": "admin email", + "USERS_ADMINISTRATOR_PASSWORD": "admin pass", + "USERS_USER_USERNAME":"some basic user's username", + "USERS_USER_EMAIL":"user email", + "USERS_USER_PASSWORD": "user password", + "USER_MANAGER_USERNAME": "placeholder manager name - must be manager of SEARCH_COLLECTION", + "USER_MANAGER_EMAIL": "manager email", + "USER_MANAGER_PASSWORD": "manager password", + "MEDIA_OBJECT_FIELD_MAIN_CONTRIBUTOR": "Coronet Films", + "MEDIA_OBJECT_FIELD_GENRE": "Automation genre", + "MEDIA_OBJECT_FIELD_LANGUAGE": "Spanish" } } \ No newline at end of file diff --git a/spec/cypress/cypress.env.staging.json b/spec/cypress/cypress.env.staging.json index b44745ac1d..c69cd2152d 100644 --- a/spec/cypress/cypress.env.staging.json +++ b/spec/cypress/cypress.env.staging.json @@ -1,10 +1,23 @@ { "baseUrl": "https://avalon-staging.dlib.indiana.edu/", "env": { - "MEDIA_OBJECT_TITLE":"Beginning Responsibility: Lunchroom Manners", - "USERS_ADMINISTRATOR_EMAIL": "admin_email", - "USERS_ADMINISTRATOR_PASSWORD": "placeholder_password", - "USERS_USER_EMAIL":"user_email", - "USERS_USER_PASSWORD": "placeholder_password" - } + "MEDIA_OBJECT_ID": "n009w228g", + "MEDIA_OBJECT_TITLE":"Beginning Responsibility: Lunchroom Manners", + "MEDIA_OBJECT_ID_2": "2r36tx569", + "MEDIA_OBJECT_TITLE_2":"Cypress automation test media object", + "MEDIA_OBJECT_CAPTION_2":"sample.vtt", + "SEARCH_COLLECTION":"_Cypress automation collection", + "USERS_ADMINISTRATOR_USERNAME":"admin username", + "USERS_ADMINISTRATOR_EMAIL": "admin email", + "USERS_ADMINISTRATOR_PASSWORD": "admin pass", + "USERS_USER_USERNAME":"some basic user's username", + "USERS_USER_EMAIL":"user email", + "USERS_USER_PASSWORD": "user password", + "USER_MANAGER_USERNAME": "placeholder manager name - must be manager of SEARCH_COLLECTION", + "USER_MANAGER_EMAIL": "manager email", + "USER_MANAGER_PASSWORD": "manager password", + "MEDIA_OBJECT_FIELD_MAIN_CONTRIBUTOR": "Coronet Films", + "MEDIA_OBJECT_FIELD_GENRE": "Automation genre", + "MEDIA_OBJECT_FIELD_LANGUAGE": "Spanish" + } } \ No newline at end of file diff --git a/spec/cypress/fixtures/captions-example.srt b/spec/cypress/fixtures/captions-example.srt new file mode 100644 index 0000000000..83cfdb7c4e --- /dev/null +++ b/spec/cypress/fixtures/captions-example.srt @@ -0,0 +1,84 @@ +1 +00:00:01,420 --> 00:00:05,120 +Hiring a transcriber saves time and resources. + +2 +00:00:05,460 --> 00:00:08,340 +Professional transcribers will ensure + +3 +00:00:08,520 --> 00:00:11,600 +that your audio file is translated into text + +4 +00:00:11,760 --> 00:00:12,660 +accurately + +5 +00:00:12,720 --> 00:00:13,880 +and efficiently. + +6 +00:00:14,200 --> 00:00:17,600 +Transcribers are trained and tested in certain niches + +7 +00:00:17,860 --> 00:00:19,600 +from legal and medical + +8 +00:00:19,700 --> 00:00:20,920 +to academic. + +9 +00:00:21,100 --> 00:00:22,160 +Here's how it works. + +10 +00:00:22,400 --> 00:00:24,700 +First, an audio file is received. + +11 +00:00:25,200 --> 00:00:28,000 +Next, the file is pre-screened + +12 +00:00:28,000 --> 00:00:30,520 +to be matched with the perfect transcriber + +13 +00:00:30,520 --> 00:00:33,960 +who is then assigned the task of creating the transcript. + +14 +00:00:34,220 --> 00:00:36,180 +Once the transcript is created, + +15 +00:00:36,420 --> 00:00:39,800 +the document goes through rigorous quality-control channels + +16 +00:00:39,880 --> 00:00:42,200 +before being submitted to the client. + +17 +00:00:42,540 --> 00:00:45,420 +We provide uncompromising quality, + +18 +00:00:45,800 --> 00:00:47,460 +rates within your budget, + +19 +00:00:47,460 --> 00:00:49,460 +timely and convenient delivery. + +20 +00:00:49,600 --> 00:00:51,160 +Upload your file now. + +21 +00:00:51,240 --> 00:00:53,160 +We do the rest. + diff --git a/spec/cypress/fixtures/image.png b/spec/cypress/fixtures/image.png new file mode 100644 index 0000000000..e436c51ac1 Binary files /dev/null and b/spec/cypress/fixtures/image.png differ diff --git a/spec/cypress/fixtures/test_sample.mp4 b/spec/cypress/fixtures/test_sample.mp4 new file mode 100644 index 0000000000..9706102199 Binary files /dev/null and b/spec/cypress/fixtures/test_sample.mp4 differ diff --git a/spec/cypress/fixtures/transcript-example.vtt b/spec/cypress/fixtures/transcript-example.vtt new file mode 100644 index 0000000000..cf6bf48e91 --- /dev/null +++ b/spec/cypress/fixtures/transcript-example.vtt @@ -0,0 +1,928 @@ +WEBVTT + +00:00:02.340 --> 00:00:13.739 +RAFAL SWIATKOWSKI: My name is Rafal Swiatkowski. Today’s date is January 3, 2018. To start, can you please tell me your full name, the year that you graduated, and your major? + + +00:00:13.740 --> 00:00:21.239 +ABIGAIL HARTER: My name is Abbie Harter. I graduated in 2014, and I got a Bachelor of Arts in psychology. + + +00:00:21.240 --> 00:00:27.220 +RS: Cool. Where were you born? + + +00:00:28.000 --> 00:00:32.100 +AH: I was born in Indianapolis, Indiana. + + +00:00:32.630 --> 00:00:36.420 +RS: Okay, and tell me a little bit about your family background. + + +00:00:37.780 --> 00:01:02.869 +AH: Well, my . . . we moved to Fort Wayne when I was four, and there was a lot of marital discord [laughs], so that was like a broken home thing. So my parents divorced when I was like seven, and I lived primarily with my mom. + + +00:01:02.870 --> 00:01:31.489 +My dad was a lawyer for a while and then was not a lawyer because of some things that happened. And my mom was in school, like in college, the majority of the time when I was a kid, so I had kind of an atypical childhood. I have two older sisters, or like full sisters, and I have five younger half siblings that I’m related to through my dad. + + +00:01:31.490 --> 00:01:35.470 +RS: And so both of your parents went to some sort of college? + + +00:01:36.050 --> 00:02:01.180 +AH: Yeah. My dad has his Juris Doctorate. And he also has another master’s degree in something else; I think it’s education related. My mom has a bachelor’s degree in sociology, and she’s actually currently in graduate school for counseling. And my—I know my maternal grandmother was an art teacher. So I’m like third-generation college. + + +00:02:01.580 --> 00:02:06.979 +RS: So what ended up bringing you to IU? + + +00:02:06.980 --> 00:02:23.539 +AH: Well, I got really good grades in high school and so I was like, “This is my chance to get out and try something new.” So at first I was looking at colleges really far away. Really, you know, ‘prestigious’ colleges. + + +00:02:23.540 --> 00:02:42.679 +And then I found out that I could get an automatic scholarship through IU. And it really required almost no effort to get the money to go there. And it was just closer to my family, and I am pretty close to my family. So that’s why I decided to go. + + +00:02:42.680 --> 00:02:44.860 +RS: What scholarship was it? + + +00:02:45.220 --> 00:02:57.889 +AH: I got . . . I definitely got an automatic scholarship. So I think it was something about excellence? I know that— + + +00:02:57.890 --> 00:03:01.909 +RS: —Yeah, it was like the presidential, the excellence, and yeah. + + +00:03:01.910 --> 00:03:24.379 +AH: Yeah, I got scarf for it [laughs]. That’s the most notable to me. I also got—I was a 21st century scholar, which is an Indiana thing that’s like partially based on your grades. But those standards are pretty like average to low. And the other thing is it’s income based. + + +00:03:24.380 --> 00:03:34.939 +So it’s when you apply, which I think is like seventh grade, if your family is low enough income then that’s when you get that scholarship, and you just have to maintain certain criteria. + + +00:03:34.940 --> 00:03:54.869 +And then I think the scholarship is for paying . . . it’s definitely tuition. It might be also room and board. It pays for quite a lot. So actually, through those two scholarships, ended up getting like— + + +00:03:54.870 --> 00:04:06.850 +RS: So we’re back from a phone interruption. And so we’ll just go on to the next question. So when you did come to IU, where did you live? + + +00:04:07.160 --> 00:04:34.700 +AH: I lived in Foster Quad. See, I was part of a learning-living community. Living-learning community? Called the Global Village, which I think has since combined with the international one as well. But that was a fun place to live [laughs]. It’s hard to say that with a straight face because that’s only half true. + + +00:04:34.720 --> 00:05:03.679 +There was . . . all the sororities and the fraternities are like right behind it. And so a lot of people moved from the northwest neighborhood into those. So that’s not really my crowd. It wasn’t really what I was into, but it was all around me. So it was very interesting, and it definitely contributed to culture shock when I got there. + + +00:05:03.680 --> 00:05:05.140 +RS: Yeah, like what kind? + + +00:05:05.600 --> 00:05:29.959 +AH: Well, in part because my family was poor growing up, and I went to an inner-city school in Fort Wayne. So I was used to, you know, just I think at least half of the student body population at Northside was on free or reduced lunch. So when I went to IU, and especially in that neighborhood, I was like, “Oh my gosh, everyone is so wealthy.” + + +00:05:29.960 --> 00:05:48.630 +And also just the way that people would network with each other and talk to each other about what their parents did for a living and what area of Indy they lived in and who, people they knew—like they lived to other people that were really rich, and they would just start talking about the connections that they had. + + +00:05:49.020 --> 00:06:01.999 +That was so different and overwhelming to me. I didn’t—it made me question if I, you know, if I belonged. Which is weird to me now because that really went away after a while. But it was definitely culture shock when I first got there. + + +00:06:02.000 --> 00:06:06.829 +RS: Like belonged in the housing community or belong at IU or college? + + +00:06:06.830 --> 00:06:21.739 +AH: IU as a whole. During my orientation, I started crying. I was planning on spending the day or the night there. I think you can spend the night in the dorms. And I’m pretty sure I had been planning on doing that. + + +00:06:21.740 --> 00:06:34.199 +And then I was just so—and I know it definitely was just partially I ended up in a weird group, it was just particularly the small group that I was in had been full of people who were really into the networking thing. + + +00:06:34.200 --> 00:06:48.300 +It was a huge shock to me, and I was like, “I don’t know if I belong.” So I just ended up spending the night at my uncle’s house because he lived in Bloomington instead. But yeah, it was a huge change, very different. + + +00:06:48.750 --> 00:07:01.669 +RS: So going back to Foster and the Global Village, do you have any particular memories of your time there? + + +00:07:01.670 --> 00:07:24.469 +AH: Yeah that’s where I met my best friend all throughout college. His name’s John. And I really went to the Global Village because I was—well, I think I started out a global . . . was it global studies major? + + +00:07:24.470 --> 00:07:24.469 +RS: International studies? + + +00:07:24.470 --> 00:07:41.989 +AH: International studies, yeah. And I also, I think I had a dual major in Chinese language, like Mandarin. So I was expecting to like fit in there, and then that situation was really weird too, particularly because people go there because they want to study abroad. + + +00:07:41.990 --> 00:08:04.830 +A lot of those people had traveled extensively, so they did come from wealthier families, so that was definitely a part of that. So I guess the memories I have from there didn’t have anything to do with the fact that it was the Global Village, but more just from I found not only my best friend, but my best friend from high school got into that learning community as well. + + +00:08:04.900 --> 00:08:41.279 +And she met a guy on her floor and the four of us just hung out all the time. So that’s probably the most memorable time I have from living in the dorms just hanging out with them, avoiding doing homework, smoking lots of cigarettes, staying up really late. I think we call ourselves the Hoosier Melancholy Club because we felt so distinctly depressed in comparison to the people around us. It was pretty silly. + + +00:08:41.280 --> 00:08:46.909 +RS: And then where did you live after Foster? + + +00:08:46.910 --> 00:09:16.939 +AH: After? So my sophomore year I lived in an apartment with some mutual friend that I had, and then some girl that she knew. So it was two girls, and that was an interesting experience, because it’s over by close to the Villas, but not the Villas. So it was like in the party area of town, although, you know, it’s all pretty much a party area. + + +00:09:16.940 --> 00:09:20.509 +RS: Yeah, it’s hard to miss that really. + + +00:09:20.510 --> 00:09:47.409 +AH: Yeah. But I know that are neighbors, like, the walls were paper thin because it’s super cheap housing thing, and our neighbors were drug dealers, and would talk about—like you can hear everything they’re saying through the vents, and like the smell of their drugs would waft through the vents into our apartment, and you could like hear all of the really loud music, and that would happen at all hours of the night. + + +00:09:47.410 --> 00:10:08.050 +So that was pretty fun because like, quintessentially college. Can’t sleep, but can hear all of the drug activity going on around you. And then after that, my junior and senior year I rented an apartment by myself because I was pretty much over having roommates at that point. + + +00:10:08.480 --> 00:10:41.499 +Every single roommate I ever had, I ended up not being friends with afterwards [laughs]. So I lived in a one-bedroom apartment that had a lot. It was extremely cheap, very . . . there’s not a good politically correct term for it, but it was in what people would probably call like the bad part of Bloomington, which doesn’t seem as bad in comparison to other places, other cities. + + +00:10:41.500 --> 00:10:43.369 +RS: What part of town would that have been? + + +00:10:43.370 --> 00:11:09.899 +AH: That was the west side of town. But like before—like not as far west as like where it’s like to be like family neighborhoods much. It was right off Rogers Street, if you know where that’s at. I think there’s actually some sort of Section 8 apartments right over in that area, and that’s why people say that it’s one of the rougher parts of town. + + +00:11:09.900 --> 00:11:22.810 +We actually had a cop pounding on people’s doors one time with a shotgun, like they just had guns pulled because they’d heard gunshots. They were looking for the person that it was, but that was a pretty heavy handed thing. + + +00:11:23.230 --> 00:11:32.189 +RS: Yeah, you said the rent was really cheap, so can I ask what that was? + + +00:11:32.190 --> 00:11:37.159 +AH: I believe it was for $475. Yeah, $475 a month. It was under 500 square feet. + + +00:11:37.160 --> 00:11:39.880 +RS: Pretty decent for 2012 Bloomington, I guess. + + +00:11:40.440 --> 00:11:50.620 +AH: Yeah, yeah, it was pretty decent. I didn’t move even though it sucked because I couldn’t find a better deal. + + +00:11:50.690 --> 00:12:03.850 +RS: Well, then I guess moving into academics a little bit, did you have any favorite classes or your favorite professors that you remember? + + +00:12:03.870 --> 00:12:25.170 +AH: Yeah, definitely. I had a class that was based in Collins, and it was taught by a person named Melinda Quinn Brennan I think is her full name. She was a grad student at the time, I think. But it was called Queer Migrations, and it was about the diaspora of queer people basically. + + +00:12:25.280 --> 00:12:42.619 +That was one of my favorite classes because I was a sophomore. It’s probably one of the first tiny seminar classes I had where you just read stuff and then everyone sits around and argues about it. And I love classes like that. So that was a good experience. + + +00:12:42.620 --> 00:12:53.269 +She was also, that professor was just great at leading discussions. Like I had some classes where the professor was so biased that I dropped the class because I just couldn’t—like I didn’t want to discuss anything. + + +00:12:53.270 --> 00:13:03.139 +That professor was particularly good at like letting everyone talk, no matter how out there their opinions were, but then directing it back to the topic. So she was a great teacher. + + +00:13:03.140 --> 00:13:27.100 +And I think that was the first time I’d ever . . . I mean, just like the structure of that class having such a specific topic and, you know, sort of like from the broader perspective of queer or whatever, but then to take something from that subject and really just examine this tiny part of it. It just made it really interesting. + + +00:13:28.810 --> 00:13:30.729 +RS: Any other ones? + + +00:13:30.730 --> 00:13:51.369 +AH: Well, one thing that I tried to do because I had a really bad social anxiety – I still do, but I did especially in college – and so through my psychology degree I learned about exposure therapy for anxiety in general, and that’s where you make yourself do the thing that you’re afraid of in tiny increments. + + +00:13:51.370 --> 00:14:13.510 +So I started signing up for all these classes that were like, just made you put yourself out there in a public way. So that was like guitar. I took an acting class, took a public speaking class, took a . . . oh, a belly dancing class. That was really fun. I also took a contemporary dance class. + + +00:14:13.590 --> 00:14:30.349 +A lot of those were things I’d never done before. And I also took a self-defense class. That was awesome. So a lot of the performance or physical classes that I did were some of my favorites, and it really helped me come out of my shell. + + +00:14:30.350 --> 00:14:37.880 +RS: Did you have an advisor who particularly impacted you? + + +00:14:38.320 --> 00:14:43.229 +AH: No [laughs]. Yeah, I can’t even think of a name. + + +00:14:43.230 --> 00:14:50.270 +RS: What about, so where was your favorite student hangout? + + +00:14:50.400 --> 00:15:00.029 +AH: Favorite student hangout. I mean, when I—well, let’s see. There were periods of time where I would go to the Union to sleep/study all the time because I’m a very routine-based person. + + +00:15:00.030 --> 00:15:13.439 +So I would basically structure my days around like, “Okay, I go to these classes, and then while I’m on campus, I’ll go to this place to study and/or take a nap, and then finish out my day.” Because I didn’t like doing homework at home. So the Union. + + +00:15:13.440 --> 00:15:34.069 +There was also this little alcove right by a door in the psychological and brain sciences building. That was a really good place because it was super convenient. But really my favorite place to be was home, especially when I wasn’t living at the dorms anymore. I would go hide in my apartment. + + +00:15:34.070 --> 00:15:47.150 +RS: What about spots where you would hang out with other people? Where would you and your friends go? + + +00:15:48.750 --> 00:15:50.869 +AH: Me and my friends [laughs]. + + +00:15:50.870 --> 00:15:56.019 +RS: Oh well, yeah [laughs]. Sorry for leading you. + + +00:15:56.020 --> 00:16:07.239 +AH: Well, I really . . . I was in a relationship almost all, like starting sophomore year. It was a really serious relationship. I think in some ways that made it harder to make friends because I was just hanging out with the same person all the time. + + +00:16:07.240 --> 00:16:20.959 +And then I also had the aforementioned best friend John, who I hung out with all the time. I would hang out with those people at home though. So like as far as going out, I mean I know like, the Laughing Planet, you know, that’s the burrito place, right? + + +00:16:20.960 --> 00:16:22.289 +RS: Mmhmm. + + +00:16:22.290 --> 00:16:40.679 +AH: Yeah. And especially I think the first couple of years I was in college is really when I would go out more, but I went out to the restaurants a lot, especially the ones on Fourth Street. And that’s when I acquired my taste for really spicy food. + + +00:16:40.680 --> 00:16:45.810 +RS: Did you have a favorite Fourth Street place? + + +00:16:45.910 --> 00:16:50.379 +AH: Oh man, what is that? I believe it was Burmese food. + + +00:16:50.380 --> 00:16:50.379 +RS: Mandalay? + + +00:16:50.380 --> 00:17:17.088 +AH: Yes, Mandalay. That was great. I had to stop going there though because the roommate that I had freshman year got a job there, and then we had a huge falling out and she literally asked me not to go [laughs]. We’re friends again now, but yeah, too late to keep on going to that restaurant. + + +00:17:17.089 --> 00:17:24.460 +RS: What about clubs or organizations? Did you belong to any? + + +00:17:24.730 --> 00:17:40.399 +AH: I don’t think so. I mean, there are little things that I did here or there, but. Like I was a part of a protest. I was a teaching assistant, an undergraduate teaching assistant for psychology. But no clubs or anything. + + +00:17:40.400 --> 00:17:59.349 +RS: What did you do for fun as a student? You’ve mentioned hanging out at home a little bit with the significant other and a very close friend. + + +00:17:59.350 --> 00:18:31.700 +AH: Yeah, I guess for fun, my memory is kind of hazy for some reason. I’m kind of a loner, so I guess . . . college is also when I started exercising, which I do all the time now. I ended up getting certified and teaching yoga. But it was through that whole like using classes to come out of my shell thing that I discovered how much I loved using my body to do things. So I started exercising a lot in college. + + +00:18:31.840 --> 00:18:57.860 +I also played like 200 hours of Skyrim. So yeah, played videogames. Talked a lot because that’s probably . . . my favorite thing to do with my friends is probably just sit around and talk. So yeah, not necessarily historically exciting but, you know, just hanging out. + + +00:18:58.170 --> 00:19:02.630 +RS: So you mentioned that you were part of a protest. + + +00:19:03.900 --> 00:19:02.630 +AH: Yeah. + + +00:19:03.900 --> 00:19:12.200 +RS: Yeah, so you were involved in some student activism? + + +00:19:12.360 --> 00:19:30.290 +AH: Yeah, I was. That one was . . . I know that it was a strike against rising tuition prices. Rising tuition I guess is probably just the best way to phrase that [laughs]. We were mad at the Board of Trustees. + + +00:19:30.570 --> 00:19:52.600 +An interesting thing that I do is I’ll sometimes protest things that I haven’t totally bought into, just to sort of be there and see what it’s about and to see each side’s perspective better. So I really was active in that for a few days even if I didn’t necessarily fully understand what the problems were. + + +00:19:52.690 --> 00:20:05.269 +It was pretty interesting though because I know at some point we were right outside a building. I don’t remember what the building’s called, but it’s where the Board of Trustees were having their meeting and everyone was protesting and stuff. + + +00:20:05.270 --> 00:20:29.229 +And one member of the board was standing in the window and laughing and stuff, and people were getting absolutely fucking enraged [laughs]. So it was really interesting to see students trying to fight back and getting super fired up and angry and then, you know, the people they were protesting against not really care anyway. + + +00:20:29.230 --> 00:20:40.169 +RS: Yeah. So there was that protest of the meeting, I guess. But do you remember any other activities that the students’ groups would? + + +00:20:40.170 --> 00:20:40.169 +AH: Like related to that protest? + + +00:20:40.170 --> 00:20:40.169 +RS: Yeah. + + +00:20:40.170 --> 00:20:55.349 +AH: Well, I mean, honestly what I remember from it was, it was super disorganized. Like there was a scramble to come up with a list of demands almost of things that they wanted it. I remember it being a really long, unfocused list. + + +00:20:55.350 --> 00:21:08.720 +I don’t remember what else was—I know there were meet ups, like I remember being a part of a huge group of people outside of like Woodburn or something everyone—I’m pretty sure we were eating apples. + + +00:21:09.360 --> 00:21:25.019 +I don’t remember what—I mean I guess really what stands out to me the most was that to me it seemed like there wasn’t much of an organized point to things, but people were definitely angry. + + +00:21:25.020 --> 00:21:27.800 +RS: Do you remember any other things from before maybe you got involved or after? + + +00:21:31.560 --> 00:21:48.870 +AH: No, I really don’t. I got extra credit to write a paper about what it was like to protest for it for my public speaking. Yeah, but maybe that explains why I don’t remember where it popped up from. + + +00:21:49.380 --> 00:21:57.000 +RS: Okay, yeah. That’s kind of cool that you got extra credit for that though. + + +00:21:58.770 --> 00:21:57.000 +AH: Yeah, that was a fun class. + + +00:21:58.770 --> 00:22:06.490 +RS: So do you remember any events, like IU or national, that happened while you were at IU? + + +00:22:06.850 --> 00:22:40.789 +AH: I remember Occupy Wall Street. Occupy Bloomington. Occupy IU. And so on and so forth. Yeah, I was really into that and went to a meeting for Occupy Bloomington. Same sort of thing happened though where it was like the organization was so scattered and just, you know, you have several people trying to take control of the movement in that particular place. + + +00:22:40.790 --> 00:23:04.739 +They have different agendas, and so I didn’t end up carrying on with that at all. I think I went to two meetings and then stopped going. Also because there was . . . at times it was like it was almost like they were trying to do an ideological shift where it’s like, it was almost like we need to have community based things, like everyone needs to come together to work towards a common goal and the people and all that. + + +00:23:04.740 --> 00:23:24.679 +And then there were other people that were really focused on just the economic thing or whatever, like, “Down with capitalism,” and stuff. It made it so hard to have a constructive conversation about anything because some people, like their tactics to get . . . what is the best tactic to protest? + + +00:23:24.680 --> 00:23:38.729 +Well, other people would think that you can only use tactics as long as it does not prop up capitalism in any way. So you can’t use anything that you buy basically. So it was crazy fucking ideological arguments like that that just led to nothing happening. + + +00:23:38.730 --> 00:23:50.930 +RS: So with Occupy Bloomington . . . do you remember how many were students and how many were like community members? + + +00:23:51.450 --> 00:24:11.739 +AH: I was at the first meeting, I believe. So it was pretty much all students. Now what I think it turned into is actually like a homeless shelter effort. But it was outside, so I think there were tents and they were bringing in food and stuff where there’s like a little square or blank space downtown essentially where— + + +00:24:11.740 --> 00:24:13.679 +RS: —Yeah, Peoples Park. + + +00:24:13.680 --> 00:24:30.549 +AH: Yeah. And I’m pretty sure that’s where they were headquartered. And they were trying to, I guess, just support the people living there. I believe that’s what it turned into for the most part. + + +00:24:30.550 --> 00:24:39.909 +RS: Were a lot of the students who were involved in Occupy Bloomington also involved in the tuition protest that you were involved in? + + +00:24:39.910 --> 00:24:56.580 +AH: You know, those were like two years apart. And I know the person who was organizing it, I believe—like the person who had organized IU Bloomington I believe had graduated and moved on at that point. So I don’t remember any of the same people. + + +00:24:58.010 --> 00:25:06.120 +RS: And so you also said that you remember Occupy Wall Street happening. So what do you remember about that? + + +00:25:07.510 --> 00:25:12.889 +AH: Occupy Wall Street was a huge movement that started out in New York on Wall Street, predictably [laughs]. + + +00:25:12.890 --> 00:25:12.889 +RS: It’s in the name. + + +00:25:12.890 --> 00:25:45.240 +AH: That was basically, man, “We are the 99 percent,” I believable was the chant, and it was about how 1 percent of the people—was it just the United States? I think the statistic is 1 percent in the United States own like 90 percent of the world’s wealth or something like that, the majority of the world’s wealth. And so it was trying to protest the people who control the funds essentially. + + +00:25:45.310 --> 00:25:57.409 +RS: Do you remember anything about what student opinion of that was like? Was this something you talked a lot about with your friends, or do you have any sense of how many people knew about it even? + + +00:25:57.410 --> 00:26:11.110 +AH: Yeah, well, all of my friends were really into it. And from what I remember, it was huge. Now, it could have just been because everyone that I knew was really into it because everyone that I knew was pretty into socialism and really liberal. + + +00:26:11.450 --> 00:26:38.359 +I remember hearing—I feel like at the time I got—I ostracized some family members because of my involvement in the Occupy Wall Street. So I know that there were people who disagreed with it. But as far as I can remember, I think a lot of the students supported the movement. Seems like a very supportable thing from a college student’s perspective. + + +00:26:38.360 --> 00:26:53.610 +RS: Yeah, and then going back to kind of the tuition protest and then maybe some of the Occupy Bloomington stuff, like how many students would you say were involved? + + +00:26:55.190 --> 00:27:17.570 +AH: Well, Occupy Bloomington was pretty small when I was involved. I’m not sure how big it grew. But the strike I remember there were over 100 people there for sure if not multiple hundreds. It was pretty big, and I know there was a march and everything through campus, which was supported by the campus. I believe we had police support and everything. + + +00:27:18.200 --> 00:27:26.579 +RS: And so this would have been—so this is the student strike, which is something different than the tuition protest, the Board of Trustees protest you talked about. + + +00:27:26.580 --> 00:27:43.689 +AH: No, I think those are the same thing. Yeah, that was all just one—well, no one really knows exactly what was the focus of the protest, but there were several things that were going on that people were unhappy about. + + +00:27:43.690 --> 00:27:58.789 +But yeah, I guess the common denominator there, throughout my college experience, was that people were pissed off because no one had any money and didn’t foresee that once they got out of college they were going to have money, despite having lots and lots of student loans. + + +00:27:58.790 --> 00:28:02.419 +RS: And then the strike specifically, like what was the action that the students took? + + +00:28:02.420 --> 00:28:29.200 +AH: Well, I know not attending classes for a day was a thing. I think, oh, harassing the Board of Trustees in the least illegal way possible. So you know, writing letters, all of that stuff. I really just remember the part of not attending classes because I think I ended up attending a class that day because I didn’t want to miss. + + +00:28:30.070 --> 00:28:37.729 +RS: Okay, cool. Yeah, were there any other events that you remember nationally? + + +00:28:37.730 --> 00:28:56.059 +AH: I remember the second election for Obama. I remember not voting for him. I voted for Jill Stein. I thought he was going to win. So I guess that made it pretty easy to not vote for him because I wasn’t really concerned about it. + + +00:28:56.060 --> 00:29:05.899 +RS: Do you remember like how involved students were in the election process? Was it something people were talking about a lot? + + +00:29:05.900 --> 00:29:12.120 +AH: I think they—I mean . . . I don’t remember who his opponent was. + + +00:29:12.160 --> 00:29:12.950 +RS: Romney. Mitt Romney. + + +00:29:13.030 --> 00:29:32.919 +AH: Romney, yeah. I don’t remember anyone being particularly concerned. So I mean, I guess when you compare it to the election that just happened with Hillary Clinton and Donald Trump, not nearly as much buzz as there was, you know, because it was incumbent. He was probably going to get it. + + +00:29:32.920 --> 00:29:32.919 +RS: Any other events or things? + + +00:29:32.920 --> 00:30:00.189 +AH: Oh yeah, you know, I remember Lauren Spierer got kidnapped. I remember that. That was a big deal. I’m pretty sure the entire time I was in college, there were billboards up for her. + + +00:30:00.190 --> 00:30:01.800 +RS: Yeah. Would that have happened your freshman or sophomore year? + + +00:30:02.920 --> 00:30:08.889 +AH: I think it happened in the summer after my freshman year. I think it happened in the summer. + + +00:30:08.890 --> 00:30:11.640 +RS: Do you remember anything in particular about that? + + +00:30:12.580 --> 00:30:42.420 +AH: I remember everything about that. I think we had a cat named after her because it was such a big deal. But I mean, I remember hearing things about, you know, speculation about who did it, and even though I’m so far removed from that person, I never met anyone who knew her directly. I definitely heard stories about how it supposedly happened, which I think . . . I don’t know. Should I share? + + +00:30:42.700 --> 00:30:43.740 +RS: Yeah, sure. + + +00:30:45.090 --> 00:31:07.799 +AH: Yeah, I think the dominant theory was that there was cocaine involved and she overdosed, and they hid the body. That’s always what I heard. Who knows? I’m sure the police have been tipped to that. Based on the fact that I know about it. + + +00:31:07.800 --> 00:31:07.799 +RS: Any other events? + + +00:31:07.800 --> 00:31:15.220 +AH: No. I don’t think so. + + +00:31:16.350 --> 00:31:18.050 +RS: Okay. I mean, that was quite a few. + + +00:31:20.160 --> 00:31:18.050 +AH: Busy years. + + +00:31:20.160 --> 00:31:25.610 +RS: What do you remember about the city of Bloomington from when you were in school? + + +00:31:25.770 --> 00:31:42.939 +AH: The city of Bloomington. I remember there being—there’s the IU bubble. There’s Kirkwood and downtown and then the campus, and it’s all beautiful and wonderful. And I actually worked on the south side of town for a summer. + + +00:31:42.940 --> 00:31:54.730 +And so part of when I think of Bloomington, I also think of this like surrounding area of typical southern Indiana, which is pretty interesting, like the juxtaposition between the two groups of people. + + +00:31:58.030 --> 00:32:27.720 +I remember it being very expensive. Very . . . nice, like a nice place to be for a liberal. Yeah, I mean it’s—I got along there better than Fort Wayne, I think, in some ways. But again, also very wealthy when you’re in the bubble. So that’s a little bit weird and stuck out to me. + + +00:32:28.680 --> 00:32:31.020 +RS: And you mentioned you worked a job. What was that? + + +00:32:32.640 --> 00:32:40.569 +AH: I was a car hop at Sonic drive in. So a roller-skating waitress. + + +00:32:40.570 --> 00:32:42.330 +RS: That’s pretty cool. + + +00:32:43.390 --> 00:32:58.080 +AH: Yeah. That was a very interesting job because that was really when I got to know people who lived in Bloomington but weren’t affiliated with the school. And how different it is, how different their lives are from the people who go to school there. + + +00:32:59.740 --> 00:33:04.810 +RS: Do you have any examples of those differences I guess? + + +00:33:07.150 --> 00:33:20.079 +AH: The socioeconomic factor is one. So the lack of disposable income. Kind of when I was in college, I was used to being around people who would just throw around their money and stuff. + + +00:33:20.080 --> 00:33:35.919 +And then when I worked there one of my managers was probably 25 at the time or something and was a manager at Sonic, you know, and watching him sort of try to build up to something to having a career, but not doing that via college. + + +00:33:35.920 --> 00:34:01.839 +But also like, drugs being sold out of that parking lot and drugs being done inside of that restaurant. And sort of, I had someone show me around one time who I worked with, and they took me to Cascades Park but showed me these different back ways to go and stuff. + + +00:34:01.840 --> 00:34:12.729 +Oh, and showed me how to go through the woods to the quarry or whatever so you could end up going into one of the quarries without getting in trouble. It’s one of the active ones too. So that was interesting, different. + + +00:34:12.730 --> 00:34:17.919 +RS: Was that the only job you had while you were a student? + + +00:34:17.920 --> 00:34:39.218 +AH: Other than being the undergraduate teaching assistant, which you can get paid for, but I only did it for one semester because it was my last semester, so I didn’t get paid for that. Yeah, that was the only job I had the whole time, because sort of back to the scholarships that I got. + + +00:34:39.219 --> 00:34:55.749 +I actually ended up getting $8,000 back a semester, I believe, from those, so I did not have to work at all, which was extremely nice because I was definitely struggling with mental health stuff at the time. + + +00:34:55.750 --> 00:35:12.420 +Because I think like one of the—I definitely had people who resented me for it, which I understood, you know, because there are some people who had to take out a bunch of loans to go to school and had to work and all that. And it was a lot harder for them. + + +00:35:12.790 --> 00:35:27.069 +But I think one of the things that people may not understand is that when you’re in certain situations and being not only just low income, but coming from certain family situations, can be really hard to learn how to function as an adult. + + +00:35:27.070 --> 00:35:51.999 +And I think that having that extra money during college made it possible for me to get through college actually. Because I don’t know if I would have been able to balance having a job and going to school at the same time with the way that my mental health was at the time. So those scholarships really not only paid for school but also just made it possible for me to sort of be upwardly mobile socially. + + +00:35:52.000 --> 00:35:56.730 +RS: Switching over more to like campus, do you remember anything about the buildings or any particularly buildings that you remember? + + +00:35:56.770 --> 00:36:19.199 +AH: I remember the Union because I used that building a lot and the extremely comfortable leather couches that I would wait for and scope out and very aggressively snatch once they were open. + + +00:36:19.200 --> 00:36:23.169 +RS: Would this be in the fireplace room? + + +00:36:23.170 --> 00:36:36.410 +AH: Yes, and there were also ones right above the hotel lobby. Now that I think about it, I did have another job because I worked for two weeks as a temporary bookseller for the IU bookstore. + + +00:36:36.700 --> 00:37:10.229 +Any other buildings? Let’s see. Oh, Ballantine and the stairs. That sticks out to me because that was extremely uncomfortable. Also I don’t know why that amount of stairs leaves you so breathless, more so than even running it seems? Although I’ve since heard that it’s because you stop breathing when you climb stairs because you’re thinking about the destination that you have to get to. + + +00:37:10.230 --> 00:37:12.059 +RS: Do you remember any parts of campus? + + +00:37:12.060 --> 00:37:36.070 +AH: You know, back to the buildings thing, one other thing, I do remember taking some African American studies classes, and their building being really shitty. And I know in women’s studies, they were getting notices, that there was asbestos in the ceiling. So that was weird. + + +00:37:36.370 --> 00:37:58.969 +I also remember there being rivalry between—like psychological and brain sciences had gotten some upgrades, but Kelley School of Business was getting an amazing renovation, my last year there it was just starting or something. I remember hearing staff and stuff talking about, you know, sort of like, “Those people get the best buildings,” and blah blah blah. + + +00:37:58.970 --> 00:38:08.879 +RS: Yeah, that’s kind of interesting. So one of the studies in African studies, this would have been like annex buildings, like in houses slightly off campus or? + + +00:38:08.880 --> 00:38:24.830 +AH: You know, I think, at least the class, they weren’t in houses I don’t think because I remember them being sort of by Chemistry uilding, I think. I think Third Street. That’s what that is. + + +00:38:25.290 --> 00:38:43.349 +I don’t know if I ever had a class in one of the annex buildings, but they were just some of the smaller older buildings, and those might have even been in the same building. If they weren’t, they were like right next to each other. + + +00:38:43.350 --> 00:38:48.659 +RS: How diverse was the campus when you attended? + + +00:38:48.660 --> 00:39:15.170 +AH: From where I was coming from, it felt not diverse at all really because it was, you know, most people were at least middle class if not upper middle class, I think. The majority of people were white. I feel like the most, like the largest minority was probably Asian, although that’s a pretty broad category of people, you know. + + +00:39:15.270 --> 00:39:38.199 +But to me it didn’t feel diverse. Now I’ve been other places since then where I’m like, “Oh, okay.” There is some diversity, especially I think through programs like 21st century scholars and some of the scholarships that IU offers. They manage to make it a little more diverse. + + +00:39:38.200 --> 00:39:45.309 +RS: But you kind of immediately had a sense that it was less diverse than where you’d come from? + + +00:39:45.310 --> 00:40:01.130 +AH: Yeah, it really freaked me out. And I mean, also I was just used to a certain type of culture, you know. So it’s like . . . and maybe inherently in that culture there’s just diversity, you know. But yeah, it was interesting. + + +00:40:01.340 --> 00:40:23.199 +I can even think of herds of people who were literally dressed exactly the same. And it’s like having massive amounts of people who are all doing the same thing. I can think of clothes that people would wear, like Sperry’s and like those rain boots, like the long rain boots that people in sororities really like to wear. + + +00:40:23.200 --> 00:40:27.360 +RS: Oh yeah. Not Uggs, but actual rainboots. + + +00:40:27.850 --> 00:40:57.039 +AH: Yeah, I think they might come from like American Apparel or something, and that’s another—like seeing a lot of people wearing American Apparel, which I’d never seen before in my life or whatever, but you just get used to it. And it’s like everyone is wearing the same type of stuff because it’s like what—I even bought some of that stuff when I first got there because I’m like, “Woah, everyone’s wearing it. I don’t want to be left out.” + + +00:40:57.040 --> 00:40:58.989 +RS: I can remember like everyone with a North Face parka. + + +00:40:58.990 --> 00:41:01.019 +AH: Yeah, yeah. That’s another brand too. + + +00:41:01.020 --> 00:41:02.979 +RS: It’s now switching to Canada Goose. + + +00:41:02.980 --> 00:41:05.040 +AH: [Laughs] Okay, it’s different now. You got to stay up with the times. + + +00:41:05.100 --> 00:41:09.009 +RS: When was the last time you visited campus? + + +00:41:09.010 --> 00:41:27.309 +AH: The last time I was at campus was the day that I moved away, which was in 2014 because that’s when I graduated probably like a month after my last final. Or a week after my last final. + + +00:41:27.310 --> 00:41:27.309 +RS: So almost four years now. + + +00:41:27.310 --> 00:41:56.589 +AH: Yeah. A long time. I miss Mother Bear’s the most. Oh, that’s probably something that I should have mentioned when I was talking about what I liked to do with my friends. The Munchie Madness special, I think you get a pizza and breadsticks and a two liter and two brownies for like $10.99. You cannot beat it. So delicious. + + +00:41:56.590 --> 00:41:58.659 +RS: Do you have a favorite Mother Bear’s pizza? + + +00:41:58.660 --> 00:42:07.230 +AH: Their meatballs are amazing. You can get their meatballs on their pizza. I think we would always get half meatball and half green olives. + + +00:42:07.330 --> 00:42:12.429 +RS: Any other restaurants or bars or places that you remember? + + +00:42:12.430 --> 00:42:31.749 +AH: I am sure that this no longer exists. It’s called HouseBar. That was right by my apartment that I lived at the last two years, so I went there a lot because it was really chill. They had picnic tables in the back and Christmas lights and a patio. + + +00:42:31.750 --> 00:42:55.749 +I smoked a lot of cigarettes in college, so I was always looking for bars where there was a nice place to sit down. Oh also, I think this also no longer exists. It was called Uncle E’s. It was a gay bar, and that was a really fun place. They had karaoke and stuff, and it was pretty big, and a lot of the people went there when I was there. + + +00:42:55.750 --> 00:42:57.519 +RS: Do you remember where that was? + + +00:42:57.520 --> 00:43:14.370 +AH: It was going on the west—I think if you took Third Street all the way towards like Walmart, it was like on the west side of town. So it was actually really, for a bar/club in Bloomington, it was pretty far away from the hub of what was going on. + + +00:43:14.460 --> 00:43:31.400 +RS: Any other ones? I remember HouseBar too. It wasn’t long ago that that kind of closed, but yeah, it was on Walnut, right? Next to the railroad tracks. + + +00:43:31.430 --> 00:43:31.400 +AH: Mmhmm. + + +00:43:31.430 --> 00:43:37.479 +RS: Because that restaurant too, The Rail, was there, and that also shut down. + + +00:43:37.480 --> 00:43:44.839 +AH: That does not surprise me because I went there once, and it was really overpriced and not that great [laughs]. + + +00:43:44.840 --> 00:44:02.899 +RS: They have a belated one-star review from you [laughs]. So tell me briefly about what you’ve done since leaving IU those four years ago almost. + + +00:44:02.900 --> 00:44:31.900 +AH: Well, the first job—I had a job before I graduated, like had a job lined up. I was going to be . . . I was going to work in a group home for people with learning disabilities, which I got through the orientation for that, was there on the first day, witnessed some pretty abusive practices, spoke up about it, and they basically told me that I just didn’t know what I was talking about. So I quit that job. + + +00:44:31.970 --> 00:44:44.670 +And then for a while I worked as a health navigator helping people sign up for Obamacare. That was through a nonprofit called Aspen and that’s based out of Indianapolis, but I could be based out of Fort Wayne because I moved back to Fort Wayne immediately after. + + +00:44:45.030 --> 00:45:05.799 +And I would just like travel around to different places like the Bowen Center, which is a mental health facility. And I would just sort of set up shop and then people would come, and I would help them fill out the healthcare.gov application. And then right after that, oh, I got a job at Starbucks. + + +00:45:05.800 --> 00:45:26.530 +So I did that for a year, sort of because partially, when I worked at Sonic, I actually like working in fast food because it’s fast paced and there’s lots to pay attention to. And you also get to make food. So I did that. I loved being a barista. Starbucks is awesome. + + +00:45:26.900 --> 00:45:47.549 +And then what did I do? Oh yeah, I went to Fort Wayne Center for Learning from there where I tutored kids with learning disabilities, and that, I think when I immediately got out of college and then quit that first job, I really freaked out. + + +00:45:47.550 --> 00:46:02.530 +I was like, “Oh my gosh. My degree does not do anything. I don’t know what I’m going to do. I don’t really have a plan.” And after having been in school for such a long time, it was just a really big change. + + +00:46:02.680 --> 00:46:20.749 +So once I started working though, my psychology degree has been really helpful, and I think some of the stuff that I learned just about critically thinking and even some of the stuff I have learned about cognitive distortions and not thinking logically, those things haven’t really come in handy. + + +00:46:20.750 --> 00:46:33.439 +And sometimes I watch people solve problems, and I just can point out the cognitive distortion they’re using. I’m like, “Man, thank you IU and psychological and brain sciences for teaching me how to think logically.” + + +00:46:33.440 --> 00:46:54.919 +And then especially at the Fort Wayne Center for Learning, being a tutor, sort of having a background of mental disorders and all that stuff made it a lot easier to approach that job, and they were really thankful that I had that background because no one else really did. + + +00:46:54.920 --> 00:47:16.579 +And so I was able to explain a lot of the stuff that was going on or at least what I thought was going on from my perspective. And then I just recently got a job at Lincoln Financial Group as a customer service representative, which is another place where the psychology degree has been really helpful. + + +00:47:16.580 --> 00:47:45.169 +I also think like IU . . . I had a required class for making a resume and how to network briefly and just sort of a rundown of all the jobs that you could do with a psychology degree, and that class was actually immensely helpful. So yeah, that kind of led me down a pretty good path. I’m pretty happy with what I’ve been able to turn the degree and my work experience into. + + +00:47:45.170 --> 00:48:19.230 +RS: I only have a few more questions left. Two, to be specific. I guess a couple would be more accurate to say. You know, having graduated fairly recently and navigated a couple of work experiences, what sort of advice would you give to a student who’s either about to start college or in college or getting toward the end of that experience? + + +00:48:19.840 --> 00:48:47.079 +AH: I would say unless someone is paying you to go to college, if you don’t know what you want to do, don’t go to college [laughs]. Because there is even—now that I’m older, there are some things where I’m like, “Wow, that’s really interesting to me.” But I’ve already used a lot of money to go to college. And so I’m not going to go back and, you know, start from the ground up again and study those things. + + +00:48:47.080 --> 00:49:16.279 +I think there is some merit to waiting until you’re older and sort of figure out what you enjoy doing before you decide what to spend a bunch of money studying. I also would say . . . I mean, pick something that—let’s say you’re in my position, and you are going to go to college or someone paying for you to go, pick something that is really personally interesting to you. + + +00:49:16.280 --> 00:49:35.029 +I don’t know, because I mean, a lot of people, I heard a statistic that 50 percent of doctors wish they had chosen a different job. So just because you do pick something that is going to lead directly to a job doesn’t mean that you’re going to be pleased with that choice. + + +00:49:35.030 --> 00:49:55.429 +So I was really—even when there were times when I didn’t think that my degree had really done anything for me, I was really happy that I chose something that was really interesting to me because I ended up—because I was interested in it, there was a reason I was. And it helped me with a lot of different areas of my life for just sort of figuring things out. + + +00:49:55.430 --> 00:49:57.319 +RS: And then final, official question: what does IU mean to you? + + +00:49:57.320 --> 00:50:40.840 +AH: What does IU mean to me? IU was a great steppingstone for really experiencing something different. I know I’ve said a lot that it freaked me out. I was shocked when I got there. But it was all a part of a big learning, growing experience and sort of getting exposed to a way of living or like—I don’t want to say like a class, but kind of, you know, that I have never seen before. So I guess what it means to me is just change and growth and opportunity. + + +00:50:40.880 --> 00:50:47.790 +RS: Do you have anything else you want to add? Other than your like Queen Elizabeth wave right there? + + +00:50:50.100 --> 00:50:59.290 +AH: [Laughs] Miss America. You’re welcome. Thank you. No, I don’t think so. + + +00:51:00.030 --> 00:51:03.190 +RS: All right, thank you very much. + + +00:51:03.710 --> 00:51:03.190 +AH: Thank you. + + +00:51:03.710 --> 00:51:14.660 +RS: So we actually have one final question. What was the academic environment like for women on campus while you were there? + + +00:51:15.760 --> 00:51:35.899 +AH: Aggressively supportive. I don’t know which wave of feminism we’re on at this point, but I know that the internet has made it a lot easier to talk about, made it more visible. And I definitely took a lot of women’s studies classes. + + +00:51:35.900 --> 00:51:57.239 +I don’t . . . some of the women’s studies classes I definitely felt were almost biased in the other direction. You know, sort of using Freudian theory to prop up what was happening in the media. + + +00:51:57.240 --> 00:52:15.689 +Which for me is kind of a stretch, but you know, once you bring up Freud, having studied psychology makes it sort of a weird thing, but I don’t recall ever feeling left out of anything for being a woman. So I would say barring the classes where that was literally the topic that was being discussed, it seemed pretty equal. + + +00:52:15.690 --> 00:52:24.419 +RS: And did you ever have any experiences of sexism or heard about any? + + +00:52:24.420 --> 00:53:04.959 +AH: I remembered like—I was never personally, nothing ever happened to me. But I remember people talking about fraternities not being safe places basically and just sort of . . . I mean, I don’t think some of the stuff—I don’t know if it really had anything to do with IU, or if it’s just so much like the culture of everyone, you know, of people binge drinking and then making really bad decisions. + + +00:53:04.960 --> 00:53:46.600 +And in case anyone ever listens to this, that’s not just me talking about people who were victimized. It’s not like that, you know. But I mean people, date rape. I think I brought that—I made an off color joke one time in my public speaking class where someone was like, “Okay, we’re going to do word association. Fraternities. What does that make you think of?” And I was like, “Date rape.” And that everyone in the room was like, “Oh!” And people started laughing and stuff so that definitely seemed like it was a dominant rhetoric. + + +00:53:47.290 --> 00:53:48.840 +RS: Mmhmm. Anything else to add to that or anything else? + + +00:53:52.720 --> 00:53:54.549 +AH: No. + + +00:53:54.550 --> 00:53:58.230 +RS: Do you want to do your wave again? + + +00:54:00.750 --> 00:53:58.230 +AH: [Laughs] Yeah. Thank you, thank you. + + +00:54:00.750 --> 00:54:01.600 +RS: All right. Thank you so much. \ No newline at end of file diff --git a/spec/cypress/integration/browse_spec.js b/spec/cypress/integration/browse_spec.js index 4bc3967575..a752ce0940 100644 --- a/spec/cypress/integration/browse_spec.js +++ b/spec/cypress/integration/browse_spec.js @@ -13,8 +13,11 @@ * specific language governing permissions and limitations under the License. * --- END LICENSE_HEADER BLOCK --- */ +import HomePage from '../pageObjects/homePage'; context('Browse', () => { + const homePage = new HomePage(); + it('should use the base URL', () => { cy.visit('/'); // This will navigate to CYPRESS_BASE_URL cy.screenshot() @@ -24,12 +27,12 @@ context('Browse', () => { it('.browse_navigation()', () => { cy.login('administrator') cy.visit('/') - cy.contains('Browse').click() + homePage.getBrowseNavButton().click() }) it('Verify searching for an item by keyword - @T9c1158fb', () => { cy.visit('/') - cy.get("li[class='nav-item'] a[class='nav-link']").click() + homePage.getBrowseNavButton().click() //create a dynamic item here and use a portion of it as a search keyword const media_object_title = Cypress.env('MEDIA_OBJECT_TITLE') cy.get("input.global-search-input[placeholder='Search this site']").first().type(media_object_title).should('have.value', media_object_title) // Only yield inputs within form @@ -41,7 +44,7 @@ context('Browse', () => { it('Verify browsing items by a format - @Tb477685f', () => { cy.visit('/') - cy.get("li[class='nav-item'] a[class='nav-link']").click() + homePage.getBrowseNavButton().click() cy.contains('button', 'Format').click() cy.contains('a', 'Moving Image').click() cy.get('.constraint-value').within(() => { diff --git a/spec/cypress/integration/collections_spec.js b/spec/cypress/integration/collections_spec.js index bc3820e8f1..8b438dc249 100644 --- a/spec/cypress/integration/collections_spec.js +++ b/spec/cypress/integration/collections_spec.js @@ -18,13 +18,15 @@ context('Collections', () => { //Since it takes a while for a newly created collection to reflect in search, we are using static search data var search_collection = Cypress.env('SEARCH_COLLECTION') var collection_title = `Automation collection title ${Math.floor(Math.random() * 10000) + 1}` - + Cypress.on('uncaught:exception', (err, runnable) => { // Prevents Cypress from failing the test due to uncaught exceptions in the application code - TypeError: Cannot read properties of undefined (reading 'scrollDown') if (err.message.includes('Cannot read properties of undefined (reading \'success\')')) { return false; } }); + + // checks navigation to Browse it('Verify whether an admin user is able to create a collection - @T553cda51', () => { cy.login('administrator') @@ -59,12 +61,13 @@ context('Collections', () => { cy.visit('/') cy.get('a[href="/collections"]').click() //Using an existing collection for this test case for now, since it takes a while for the newly created test case to get reflected - // Generate a random index to slice the title - const startIndex = Math.floor(Math.random() * (search_collection.length-3)); - const sliceLength = Math.floor(Math.random() * (search_collection.length - startIndex)) + 1; // Random slice length - //slice a random portion of the collection title as the search keyword to ensure variablitity in testing - const search_keyword = search_collection.slice(startIndex, startIndex + sliceLength) - cy.get('input[placeholder="Search collections..."]').type(search_keyword).should('have.value', search_keyword) + //The below code to generate random slice of the collection name is failing. hence, we are using the full colelction name for now + // Generate a random index to slice the title + // const startIndex = Math.floor(Math.random() * (search_collection.length-3)); + // const sliceLength = Math.floor(Math.random() * (search_collection.length - startIndex)) + 1; // Random slice length + // //slice a random portion of the collection title as the search keyword to ensure variablitity in testing + // const search_keyword = search_collection.slice(startIndex, startIndex + sliceLength) + cy.get('input[placeholder="Search collections..."]').type(search_collection).should('have.value', search_collection) cy.get('.card-body').contains('a', search_collection); }) @@ -75,7 +78,7 @@ it('Verify whether an admin/manager is able assign other users as managers to th cy.get('#manageDropdown').click() cy.contains('Manage Content').click() cy.contains('a', collection_title).click(); - const user_manager = Cypress.env('USER_MANAGER') + const user_manager = Cypress.env('USER_MANAGER_USERNAME') cy.get("#add_manager_display").type(user_manager).should('have.value', user_manager) // Verify that the correct suggestions appear in the dropdown and click it cy.get('.tt-menu .tt-suggestion') @@ -178,6 +181,19 @@ it('Verify whether a user is able to update Collection information - @Ta1b2fef8' }) +it('Verify whether a user is able to update poster image - @T26526b2e', () => { + cy.login('administrator') + cy.visit('/') + cy.get('#manageDropdown').click() + cy.contains('Manage Content').click() + cy.contains('a', collection_title).click(); + cy.get('#poster_input').selectFile('spec/cypress/fixtures/image.png', { force: true }); + cy.wait(5000) + cy.screenshot() + cy.get('button#crop').click() + cy.get('.alert-success').should('be.visible').and('contain', 'Poster file successfully added.'); + +}) //Teardown code : delete the created collection it('Verify deleting a collection - @T959a56df', () => { @@ -194,4 +210,7 @@ it('Verify whether a user is able to update Collection information - @Ta1b2fef8' }) + + + }) diff --git a/spec/cypress/integration/item_spec.js b/spec/cypress/integration/item_spec.js new file mode 100644 index 0000000000..1a4b1554b6 --- /dev/null +++ b/spec/cypress/integration/item_spec.js @@ -0,0 +1,350 @@ +/* + * Copyright 2011-2024, The Trustees of Indiana University and Northwestern + * University. Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * --- END LICENSE_HEADER BLOCK --- + */ + +context('Item', () => { + //Create dynamic items here + const collection_title = Cypress.env('SEARCH_COLLECTION'); + var item_title = `Automation Item title ${Math.floor(Math.random() * 100000) + 1}` + let item_id; + + Cypress.on('uncaught:exception', (err, runnable) => { + // Prevents Cypress from failing the test due to uncaught exceptions in the application code - TypeError: Cannot read properties of undefined (reading 'scrollDown') + if ( + err.message.includes( + "Cannot read properties of undefined (reading 'success')" + ) + ) { + return false; + } + }); + + + + it('Verify creating an item under a collection - @T139381a0', () => { + // Log in as an administrator + cy.login('administrator'); + + // Visit the home page + cy.visit('/'); + + // Go to an existing collection to create an item + cy.get('#manageDropdown').click(); + cy.contains('Manage Content').click(); + cy.contains('a', collection_title).click(); + cy.contains('a', 'Create An Item').click(); + + // Upload a video from fixtures and continue + // cy.get('li.nav-item.nav-success').contains('a.nav-link', 'Manage files').click(); + const videoName = 'test_sample.mp4'; + cy.get('div#file-upload input[type="file"][name="Filedata[]"]').selectFile( + `spec/cypress/fixtures/${videoName}`, + { force: true } + ); + cy.wait(5000); + + // Click the Upload button to submit the form, force the click action + cy.get('div#file-upload a.fileinput-submit').click({ force: true }); + + // Wait for the upload process to complete (you might need to wait for a success message or network request) + cy.wait(5000); + + // Verify that the file appears in the list of uploaded files and save and continue + cy.get('#associated_files .card-body').should('contain', videoName); // Adjust the selector as needed + cy.get('input[name="save_and_continue"][value="Continue"]').click(); + + // Fill the mandatory fields in the resource description and save and continue + cy.get('input#media_object_title') + .type(item_title) + .should('have.value', item_title); + const publicationYear = String( + Math.floor(Math.random() * (2020 - 1900 + 1)) + 1900 + ); + cy.get('input#media_object_date_issued') + .type(publicationYear) + .should('have.value', publicationYear); + cy.get( + 'input[name="save_and_continue"][value="Save and continue"]' + ).click(); + + // Navigate to the preview page by passing through structure and access control page + //structure page + cy.get( + 'input[name="save_and_continue"][value="Continue"]' + ).click() + //Access control page + cy.get( + 'input[name="save_and_continue"][value="Save and continue"]' + ).click() + + + // Validate the item title, collection, and publication date + cy.get('.page-title-wrapper h2').should('contain.text', item_title); + + cy.get('div.ramp--tabs-panel').within(() => { + cy.get('div.tab-content dt') + .contains('Date') + .next('dd') + .should('have.text', publicationYear); + cy.get('div.tab-content dt') + .contains('Collection') + .next('dd') + .contains(collection_title); + }); + + //Extract the item id to run the rest of the tests + cy.url().then((url) => { + item_id = url.split('/').pop(); // Extract the media object ID from the URL + }); + }); + + it('Verify whether a user can publish an item - @T1faa36d2', () => { + cy.login('administrator'); + cy.visit('/'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + item_id); + cy.get('#administrative_options a').contains('Publish').click(); + + //validate success message + cy.get('div.alert p').contains('1 media object successfully published.'); + cy.get('#administrative_options a').contains('Unpublish'); + + //reload the page to ensure that the data is updated in the backend + cy.reload(); + cy.get('#administrative_options a').contains('Unpublish'); + }); + + it('Verify setting Item access to “Collections staff only” for a published item - @T13b097f8', () => { + cy.login('administrator'); + cy.visit('/'); + cy.visit('/media_objects/' + item_id+'/edit?step=access-control'); + cy.get('.item-access').within(() => { + cy.contains('label', 'Collection staff only') + .find('input[type="radio"]') + .click() + .should('be.checked'); + }); + cy.get('input[type="submit"][name="save"]').click(); +//reload the page to ensure that the data is updated in the backend +cy.reload() +cy.contains('label', 'Collection staff only') +.find('input[type="radio"]').should('be.checked'); + + //Login as a user who is not a staff to collection to validate the result + //login as a user who is a staff to the collection and verify that the item is accessible + }); + + it('Verify setting Item access to “Logged in users only” for a published item - @T0cc6ee02', () => { + cy.login('administrator'); + cy.visit('/'); + cy.visit('/media_objects/' + item_id+'/edit?step=access-control'); + cy.get('.item-access').within(() => { + cy.contains('label', 'Logged in users only') + .find('input[type="radio"]') + .click() + .should('be.checked'); + }); + cy.get('input[type="submit"][name="save"]').click(); + //reload the page to ensure that the data is updated in the backend + cy.reload() + cy.contains('label', 'Logged in users only') + .find('input[type="radio"]').should('be.checked'); + + //Additional assertions:: + //Logout of the application and verify that the item is not visible + //login as any non collection staff user and validate the result + }); + + it('Verify setting Item access to “Available to general public” for a published item - @T593dc580', () => { + cy.login('administrator'); + cy.visit('/'); + cy.visit('/media_objects/' + item_id+'/edit?step=access-control'); + cy.get('.item-access').within(() => { + cy.contains('label', 'Available to the general public') + .find('input[type="radio"]') + .click() + .should('be.checked'); + }); + cy.get('input[type="submit"][name="save"]').click(); + //reload the page to ensure that the data is updated in the backend + cy.reload() + cy.contains('label', 'Available to the general public') + .find('input[type="radio"]').should('be.checked'); + + //Additional assertion:: Verify item access without logging in + }); + + it('Verify setting Special access for an Avalon user - published item - @Ta15294e5', () => { + cy.login('administrator'); + cy.visit('/'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + item_id+'/edit?step=access-control'); + const user_username = Cypress.env('USERS_USER_USERNAME'); + //Assign special access - Avalon user (who is not associated with the collection) + cy.get('.card.special-access') + .find('input#add_user_display') + .type(user_username) + .should('have.value', user_username); + cy.screenshot() + cy.get('input[id="add_user_display"]') + .closest('.form-group') // Find the closest form-group div that contains this input + .find('button[name="submit_add_user"]') + .click(); + //reload the page to ensure that the data is updated in the backend + // Additional assertion:: Login as the special access user and validate the result + }); + + + it('Verify that modifying the resource metadata fields are reflected properly in the preview section- @T16bc91af', () => { + cy.login('administrator'); + cy.visit('/'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + item_id); + cy.get('#administrative_options').find('a.btn').contains('Edit').click(); + cy.get('li.nav-item.nav-success') + .contains('a.nav-link', 'Resource description') + .click(); + + //Add some resource metadata fields in the resource description section + //More fields can be added if required. + const main_contributor = Cypress.env('MEDIA_OBJECT_FIELD_MAIN_CONTRIBUTOR'); + const language = Cypress.env('MEDIA_OBJECT_FIELD_LANGUAGE'); + const summary = + "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."; + + cy.get('input#media_object_creator_0') + .clear() + .type(main_contributor) + .should('have.value', main_contributor); + cy.get('input#display_media_object_language_0') + .clear() + .type(language) + .should('have.value', language); + cy.get('textarea#abstract_0') + .clear() + .type(summary) + .should('have.value', summary); + cy.get( + 'input[name="save_and_continue"][value="Save and continue"]' + ).click(); + + // Navigate to the preview page + cy.get('li.nav-item.nav-success').contains('a.nav-link', 'Preview').click(); + + //Validate the fields + cy.get('div.ramp--tabs-panel').within(() => { + cy.get('div.tab-content dt') + .contains('Summary') + .next('dd') + .should('have.text', summary); + + // Validate the "Language" field + cy.get('div.tab-content dt') + .contains('Language') + .next('dd') + .should('have.text', language); + + // Validate the "Main contributor" field + cy.get('div.tab-content dt') + .contains('Main contributor') + .next('dd') + .should('have.text', main_contributor); + }); + }); + + it('Verify modifying the resource metadata of an item reflects in the index- @Tec49689f', () => { + cy.login('administrator'); + cy.visit('/'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + item_id); + cy.get('#administrative_options').find('a.btn').contains('Edit').click(); + cy.get('li.nav-item.nav-success') + .contains('a.nav-link', 'Resource description') + .click(); + + //Add some resource metadata fields in the resource description section to search via index + const genre = Cypress.env('MEDIA_OBJECT_FIELD_GENRE'); + + cy.get('input#media_object_genre_0') + .clear() + .type(genre) + .should('have.value', genre); + cy.get('input[name="save"][value="Save"]').click(); + cy.get( + 'input[name="save_and_continue"][value="Save and continue"]' + ).click(); + + //Navigate to the browse section and search for the item_title + cy.contains('a.nav-link', 'Browse').click(); + cy.get("input.global-search-input[placeholder='Search this site']") + .first() + .type(item_title) + .should('have.value', item_title); // Only yield inputs within form + cy.get('button.global-search-submit').first().click(); + + //Filter using the added resource meta data ie: GENRE + cy.contains('button', 'Genres').click(); + cy.get('span.facet-label').contains('a', genre).click(); + + //Validate that the item is indexed in the search and is shown under the correct series facet + cy.get('div#documents').within(() => { + cy.get('h3.index_title.document-title-heading').contains(item_title); + }); + }); + + //This case and thus the following case may fail intermittently since the item sometimes takes too long to load, + //and the timeline button is disabled + it('Verify if a user is able to create timelines under an item - @T9972f970', () => { + cy.login('administrator'); + cy.visit('/'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + item_id); + cy.wait(3000) //wait for timeline button to load + cy.get('#timelineBtn').click(); + cy.get('#timelineModalSave').click() + //validate the timeline page elements + cy.wait(3000) //wait for timeline page to load + cy.contains('div.app') + cy.contains('h6',"Timeline information") + cy.contains('h3',item_title) + //Validate the "Add to playlist options" + }); + + it('Verify deleting a timeline - @T89215320', () => { + cy.login('administrator'); + cy.visit('/timelines'); + cy.get('#Timelines_filter input[type="search"]') + .type(item_title) + .should('have.value', item_title); + cy.get('tr') + .contains('td', item_title) + .parent('tr') + .find('.btn-danger') + .click(); + cy.contains('Yes, Delete').click(); + cy.get('div.alert').contains('Timeline was successfully destroyed.') + }); + + //teardown code: delete the created item + // Final test to run at the end + it('Verify deleting an item - @Tf46071b7', () => { + cy.login('administrator'); + cy.visit('/media_objects/' + item_id); + cy.get('#administrative_options').find('a.btn').contains('Edit').click(); + cy.get('a#special_button_color').contains('Delete this item').click(); + cy.get('a#deleteLink').contains('Yes, I am sure').click(); + cy.get('div.alert').contains('1 media object deleted.'); + }); +}); diff --git a/spec/cypress/integration/homepage_spec.js b/spec/cypress/integration/loginPage_spec.js similarity index 60% rename from spec/cypress/integration/homepage_spec.js rename to spec/cypress/integration/loginPage_spec.js index 8c7745b81c..5d6379f74c 100644 --- a/spec/cypress/integration/homepage_spec.js +++ b/spec/cypress/integration/loginPage_spec.js @@ -13,33 +13,61 @@ * specific language governing permissions and limitations under the License. * --- END LICENSE_HEADER BLOCK --- */ +import LoginPage from '../pageObjects/loginPage'; +import HomePage from '../pageObjects/homePage'; -context('Homepage', () => { +context('Login page', () => { + const loginPage = new LoginPage(); + const homePage = new HomePage(); - // validates presence of header and footer on homepage for logged-in user - it('.sign_in_feature_testing()', () => { + it('Verify if a user is able to log in', () => { + loginPage.visit(); + loginPage.fillEmail(Cypress.env('USERS_USER_EMAIL')); + loginPage.fillPassword(Cypress.env('USERS_USER_PASSWORD')); + loginPage.submit(); + + // Assert that user is signed in successfully + homePage.getLoginSuccessAlert(); + }) + + it('should log out successfully', () => { + cy.login('user') + cy.visit('/') + // Logout + homePage.logout(); + // Assert that the login page is visible + homePage.getLogoutSuccessAlert(); + //assert user can visit the login page from here + loginPage.visit(); + }); + + + // validates presence of header and footer on homepage for logged-in user + it('.sign_in_feature_testing()', () => { cy.login('user') cy.visit('/') cy.get('#playlists_nav') - }) + }) - // validates absence of features when not logged in - it('.public_user_feature_testing()', () => { + // validates absence of features when not logged in + it('.public_user_feature_testing()', () => { cy.visit('/') cy.get('#timelines_nav').should('not.exist'); cy.get('#playlists_nav').should('not.exist'); cy.get('#bookmarks_nav').should('not.exist'); cy.get('#manageDropdown').should('not.exist'); - }) + cy.get('a[href="/users/sign_in"]').should('exist') + }) - // checks navigation to external links - it('.external_links()', () => { + + // checks navigation to external links + it('.external_links()', () => { cy.visit('/') cy.get(' a[href*="/"] ').first().click() - }) + }) - // checks navigation to Contact us page - it('.Contact_us()', () => { + // checks navigation to Contact us page + it('.Contact_us()', () => { cy.visit('/') cy.contains('Contact Us').click() cy.url().should('include', '/comments') @@ -49,10 +77,10 @@ context('Homepage', () => { cy.contains('Subject') cy.contains('Comment') cy.contains('Submit comments') - }) + }) - // verifies presence of features after login - it('.feature_verfication_login()', () => { + // verifies presence of features after login + it('.feature_verfication_login()', () => { cy.login('administrator') cy.visit('/') cy.contains('Playlists') @@ -60,10 +88,10 @@ context('Homepage', () => { cy.contains('Manage Groups') cy.contains('Manage Worker Jobs') cy.contains('Sign out') - }) + }) - // Sign in page - it('.describe_sign_in_page() - click on a DOM element', () => { + // Sign in page + it('.describe_sign_in_page() - click on a DOM element', () => { cy.visit('/') cy.get('a[href*="/users/sign_in"] ').first().click() cy.contains('Username or email').click() @@ -71,27 +99,28 @@ context('Homepage', () => { cy.contains('Password') cy.contains('Sign up') cy.contains('Connect') - }) + }) - // validates presence of items on register page - it('.validate_register_page()', () => { + // validates presence of items on register page + it('.validate_register_page()', () => { cy.visit('/users/sign_up') cy.contains('Username') cy.contains('Email') cy.contains('Password') cy.contains('Password confirmation') cy.contains('Sign up') - }) + }) - // is able to create new account - it('.create_new_account()', () => { + // is able to create new account + it('.create_new_account()', () => { cy.visit('/users/sign_up') cy.get('form.new_user').within(() => { cy.get('#user_username').type('Sumith').should('have.value', 'Sumith') // Only yield inputs within form cy.get('#user_email').type('sumith3@example.com').should('have.value', 'sumith3@example.com') // Only yield inputs within form cy.get('#user_password').type('sumith3') // Only yield textareas within form cy.get('#user_password_confirmation').type('sumith3') // Only yield textareas within form - }) + }) cy.get('input[name=commit]').last().click() - }) + }) + }) diff --git a/spec/cypress/integration/media_object_spec.js b/spec/cypress/integration/media_object_spec.js index e2b168c21f..8c36674cfb 100644 --- a/spec/cypress/integration/media_object_spec.js +++ b/spec/cypress/integration/media_object_spec.js @@ -1,60 +1,119 @@ -/* +/* * Copyright 2011-2024, The Trustees of Indiana University and Northwestern * University. Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. - * + * * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR * CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. * --- END LICENSE_HEADER BLOCK --- -*/ + */ context('Media objects', () => { + const media_object_id = Cypress.env('MEDIA_OBJECT_ID_2'); + const media_object_title = Cypress.env('MEDIA_OBJECT_TITLE_2'); + const caption = Cypress.env('MEDIA_OBJECT_CAPTION_2'); - const media_object_id = Cypress.env('MEDIA_OBJECT_ID') - const media_object_title = Cypress.env('MEDIA_OBJECT_TITLE') + beforeEach(() => { + cy.login("administrator") + cy.visit('/media_objects/' + media_object_id); + }); // can visit a media object it('.visit_media_object()', () => { - cy.login('administrator') - // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. - cy.visit('/media_objects/' + media_object_id) - cy.contains('Unknown item').should('not.exist') - cy.contains(media_object_title) - cy.contains('Main contributor') - cy.contains('Date') - // This below line is to play the video. If the video is not playable, this might return error. In that case, comment the below code. - cy.get('button[title="Play"]').click() - }) + cy.login('administrator'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + media_object_id); + cy.contains('Unknown item').should('not.exist'); + cy.contains(media_object_title); + cy.contains('Date'); + // This below line is to play the video. If the video is not playable, this might return error. In that case, comment the below code. + cy.get('button[title="Play"]').click(); + }); // Open multiple media objects in different tabs and play it. it.skip('.play_media_objects()', () => { - cy.login('administrator') - cy.visit('/') - cy.get('a[href*="catalog"] ').first().click() - //cy.get(' a[href*="/media_objects/"] ').first().click() - cy.get('a[href*="media_objects').then((media_objects) => { - function printObject(o) { - var out = ''; - for (var p in o) { - out += p + ': ' + o[p] + '\n'; - } - alert(out); - } - var i; - for (i = 0; i < 3; i += 2) { - //media_objects[i].click() - //cy.get('div').should('have.class', 'mejs__overlay-play').first().click() - window.open(media_objects[i]) - cy.visit(String(media_objects[i])) - // Below code is to make media play - cy.window().get('div').should('have.class', 'mejs__overlay-play').first().click({ force: true }) - } - }) - }) -}) + cy.login('administrator'); + cy.visit('/'); + cy.get('a[href*="catalog"] ').first().click(); + //cy.get(' a[href*="/media_objects/"] ').first().click() + cy.get('a[href*="media_objects').then((media_objects) => { + function printObject(o) { + var out = ''; + for (var p in o) { + out += p + ': ' + o[p] + '\n'; + } + alert(out); + } + var i; + for (i = 0; i < 3; i += 2) { + //media_objects[i].click() + //cy.get('div').should('have.class', 'mejs__overlay-play').first().click() + window.open(media_objects[i]); + cy.visit(String(media_objects[i])); + // Below code is to make media play + cy.window() + .get('div') + .should('have.class', 'mejs__overlay-play') + .first() + .click({ force: true }); + } + }); + }); + + it('Verify the icons in a video player - @Tb155c718', () => { + cy.get('.vjs-big-play-button[title="Play Video"]').should('exist'); //validates the centre play button + cy.get('.vjs-play-control[title="Play"]').should('exist'); //validates the play button in the control bar + cy.get('#slider-range'); //validates the slider + cy.get('.vjs-subs-caps-button[title="Captions"]').should('exist'); //validates the captions button + cy.get('.vjs-mute-control[title="Mute"]').should('exist'); //validates the Audio button + cy.get('button[title="Open quality selector menu"]').should('exist'); //validates the quality selector button + cy.get('button[title="Playback Rate"]').should('exist'); //validates the playback rate button + cy.get('button[title="Fullscreen"]').should('exist'); //validates the playback rate button + }); + + it('Verify whether the user is able to adjust volume in the audio player - @T2e46961f', () => { + // Assume the video player is already loaded and accessible + cy.get('.vjs-mute-control').as('muteButton'); + cy.get('.vjs-volume-bar').as('volumeBar'); + + // Check initial state if needed + cy.get('@volumeBar').invoke('attr', 'aria-valuenow').should('eq', '100'); // Checking initial volume level, adjust as needed + + // Click to mute and verify + cy.get('@muteButton').click(); + cy.get('@muteButton').should('have.class', 'vjs-vol-0'); // Checking if the mute button reflects the muted state + + + //This part is failing - need to fix this + + // Adjust volume using the volume control slider + cy.get('@volumeBar') + .invoke('val', 50) + .trigger('input', { force: true }) + .trigger('change', { force: true }); // Adjust the slider to a midpoint value + + // Verify the volume has been adjusted + cy.get('@volumeBar').invoke('attr', 'aria-valuenow').should('eq', '50'); // Confirm the slider reflects the new volume level + + + + }); + + it('Verify turning on closed captions - @T4ceb4111', () => { + // Access the closed captions button + cy.get('.vjs-subs-caps-button').as('ccButton'); + cy.get('@ccButton').click(); + // Select the caption + cy.contains('li.vjs-subtitles-menu-item', caption).click(); + // Assert that the captions are enabled - the class name should change to captions-on + cy.get('@ccButton').should('have.class', 'captions-on'); // Change 'captions-on' to the actual class or attribute that indicates active captions + + //Add more assertions here to verefy captions on the screen + }); +}); diff --git a/spec/cypress/integration/navigation_spec.js b/spec/cypress/integration/navigation_spec.js index 763a6176e4..72e62f395d 100644 --- a/spec/cypress/integration/navigation_spec.js +++ b/spec/cypress/integration/navigation_spec.js @@ -55,15 +55,6 @@ context('Navigations', () => { cy.contains('manager') }) - // checks naviagtion to Playlist - it('.playlists()', () => { - cy.login('administrator') - cy.visit('/') - cy.contains('Playlists').click() - cy.contains('Playlists') - cy.contains('Create New Playlist') - }) - // is able to sign out it('.signout()', () => { cy.login('administrator') diff --git a/spec/cypress/integration/playlist_spec.js b/spec/cypress/integration/playlist_spec.js index 074237a14d..dd9fd07ce6 100644 --- a/spec/cypress/integration/playlist_spec.js +++ b/spec/cypress/integration/playlist_spec.js @@ -15,234 +15,294 @@ */ context('Playlists', () => { - //Playlist names start with '_' character for easy navigation without pagination - var playlist_title = `_Automation playlist title ${Math.floor(Math.random() * 10000) + 1 - }`; - var playlist_description = `${playlist_title} description`; - var playlist_title_public = `_Automation public playlist title ${Math.floor(Math.random() * 10000) + 1 - }`; - var playlist_description_public = `${playlist_title_public} description`; - - Cypress.on('uncaught:exception', (err, runnable) => { - // Prevents Cypress from failing the test due to uncaught exceptions in the application code - TypeError: Cannot read properties of undefined (reading 'scrollDown') - if ( - err.message.includes( - "Cannot read properties of undefined (reading 'success')" - ) - ) { - return false; - } - }); - - //checks navigation when create new playlist is accessed - it('.create_playlists()', () => { - cy.login('administrator'); - cy.visit('/playlists/new'); - }); - - //is able to create a new playlist - it('Verify creating a Playlist - @Tf1b9413d', () => { - cy.login('administrator'); - cy.visit('/'); - cy.get('#playlists_nav').click(); - cy.get('a[href="/playlists/new"]').click(); - - cy.get('#playlist_title').type(playlist_title); - cy.get('#playlist_comment').type(playlist_description); - cy.get('#submit-playlist-form').click(); - - //Validate play list creation success message - cy.get('.alert.alert-info') - .should('be.visible') - .within(() => { - cy.get('p').should('contain', 'Playlist was successfully created.'); - }); - - //Validate the newly created playlist page - // Validate the presence of the video.js element - cy.get('video[data-testid="videojs-audio-element"]') - .should('exist') - .and('have.class', 'video-js') - .and('have.class', 'vjs-big-play-centered'); - - // Validate the presence of the text "This playlist currently has no playable items." - cy.get('div[data-testid="inaccessible-message-display"] p') - .should('be.visible') - .and('contain.text', 'This playlist currently has no playable items.'); - - //validate the playlist details - title, description, buttons , etc - cy.get('div.playlist-title').get('h1').contains(playlist_title); - //verify that the playlist created by default is private - cy.get('div.playlist-title') - .find('span[title="This playlist can only be viewed by you."]') - .should('be.visible'); - cy.contains('h4', 'Description') - .should('be.visible') - .next('p') - .should('have.text', playlist_description); - cy.get('button.copy-playlist-button').should('be.visible'); - cy.get('div.ramp--auto-advance').should('be.visible'); - cy.get('#share-button').should('be.visible'); - cy.get('#edit-playlist-button').should('be.visible'); - }); - - it('.validate_playlist_table()', () => { - cy.login('administrator'); - cy.visit('/'); - cy.get('#playlists_nav').click(); - cy.visit('/playlists'); - cy.contains('Name'); - cy.contains('Visibility'); - cy.contains('Created'); - cy.contains('Updated'); - cy.contains('Actions'); - cy.contains('Private'); - cy.contains('Size'); - cy.contains('Delete'); - cy.contains('Edit'); - }); - - - // deletes playlist permanently from playlists page - it('Verify Deleting a Playlist - playlist table - @T53c3887a', () => { - cy.login('administrator'); - cy.visit('/'); - var playlist_title_1 = `__Automation playlist title ${Math.floor(Math.random() * 10000) + 1 - }`; - var playlist_description_1 = `${playlist_title} description`; - - cy.get('#playlists_nav').click(); - cy.get('a[href="/playlists/new"]').click(); - cy.get('#playlist_title').type(playlist_title_1); - cy.get('#playlist_comment').type(playlist_description_1); - cy.get('#submit-playlist-form').click(); - - cy.visit('/playlists'); - cy.get('tr') - .contains('td', playlist_title_1) - .parent('tr') - .find('.btn-danger') - .click(); - cy.contains('Yes, Delete').click(); - - cy.visit('/playlists'); - - //Handle pagination case - search for the playlist. Add API validation - cy.contains(playlist_title).should('not.exist'); - }); - - // is able to delete playlist from edit playlist page - it('Verify Deleting a Playlist - playlist page - @T49ac05b8', () => { - cy.login('user'); - cy.visit('/'); - var playlist_title = `__Automation playlist title ${Math.floor(Math.random() * 10000) + 1 - }`; - var playlist_description = `${playlist_title} description`; - - cy.get('#playlists_nav').click(); - cy.get('a[href="/playlists/new"]').click(); - cy.get('#playlist_title').type(playlist_title); - cy.get('#playlist_comment').type(playlist_description); - cy.get('#submit-playlist-form').click(); - - cy.visit('/playlists'); - cy.contains(playlist_title).click(); - cy.contains('Edit Playlist').click(); - - cy.contains('Delete Playlist').click(); - cy.contains('Yes, Delete').click(); - cy.contains('Playlist was successfully destroyed.'); - cy.visit('/playlists'); - cy.contains(playlist_title).should('not.exist'); - }); - - // is able to create public playlist - it('.create_public_playlist()', () => { - cy.login('administrator'); - cy.visit('/'); - - cy.get('#playlists_nav').click(); - cy.get('a[href="/playlists/new"]').click(); - // cy.visit('/playlists/new') - - cy.get('#playlist_title').type(playlist_title_public); - cy.get('#playlist_comment').type(playlist_description_public); - cy.contains('Public').click(); - cy.get('#submit-playlist-form').click(); - - cy.visit('/playlists'); - cy.contains(playlist_title_public); - cy.contains(playlist_description_public); - cy.contains('Public'); - cy.get('div.playlist-title') - .find('span[title="This playlist can be viewed by anyone on the web."]') - .should('be.visible'); - }); - - //is able to share a public playlist - it('Verify sharing a public playlist - @c89c89d0', () => { - cy.login('administrator'); - cy.visit('/'); - cy.get('#playlists_nav').click(); - cy.contains(playlist_title_public).click(); - cy.get('#share-button').click() - cy.get('#share-list').within(()=>{ - cy.url().then((currentUrl) => { - cy.get('#link-object') - .should('have.value', currentUrl); - }); - }) - }); - - // is able to change public playlist to private - it('Verify editing a playlist from playlist table (Access control) - @T7fa4cea5', () => { - cy.login('administrator') - cy.visit('/') - // cy.visit('/playlists/new') - cy.get('#playlists_nav').click() - cy.get('tr') - .contains('td', playlist_title_public) - .parent('tr') - .contains('Edit') - .click(); - cy.screenshot() - cy.get('#playlist_edit_button').click() - cy.contains('Private').click() - cy.contains('Save Changes').click() - cy.contains('Playlist was successfully updated') - cy.contains('Private') - }) - - // is able to edit playlist name and description - it('Verify editing a Playlist from playlist page - @T5055855c', () => { - cy.login('administrator') - cy.visit('/playlists') - - cy.contains(playlist_title_public).click() - cy.contains('Edit Playlist').click() - - cy.get('#playlist_edit_button').click() - - var updated_title = "_Edited" + playlist_title_public - var updatedDescription = "_Edited" + playlist_description_public - - cy.get('#playlist_title').clear().type(updated_title) - cy.get('#playlist_comment').clear().type(updatedDescription) - cy.contains('Save Changes').click() - cy.contains('Playlist was successfully updated') - cy.get('#playlist_view_div').within(() => { - cy.contains('dd',updated_title) - cy.contains('dd', updatedDescription) - }).then(() => { - // If assertions pass, update the playlist_title_public - playlist_title_public = updated_title; - playlist_description_public = updatedDescription - cy.log(`Playlist title updated to: ${playlist_title_public}`); // Log the updated value - }); - }) - - - //Add teardown code here to delete playlist_title and playlist_title_public - - + //Playlist names start with '_' character for easy navigation without pagination + // var playlist_title = `_Automation playlist title ${Math.floor(Math.random() * 10000) + 1 + // }`; + var playlist_title = '_Automation playlist title 2086'; + var playlist_description = `${playlist_title} description`; + var playlist_title_public = `_Automation public playlist title ${ + Math.floor(Math.random() * 10000) + 1 + }`; + var playlist_description_public = `${playlist_title_public} description`; + const media_object_id = Cypress.env('MEDIA_OBJECT_ID_2'); + const media_object_title = Cypress.env('MEDIA_OBJECT_TITLE_2'); + + Cypress.on('uncaught:exception', (err, runnable) => { + // Prevents Cypress from failing the test due to uncaught exceptions in the application code - TypeError: Cannot read properties of undefined (reading 'scrollDown') + if ( + err.message.includes( + "Cannot read properties of undefined (reading 'success')" + ) + ) { + return false; + } + }); + + + //is able to create a new playlist + it('Verify creating a Playlist - @Tf1b9413d', () => { + cy.login('administrator'); + cy.visit('/'); + cy.get('#playlists_nav').click(); + cy.get('a[href="/playlists/new"]').click(); + + cy.get('#playlist_title').type(playlist_title); + cy.get('#playlist_comment').type(playlist_description); + cy.get('#submit-playlist-form').click(); + + //Validate play list creation success message + cy.get('.alert.alert-info') + .should('be.visible') + .within(() => { + cy.get('p').should('contain', 'Playlist was successfully created.'); + }); + + //Validate the newly created playlist page + // Validate the presence of the video.js element + cy.get('video[data-testid="videojs-audio-element"]') + .should('exist') + .and('have.class', 'video-js') + .and('have.class', 'vjs-big-play-centered'); + + // Validate the presence of the text "This playlist currently has no playable items." + cy.get('div[data-testid="inaccessible-message-display"] p') + .should('be.visible') + .and('contain.text', 'This playlist currently has no playable items.'); + + //validate the playlist details - title, description, buttons , etc + cy.get('div.playlist-title').get('h1').contains(playlist_title); + //verify that the playlist created by default is private + cy.get('div.playlist-title') + .find('span[title="This playlist can only be viewed by you."]') + .should('be.visible'); + cy.get('div.ramp--playlist-description') + .contains(playlist_description); + cy.get('button.copy-playlist-button').should('be.visible'); + cy.get('div.ramp--auto-advance').should('be.visible'); + cy.get('#share-button').should('be.visible'); + cy.get('#edit-playlist-button').should('be.visible'); + }); + + it('.validate_playlist_table()', () => { + cy.login('administrator'); + cy.visit('/'); + cy.get('#playlists_nav').click(); + cy.visit('/playlists'); + cy.contains('Name'); + cy.contains('Visibility'); + cy.contains('Created'); + cy.contains('Updated'); + cy.contains('Actions'); + cy.contains('Private'); + cy.contains('Size'); + cy.contains('Delete'); + cy.contains('Edit'); + }); + + // is able to create public playlist + it('.create_public_playlist()', () => { + cy.login('administrator'); + cy.visit('/'); + + cy.get('#playlists_nav').click(); + cy.get('a[href="/playlists/new"]').click(); + // cy.visit('/playlists/new') + + cy.get('#playlist_title').type(playlist_title_public); + cy.get('#playlist_comment').type(playlist_description_public); + cy.contains('Public').click(); + cy.get('#submit-playlist-form').click(); + + cy.contains(playlist_title_public); + cy.contains('Public'); + cy.get('div.playlist-title') + .find('span[title="This playlist can be viewed by anyone on the web."]') + .should('be.visible'); + }); + + //is able to share a public playlist + it('Verify sharing a public playlist - @c89c89d0', () => { + cy.login('administrator'); + cy.visit('/'); + cy.get('#playlists_nav').click(); + cy.contains(playlist_title_public).click(); + cy.get('#share-button').click(); + cy.get('#share-list').within(() => { + cy.url().then((currentUrl) => { + cy.get('#link-object').should('have.value', currentUrl); + }); + }); + }); + + // is able to change public playlist to private + it('Verify editing a playlist from playlist table (Access control) - @T7fa4cea5', () => { + cy.login('administrator'); + cy.visit('/'); + // cy.visit('/playlists/new') + cy.get('#playlists_nav').click(); + cy.get('tr') + .contains('td', playlist_title_public) + .parent('tr') + .contains('Edit') + .click(); + cy.get('#playlist_edit_button').click(); + cy.contains('Private').click(); + cy.contains('Save Changes').click(); + cy.contains('Playlist was successfully updated'); + cy.contains('Private'); + }); + + // is able to edit playlist name and description + it('Verify editing a Playlist from playlist page - @T5055855c', () => { + cy.login('administrator'); + cy.visit('/playlists'); + + cy.contains(playlist_title_public).click(); + cy.contains('Edit Playlist').click(); + + cy.get('#playlist_edit_button').click(); + + var updated_title = '_Edited' + playlist_title_public; + var updatedDescription = '_Edited' + playlist_description_public; + + cy.get('#playlist_title').clear().type(updated_title); + cy.get('#playlist_comment').clear().type(updatedDescription); + cy.contains('Save Changes').click(); + cy.contains('Playlist was successfully updated'); + cy.get('#playlist_view_div') + .within(() => { + cy.contains('dd', updated_title); + cy.contains('dd', updatedDescription); + }) + .then(() => { + // If assertions pass, update the playlist_title_public + playlist_title_public = updated_title; + playlist_description_public = updatedDescription; + cy.log(`Playlist title updated to: ${playlist_title_public}`); // Log the updated value + }); + }); + + it('Verify the "add to playlist" button behavior - @Tcdb5ac47', () => { + cy.login('administrator'); + cy.visit('/'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + media_object_id); + cy.contains(media_object_title); + cy.get('#addToPlaylistBtn').click(); + //Validate the "Add to playlist options" + cy.get('#add-to-playlist-form-group').within(() => { + cy.contains('label.form-check-label', 'Custom Timespan').get( + 'input[type="radio"]' + ); + cy.contains('label.form-check-label', 'Current Track ()').get( + 'input[type="radio"]' + ); + cy.contains('label.form-check-label', 'Current Section ').get( + 'input[type="radio"]' + ); + cy.contains('label.form-check-label', 'All Sections').get( + 'input[type="radio"]' + ); + }); + + //Validate Playlist dropdown + cy.get('#select2-post_playlist_id-container').click(); + + cy.get('span.select2-dropdown').within(() => { + cy.get('ul.select2-results__options li') + .contains('Add new playlist') + .should('be.visible'); + //Validate search for playlist within the playlist dropdown + cy.get('span.select2-search input.select2-search__field').type( + playlist_title + ); + cy.get('span.select2-results') + .contains('b', playlist_title) + .should('be.visible'); + }); + }); + + it('Verify adding the current section of an item to a playlist - Create playlist items for each track/subsection - @T3e614dbc', () => { + cy.login('administrator'); + cy.visit('/'); + // The below code is hard-coded for a media object url. This needs to be changed with a valid object URL later for each website. + cy.visit('/media_objects/' + media_object_id); + cy.contains(media_object_title); + cy.get('#addToPlaylistBtn').click(); + + //Click on the "Current section" radio button + cy.get('#playlistitem_scope_section').should('be.visible').click(); + + //Open Playlist dropdown + cy.get('#select2-post_playlist_id-container').click(); + + //Validate search for playlist within the playlist dropdown + cy.get('span.select2-search input.select2-search__field').type( + playlist_title + ); + cy.get('span.select2-results') + .contains('b', playlist_title) + .should('be.visible'); + + // This part is failing - need to fix this + //Click on the playlist_title from search + cy.get('ul#select2-post_playlist_id-results').within(() => { + cy.contains( + 'li.select2-results__option', + playlist_title + ) + .eq(1) + .click(); + }); + cy.get('#addToPlaylistSave').click(); + + //verify playlist created success message + cy.get('#add_to_playlist_result_message') + .should('be.visible') + .should('contain.text', 'Playlist items created successfully.'); + cy.screenshot(); + }); + + // Teardown codes to delete playlist_title and playlist_title_public + + // deletes playlist permanently from playlists table + //The "playlist_title" playlist gets deleted here + it('Verify Deleting a Playlist - playlist table - @T53c3887a', () => { + cy.login('administrator'); + cy.visit('/'); + + cy.visit('/playlists'); + cy.get('tr') + .contains('td', playlist_title) + .parent('tr') + .find('.btn-danger') + .click(); + cy.contains('Yes, Delete').click(); + + cy.visit('/playlists'); + + //Add more assertions here + //Handle pagination case - search for the playlist - it should not appear. Add API validation + cy.contains(playlist_title).should('not.exist'); + }); + + // is able to delete playlist from edit playlist page + //The "playlist_title_public" playlist gets deleted here + it('Verify Deleting a Playlist - playlist page - @T49ac05b8', () => { + cy.login('administrator'); + cy.visit('/'); + + cy.visit('/playlists'); + cy.contains(playlist_title_public).click(); + cy.contains('Edit Playlist').click(); + + cy.contains('Delete Playlist').click(); + cy.contains('Yes, Delete').click(); + cy.contains('Playlist was successfully destroyed.'); + cy.visit('/playlists'); + + //Add more assertions here + //Handle pagination case - search for the playlist - it should not appear. Add API validation + cy.contains(playlist_title_public).should('not.exist'); + }); }); diff --git a/spec/cypress/pageObjects/homePage.js b/spec/cypress/pageObjects/homePage.js new file mode 100644 index 0000000000..cac84d743d --- /dev/null +++ b/spec/cypress/pageObjects/homePage.js @@ -0,0 +1,37 @@ +/* + * Copyright 2011-2024, The Trustees of Indiana University and Northwestern + * University. Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * --- END LICENSE_HEADER BLOCK --- +*/ + +class HomePage { + + getBrowseNavButton() { + return cy.contains('a.nav-link', 'Browse'); + } + + getLoginSuccessAlert() { + return cy.get('div.alert.alert-info').contains('p', 'Signed in successfully.'); + } + + logout() { + cy.get('a[href="/users/sign_out"]').first().click(); + } + + getLogoutSuccessAlert(){ + return cy.get('div.alert.alert-success').contains('p', 'Signed out successfully.'); + } +} + + export default HomePage; + \ No newline at end of file diff --git a/spec/cypress/pageObjects/loginPage.js b/spec/cypress/pageObjects/loginPage.js new file mode 100644 index 0000000000..41710dd54d --- /dev/null +++ b/spec/cypress/pageObjects/loginPage.js @@ -0,0 +1,36 @@ +/* + * Copyright 2011-2024, The Trustees of Indiana University and Northwestern + * University. Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed + * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * --- END LICENSE_HEADER BLOCK --- +*/ + +class LoginPage { + visit() { + cy.visit('/users/sign_in'); + } + + fillEmail(email) { + cy.get('input[name="user[login]"]').type(email); + } + + fillPassword(password) { + cy.get('input[name="user[password]"]').type(password); + } + + submit() { + cy.get('input[type="submit"][value="Connect"]').click(); + } + } + + export default LoginPage; + \ No newline at end of file diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js index b4e2315a99..94783de849 100644 --- a/spec/cypress/support/commands.js +++ b/spec/cypress/support/commands.js @@ -26,6 +26,7 @@ // // // -- This is a parent command -- +import 'cypress-file-upload'; Cypress.Commands.add("login", (role) => { const email = Cypress.env('USERS_' + role.toUpperCase() + '_EMAIL') const password = Cypress.env('USERS_' + role.toUpperCase() + '_PASSWORD') @@ -65,3 +66,43 @@ Cypress.Commands.add("login", (role) => { // // -- This will overwrite an existing command -- // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) +// support/commands.js + +Cypress.Commands.add('createItemUnderCollectionUI',(collectionTitle, itemTitle ) => { + const videoName = "test_sample.mp4"; + const publicationYear = String(Math.floor(Math.random() * (2020 - 1900 + 1)) + 1900); + + return cy.wrap(new Promise((resolve, reject) => { + cy.login('administrator'); + cy.visit('/'); + cy.get('#manageDropdown').click(); + cy.contains('Manage Content').click(); + cy.contains('a', collectionTitle).click(); + cy.contains('a', 'Create An Item').click(); + + cy.get('div#file-upload input[type="file"][name="Filedata[]"]').selectFile(`spec/cypress/fixtures/${videoName}`, { force: true }); + cy.wait(5000); + cy.get('div#file-upload a.fileinput-submit').click({ force: true }); + cy.wait(5000); + cy.get('#associated_files .card-body').should('contain', videoName); + cy.get('input[name="save_and_continue"][value="Continue"]').click(); + + cy.get('input#media_object_title').type(itemTitle).should('have.value', itemTitle); + cy.get('input#media_object_date_issued').type(publicationYear).should('have.value', publicationYear); + cy.get('input[name="save_and_continue"][value="Save and continue"]').click(); + + cy.get('li.nav-item.nav-success').contains('a.nav-link', 'Preview').click(); + + cy.get('.page-title-wrapper h2').should('contain.text', itemTitle); + + cy.get('div.ramp--tabs-panel').within(() => { + cy.get('div.tab-content dt').contains('Date').next('dd').should('have.text', publicationYear); + cy.get('div.tab-content dt').contains('Collection').next('dd').contains(collectionTitle); + }); + + cy.url().then(url => { + const itemId = url.split('/').pop(); + resolve(itemId); // Resolve the promise with the item ID + }); + })); +}); diff --git a/spec/factories/derivatives.rb b/spec/factories/derivatives.rb index 41fffdcbc9..c0877a8861 100644 --- a/spec/factories/derivatives.rb +++ b/spec/factories/derivatives.rb @@ -26,7 +26,8 @@ video_bitrate { '4000000.0' } audio_codec { 'AAC' } audio_bitrate { '163842.0' } - absolute_location { 'file:///srv/avalon/content/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4' } + mime_type { nil } + derivativeFile { 'file:///srv/avalon/content/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4' } trait :with_master_file do after(:create) do |d| diff --git a/spec/fixtures/meow.json b/spec/fixtures/meow.json index 468602d53d..9506de99d7 100644 --- a/spec/fixtures/meow.json +++ b/spec/fixtures/meow.json @@ -14,4 +14,4 @@ * --- END LICENSE_HEADER BLOCK --- */ -{"sample_rate":44100,"bits":8,"samples_per_pixel":1024,"length":54,"data":[-75,72,-113,106,-109,104,-117,112,-128,127,-122,114,-105,86,-81,76,-81,76,-93,88,-108,105,-112,108,-99,96,-91,91,-77,77,-63,70,-49,55,-39,45,-36,40,-36,40,-30,31,-30,29,-28,25,-24,16,-17,16,-10,8,-7,7,-4,4,-3,3,-2,2,-2,2,-2,2,-1,1,-2,2,-2,2,-2,2,-1,1,-1,1,-1,1,-1,1,-1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]} +{"sample_rate":44100,"bits":8,"samples_per_pixel":1024,"length":54,"data":[-75, 72, -113, 106, -109, 104, -117, 112, -127, 128, -122, 114, -105, 87, -81, 75, -80, 76, -94, 88, -108, 105, -111, 108, -98, 96, -90, 87, -76, 76, -63, 70, -47, 53, -37, 44, -34, 38, -34, 39, -29, 31, -29, 27, -27, 25, -24, 16, -15, 13, -9, 8, -6, 5, -3, 4, -2, 3, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, -1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]} diff --git a/spec/fixtures/meow.mono.wav b/spec/fixtures/meow.mono.wav new file mode 100644 index 0000000000..3384815280 Binary files /dev/null and b/spec/fixtures/meow.mono.wav differ diff --git a/spec/fixtures/videoshort_no_audio.mp4 b/spec/fixtures/videoshort_no_audio.mp4 new file mode 100644 index 0000000000..7998f90a0b Binary files /dev/null and b/spec/fixtures/videoshort_no_audio.mp4 differ diff --git a/spec/jobs/application_job_spec.rb b/spec/jobs/application_job_spec.rb index 687415db33..ebc01b5a7e 100644 --- a/spec/jobs/application_job_spec.rb +++ b/spec/jobs/application_job_spec.rb @@ -24,12 +24,18 @@ end context 'raise_on_connection_error disabled' do - let(:request_context) { { body: "request_context" } } + let(:request_context) { { uri: Addressable::URI.parse("http://example.com"), body: "request_context" } } let(:e) { { body: "error_response" } } [RSolr::Error::ConnectionRefused, RSolr::Error::Timeout, Blacklight::Exceptions::ECONNREFUSED, Faraday::ConnectionFailed].each do |error_code| it "rescues #{error_code} errors" do - raised_error = error_code == RSolr::Error::Timeout ? error_code.new(request_context, e) : error_code + raised_error = if error_code == RSolr::Error::ConnectionRefused + error_code.new(request_context) + elsif error_code == RSolr::Error::Timeout + error_code.new(request_context, e) + else + error_code + end allow(Settings.app_job.solr_and_fedora).to receive(:raise_on_connection_error).and_return(false) allow_any_instance_of(described_class).to receive(:perform).and_raise(raised_error) allow_any_instance_of(Exception).to receive(:backtrace).and_return(["Test trace"]) @@ -41,12 +47,18 @@ end context 'raise_on_connection_error enabled' do - let(:request_context) { { body: "request_context" } } + let(:request_context) { { uri: Addressable::URI.parse("http://example.com"), body: "request_context" } } let(:e) { { body: "error_response" } } [RSolr::Error::ConnectionRefused, RSolr::Error::Timeout, Blacklight::Exceptions::ECONNREFUSED, Faraday::ConnectionFailed].each do |error_code| it "raises #{error_code} errors" do - raised_error = error_code == RSolr::Error::Timeout ? error_code.new(request_context, e) : error_code + raised_error = if error_code == RSolr::Error::ConnectionRefused + error_code.new(request_context) + elsif error_code == RSolr::Error::Timeout + error_code.new(request_context, e) + else + error_code + end allow(Settings.app_job.solr_and_fedora).to receive(:raise_on_connection_error).and_return(true) allow_any_instance_of(described_class).to receive(:perform).and_raise(raised_error) allow_any_instance_of(Exception).to receive(:backtrace).and_return(["Test trace"]) diff --git a/spec/jobs/master_file_management_jobs_spec.rb b/spec/jobs/master_file_management_jobs_spec.rb index 98bd19bb1b..6228025605 100644 --- a/spec/jobs/master_file_management_jobs_spec.rb +++ b/spec/jobs/master_file_management_jobs_spec.rb @@ -33,7 +33,7 @@ it "should delete masterfile" do MasterFileManagementJobs::Delete.perform_now(master_file.id) expect(File.exist? location).to be false - expect(MasterFile.find(master_file.id).file_location).to be_blank + expect(MasterFile.find(master_file.id).file_location).not_to be_blank end end diff --git a/spec/lib/avalon/batch/entry_spec.rb b/spec/lib/avalon/batch/entry_spec.rb index f599877058..76aec14def 100644 --- a/spec/lib/avalon/batch/entry_spec.rb +++ b/spec/lib/avalon/batch/entry_spec.rb @@ -18,7 +18,7 @@ let(:testdir) {'spec/fixtures/'} let(:filename) {'videoshort.mp4'} let(:collection) {FactoryBot.build(:collection)} - let(:entry_fields) {{ title: Faker::Lorem.sentence, date_issued: "#{DateTime.now.strftime('%F')}" }} + let(:entry_fields) {{ title: Faker::Lorem.sentence }} let(:entry_files) { [{ file: File.join(testdir, filename), skip_transcoding: false }] } let(:entry_opts) { {user_key: 'archivist1@example.org', collection: collection} } let(:entry) { Avalon::Batch::Entry.new(entry_fields, entry_files, entry_opts, nil, nil) } diff --git a/spec/lib/avalon/batch_spec.rb b/spec/lib/avalon/batch_spec.rb index 0c02739224..493b2dee0a 100644 --- a/spec/lib/avalon/batch_spec.rb +++ b/spec/lib/avalon/batch_spec.rb @@ -20,7 +20,7 @@ describe "#find_open_files" do # TODO: mock filesystem with open file subject { Avalon::Batch.find_open_files([]) } - it 'returns open files' do + xit 'returns open files' do expect(subject).to include() end @@ -29,7 +29,7 @@ let(:files) { Array.new(5000, file) } subject { Avalon::Batch.find_open_files(files) } - it 'logs an error and moves on' do + xit 'logs an error and moves on' do expect(Rails.logger).to receive(:warn).with(match("too many files")) expect(subject).to include() end diff --git a/spec/lib/avalon/ffprobe_spec.rb b/spec/lib/avalon/ffprobe_spec.rb new file mode 100644 index 0000000000..b6d73412bc --- /dev/null +++ b/spec/lib/avalon/ffprobe_spec.rb @@ -0,0 +1,182 @@ +# Copyright 2011-2024, The Trustees of Indiana University and Northwestern +# University. Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed +# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +# CONDITIONS OF ANY KIND, either express or implied. See the License for the +# specific language governing permissions and limitations under the License. +# --- END LICENSE_HEADER BLOCK --- + +require 'rails_helper' +require 'avalon/ffprobe' + +describe Avalon::FFprobe do + subject { described_class.new(test_file) } + + let(:video_file) { FileLocator.new(Rails.root.join('spec', 'fixtures', 'videoshort.mp4').to_s) } + let(:audioless_video_file) { FileLocator.new(Rails.root.join('spec', 'fixtures', 'videoshort_no_audio.mp4').to_s) } + let(:audio_file) { FileLocator.new(Rails.root.join('spec', 'fixtures', 'jazz-performance.mp4').to_s) } + let(:image_file) { FileLocator.new(Rails.root.join('spec', 'fixtures', 'collection_poster.png').to_s) } + let(:text_file) { FileLocator.new(Rails.root.join('spec', 'fixtures', 'chunk_test.txt').to_s) } + + describe 'error handling' do + let(:test_file) { video_file } + + it 'logs an error if ffprobe is misconfigured' do + allow(Settings.ffprobe).to receive(:path).and_return('misconfigured/path') + expect(Rails.logger).to receive(:error) + subject.json_output + end + end + + describe '#video?' do + context 'with a video file' do + let(:test_file) { video_file } + + it 'returns true' do + expect(subject.video?).to be true + end + end + + context "with an audio file" do + let(:test_file) { audio_file } + + it 'returns false' do + expect(subject.video?).to be false + end + end + + context 'with non-media files' do + let(:text_test) { described_class.new(text_file) } + let(:image_test) { described_class.new(image_file) } + + it 'returns false' do + expect(text_test.video?).to be false + expect(image_test.video?).to be false + end + end + end + + describe '#audio?' do + context 'with a video file that has an audio track' do + let(:test_file) { video_file } + + it 'returns true' do + expect(subject.audio?).to be true + end + end + + context 'with a video file that lacks an audio track' do + let(:test_file) { audioless_video_file } + + it 'returns false' do + expect(subject.audio?).to be false + end + end + + context "with an audio file" do + let(:test_file) { audio_file } + + it 'returns true' do + expect(subject.audio?).to be true + end + end + + context 'with non-media files' do + let(:text_test) { described_class.new(text_file) } + let(:image_test) { described_class.new(image_file) } + + it 'returns false' do + expect(text_test.audio?).to be false + expect(image_test.audio?).to be false + end + end + end + + describe '#duration' do + let(:test_file) { video_file } + + it 'returns correct value in milliseconds' do + expect(subject.duration).to eq 6314 + end + + context 'with non-media files' do + let(:text_test) { described_class.new(text_file) } + let(:image_test) { described_class.new(image_file) } + + it 'returns nil' do + expect(text_test.duration).to be nil + expect(image_test.duration).to be nil + end + end + end + + describe '#display_aspect_ratio' do + context 'with video' do + let(:test_file) { video_file } + + it 'returns the display aspect ratio' do + expect(subject.display_aspect_ratio).to be_a(String) + expect(subject.display_aspect_ratio).to eq '20:11' + end + + context 'file missing display aspect ratio' do + it 'calculates the display aspect ratio' do + subject.instance_variable_set(:@video_stream, subject.video_stream.except!(:display_aspect_ratio)) + expect(subject.display_aspect_ratio).to be_a(String) + expect(subject.display_aspect_ratio).to eq((200.to_f / 110.to_f).to_s) + end + end + end + + context 'with audio' do + let(:test_file) { audio_file } + it 'returns nil' do + expect(subject.display_aspect_ratio).to be nil + end + end + + context 'with non-media files' do + let(:text_test) { described_class.new(text_file) } + let(:image_test) { described_class.new(image_file) } + + it 'returns nil' do + expect(text_test.display_aspect_ratio).to be nil + expect(image_test.display_aspect_ratio).to be nil + end + end + end + + describe '#original_frame_size' do + context 'with video' do + let(:test_file) { video_file } + + it 'returns the original frame size' do + expect(subject.original_frame_size).to eq '200x110' + end + end + + context 'with audio' do + let(:test_file) { audio_file } + + it 'returns nil' do + expect(subject.original_frame_size).to be nil + end + end + + context 'with non-media files' do + let(:text_test) { described_class.new(text_file) } + let(:image_test) { described_class.new(image_file) } + + it 'returns nil' do + expect(text_test.original_frame_size).to be nil + expect(image_test.original_frame_size).to be nil + end + end + end +end \ No newline at end of file diff --git a/spec/models/batch_entries_spec.rb b/spec/models/batch_entries_spec.rb index abc115ec08..fe084da004 100644 --- a/spec/models/batch_entries_spec.rb +++ b/spec/models/batch_entries_spec.rb @@ -34,8 +34,8 @@ describe 'validating payload' do describe 'with sufficient metadata' do - it 'does not record an error when title and date_issued are present' do - payload = { fields: { title: 'foo', date_issued: Time.now.utc } } + it 'does not record an error when title is present' do + payload = { fields: { title: 'foo' } } be = BatchEntries.new(payload: payload.to_json, batch_registries: batch_registry) be.save be.reload @@ -58,12 +58,12 @@ be.reload expect(be.error).to be_truthy end - it 'records an error when only title is present' do + it 'does not record an error when only title is present' do payload = { fields: { title: 'foo' } } be = BatchEntries.new(payload: payload.to_json, batch_registries: batch_registry) be.save be.reload - expect(be.error).to be_truthy + expect(be.error).to be_falsey end it 'records an error when only date issued is present' do payload = { fields: { date_issued: Time.now.utc } } diff --git a/spec/models/iiif_canvas_presenter_spec.rb b/spec/models/iiif_canvas_presenter_spec.rb index 7a3a58dce0..b8694deafe 100644 --- a/spec/models/iiif_canvas_presenter_spec.rb +++ b/spec/models/iiif_canvas_presenter_spec.rb @@ -47,6 +47,33 @@ end end + describe "#to_s" do + subject { presenter.to_s } + + context 'single-section item' do + it 'prioritizes MediaObject#title for section title' do + expect(subject).to eq master_file.structure_title + expect(subject).to eq media_object.title + expect(subject).to_not eq master_file.display_title + end + end + + context 'multi-section item' do + let(:second) { FactoryBot.build(:master_file, media_object: media_object, derivatives: [derivative]) } + + before :each do + media_object.sections = [master_file, second] + media_object.save! + end + + it 'prioritizes MasterFile#display_title for section titles' do + expect(subject).to eq master_file.structure_title + expect(subject).to eq master_file.display_title + expect(subject).to_not eq media_object.title + end + end + end + describe '#display_content' do subject { presenter.display_content.first } @@ -61,6 +88,19 @@ expect(subject.width).to eq 1280 expect(subject.height).to eq 40 end + + context 'with mp3 file' do + let(:mp3_url) { 'https://streaming.example.com/dir/file.mp3' } + let(:derivative) { FactoryBot.build(:derivative, hls_url: mp3_url, mime_type: 'audio/mpeg' ) } + + it 'has format' do + expect(subject.format).to eq 'audio/mpeg' + end + + it 'has progressive download url' do + expect(subject.url).to eq mp3_url + end + end end context 'when video file' do @@ -72,6 +112,19 @@ expect(subject.width).to eq 1024 expect(subject.height).to eq 768 end + + context 'with mp4 file' do + let(:mp4_url) { 'https://streaming.example.com/dir/file.mp4' } + let(:derivative) { FactoryBot.build(:derivative, hls_url: mp4_url, mime_type: 'video/mp4' ) } + + it 'has format' do + expect(subject.format).to eq 'video/mp4' + end + + it 'has progressive download url' do + expect(subject.url).to eq mp4_url + end + end end end diff --git a/spec/models/iiif_manifest_presenter_spec.rb b/spec/models/iiif_manifest_presenter_spec.rb index 686a3bb148..8d712e4b37 100644 --- a/spec/models/iiif_manifest_presenter_spec.rb +++ b/spec/models/iiif_manifest_presenter_spec.rb @@ -19,6 +19,19 @@ let(:master_file) { FactoryBot.build(:master_file, media_object: media_object) } let(:presenter) { described_class.new(media_object: media_object, master_files: [master_file]) } + context 'to_s' do + it "returns the media object's title" do + expect(presenter.to_s).to eq media_object.title + end + + context 'when media object is missing title' do + it "returns the media object's id" do + allow(media_object).to receive(:title).and_return(nil) + expect(presenter.to_s).to eq media_object.id + end + end + end + context 'homepage' do subject { presenter.homepage.first } @@ -49,8 +62,8 @@ it 'provides metadata' do allow_any_instance_of(IiifManifestPresenter).to receive(:lending_enabled).and_return(false) - ['Title', 'Date', 'Main contributor', 'Summary', 'Contributor', 'Publisher', 'Genre', 'Subject', 'Time period', - 'Location', 'Collection', 'Unit', 'Language', 'Rights Statement', 'Terms of Use', 'Physical Description', 'Series', + ['Title', 'Publication date', 'Creation date', 'Main contributor', 'Summary', 'Contributor', 'Publisher', 'Genre', 'Subject', + 'Time period', 'Location', 'Collection', 'Unit', 'Language', 'Rights Statement', 'Terms of Use', 'Physical Description', 'Series', 'Related Item', 'Notes', 'Table of Contents', 'Local Note', 'Other Identifier', 'Access Restrictions', 'Bibliographic ID' ].each do |field| expect(subject).to include(field) @@ -80,8 +93,8 @@ it 'provides metadata' do allow_any_instance_of(IiifManifestPresenter).to receive(:lending_enabled).and_return(true) - ['Title', 'Date', 'Main contributor', 'Summary', 'Contributor', 'Publisher', 'Genre', 'Subject', 'Time period', - 'Location', 'Collection', 'Unit', 'Language', 'Rights Statement', 'Terms of Use', 'Physical Description', 'Series', + ['Title', 'Publication date', 'Creation date', 'Main contributor', 'Summary', 'Contributor', 'Publisher', 'Genre', 'Subject', + 'Time period', 'Location', 'Collection', 'Unit', 'Language', 'Rights Statement', 'Terms of Use', 'Physical Description', 'Series', 'Related Item', 'Notes', 'Table of Contents', 'Local Note', 'Other Identifier', 'Access Restrictions', 'Bibliographic ID', 'Lending Period' ].each do |field| expect(subject).to include(field) @@ -96,6 +109,17 @@ expect(subject['Notes']).to be_a Array end end + + context 'values with search links' do + it 'includes appropriate link tags' do + search_url = Rails.application.routes.url_helpers.blacklight_url.gsub('/','\/') + ['Subject'].each do |field| + subject[field].each do |value| + expect(value).to match /^.*<\/a>$/ + end + end + end + end end context 'viewing_hint' do diff --git a/spec/models/iiif_playlist_canvas_presenter_spec.rb b/spec/models/iiif_playlist_canvas_presenter_spec.rb index dffc4bd6a0..3baf193a28 100644 --- a/spec/models/iiif_playlist_canvas_presenter_spec.rb +++ b/spec/models/iiif_playlist_canvas_presenter_spec.rb @@ -90,6 +90,19 @@ expect(subject.width).to eq 1280 expect(subject.height).to eq 40 end + + context 'with mp3 file' do + let(:mp3_url) { 'https://streaming.example.com/dir/file.mp3' } + let(:derivative) { FactoryBot.build(:derivative, hls_url: mp3_url, mime_type: 'audio/mpeg' ) } + + it 'has format' do + expect(subject.format).to eq 'audio/mpeg' + end + + it 'has progressive download url with media fragment' do + expect(subject.url).to eq "#{mp3_url}#t=#{playlist_item.start_time / 1000},#{playlist_item.end_time / 1000}" + end + end end context 'when video file' do @@ -105,6 +118,19 @@ expect(subject.width).to eq 1024 expect(subject.height).to eq 768 end + + context 'with mp4 file' do + let(:mp4_url) { 'https://streaming.example.com/dir/file.mp4' } + let(:derivative) { FactoryBot.build(:derivative, hls_url: mp4_url, mime_type: 'video/mp4' ) } + + it 'has format' do + expect(subject.format).to eq 'video/mp4' + end + + it 'has progressive download url with media fragment' do + expect(subject.url).to eq "#{mp4_url}#t=#{playlist_item.start_time / 1000},#{playlist_item.end_time / 1000}" + end + end end context 'when a user does not have access to a restricted item' do diff --git a/spec/models/media_object_spec.rb b/spec/models/media_object_spec.rb index 98a78bbeb5..cfa7a454fe 100644 --- a/spec/models/media_object_spec.rb +++ b/spec/models/media_object_spec.rb @@ -16,6 +16,8 @@ require 'cancan/matchers' describe MediaObject do + include ActiveJob::TestHelper + let(:media_object) { FactoryBot.create(:media_object) } it 'assigns a noid id' do @@ -251,18 +253,21 @@ media_object.read_groups += [Faker::Internet.ip_v4_address] media_object.publish! "random" media_object.reload + perform_enqueued_jobs(only: MediaObjectIndexingJob) expect(subject.can?(:read, media_object)).to be_falsey end it 'should be able to read single-ip authorized, published MediaObject' do media_object.read_groups += [ip_addr] media_object.publish! "random" media_object.reload + perform_enqueued_jobs(only: MediaObjectIndexingJob) expect(subject.can?(:read, media_object)).to be_truthy end it 'should be able to read ip-range authorized, published MediaObject' do media_object.read_groups += ["#{ip_addr}/30"] media_object.publish! "random" media_object.reload + perform_enqueued_jobs(only: MediaObjectIndexingJob) expect(subject.can?(:read, media_object)).to be_truthy end end @@ -272,7 +277,6 @@ # Force the validations to run by being on the resource-description workflow step subject(:media_object) { FactoryBot.build(:media_object).tap {|mo| mo.workflow.last_completed_step = "resource-description"} } - it {is_expected.to validate_presence_of(:date_issued)} it {is_expected.to validate_presence_of(:title)} end @@ -629,13 +633,17 @@ it 'includes virtual group leases in external group facet' do media_object.governing_policies += [FactoryBot.create(:lease, inherited_read_groups: ['TestGroup'])] media_object.save! - expect(media_object.to_solr['read_access_virtual_group_ssim']).to include('TestGroup') + media_object.reload + solr_doc = media_object.to_solr(include_child_fields: true) + expect(solr_doc['read_access_virtual_group_ssim']).to include('TestGroup') end it 'includes ip group leases in ip group facet' do ip_addr = Faker::Internet.ip_v4_address media_object.governing_policies += [FactoryBot.create(:lease, inherited_read_groups: [ip_addr])] media_object.save! - expect(media_object.to_solr['read_access_ip_group_ssim']).to include(ip_addr) + media_object.reload + solr_doc = media_object.to_solr(include_child_fields: true) + expect(solr_doc['read_access_ip_group_ssim']).to include(ip_addr) end it 'indexes modified time for descMetadata subresource' do expect(DateTime.parse(media_object.to_solr['descMetadata_modified_dtsi'])).to eq DateTime.parse(media_object.descMetadata.record_change_date.first) @@ -1274,8 +1282,8 @@ expect(mo.section_list).not_to eq nil expect(mo.sections).not_to eq mo.ordered_master_files.to_a expect(mo.section_ids).to eq [section.id, section2.id, new_section.id] - expect(mo.master_file_ids).to eq mo.section_ids - expect(mo.master_files).to eq mo.sections + expect(mo.master_file_ids).to match_array mo.section_ids + expect(mo.master_files).to match_array mo.sections end end end diff --git a/app/models/preview_step.rb b/spec/requests/search_spec.rb similarity index 53% rename from app/models/preview_step.rb rename to spec/requests/search_spec.rb index e9ab8f807c..eca31d2975 100644 --- a/app/models/preview_step.rb +++ b/spec/requests/search_spec.rb @@ -12,19 +12,19 @@ # specific language governing permissions and limitations under the License. # --- END LICENSE_HEADER BLOCK --- -class PreviewStep < Avalon::Workflow::BasicStep - def initialize(step = 'preview', - title = "Preview and publish", - summary = "Release the item for use", - template = 'preview') - super - end +require 'rails_helper' + +describe 'search', type: :request do + describe 'subject links' do + let!(:media_object) { FactoryBot.create(:fully_searchable_media_object, subject: ['both/and']) } - def execute context - media_object = context[:media_object] - # Publish the media object - media_object.avalon_publisher = context[:user] - media_object.save - context + it 'searches and finds the item' do + get "/media_objects/#{media_object.id}/manifest.json" + manifest_json = JSON.parse(response.body) + subject_links = manifest_json["metadata"].find {|hash| hash["label"]["none"] == ["Subject"] }["value"]["none"] + link = subject_links.first.match(/href="(.*)"/)[1] + get link + expect(response.body).to include(media_object.id) + end end end diff --git a/spec/services/waveform_service_spec.rb b/spec/services/waveform_service_spec.rb index 3d230993fe..c145cfb4a8 100644 --- a/spec/services/waveform_service_spec.rb +++ b/spec/services/waveform_service_spec.rb @@ -18,7 +18,7 @@ let(:service) { WaveformService.new } describe "get_waveform_json" do - let(:wav_path) { File.join(Rails.root, "spec/fixtures/meow.wav") } + let(:wav_path) { File.join(Rails.root, "spec/fixtures/meow.mono.wav") } it "should return waveform json from file" do allow(service).to receive(:get_wave_io).and_return(open(wav_path)) @@ -67,7 +67,7 @@ context "http file" do let(:uri) { "http://domain/to/video.mp4" } - let(:cmd) {"#{Settings.ffmpeg.path} -headers $'Referer: http://test.host/\r\n' -rw_timeout 60000000 -i '#{uri}' -f wav -ar 44100 - 2> /dev/null"} + let(:cmd) {"#{Settings.ffmpeg.path} -headers $'Referer: http://test.host/\r\n' -rw_timeout 60000000 -i '#{uri}' -f wav -ar 44100 -ac 1 - 2> /dev/null"} it "should call ffmpeg with headers" do service.send(:get_wave_io, uri) @@ -77,7 +77,7 @@ context "local file" do let(:uri) { "file:///path/to/video.mp4" } - let(:cmd) {"#{Settings.ffmpeg.path} -rw_timeout 60000000 -i '#{uri}' -f wav -ar 44100 - 2> /dev/null"} + let(:cmd) {"#{Settings.ffmpeg.path} -rw_timeout 60000000 -i '#{uri}' -f wav -ar 44100 -ac 1 - 2> /dev/null"} it "should call ffmpeg without headers" do service.send(:get_wave_io, uri) @@ -87,7 +87,7 @@ context 'with spaces in filename' do let(:uri) { 'file:///path/to/special%20video%20file.mp4' } let(:unencoded_uri) { 'file:///path/to/special video file.mp4' } - let(:cmd) {"#{Settings.ffmpeg.path} -rw_timeout 60000000 -i '#{unencoded_uri}' -f wav -ar 44100 - 2> /dev/null"} + let(:cmd) {"#{Settings.ffmpeg.path} -rw_timeout 60000000 -i '#{unencoded_uri}' -f wav -ar 44100 -ac 1 - 2> /dev/null"} it "should call ffmpeg without url encoding" do service.send(:get_wave_io, uri) diff --git a/yarn.lock b/yarn.lock index c90b3fa9c3..bca9d14501 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1352,7 +1352,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -1368,6 +1368,26 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" +"@jsonjoy.com/base64@^1.1.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/base64/-/base64-1.1.2.tgz#cf8ea9dcb849b81c95f14fc0aaa151c6b54d2578" + integrity sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA== + +"@jsonjoy.com/json-pack@^1.0.3": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz#33ca57ee29d12feef540f2139225597469dec894" + integrity sha512-zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg== + dependencies: + "@jsonjoy.com/base64" "^1.1.1" + "@jsonjoy.com/util" "^1.1.2" + hyperdyperid "^1.2.0" + thingies "^1.20.0" + +"@jsonjoy.com/util@^1.1.2", "@jsonjoy.com/util@^1.3.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.5.0.tgz#6008e35b9d9d8ee27bc4bfaa70c8cbf33a537b4c" + integrity sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA== + "@leichtgewicht/ip-codec@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" @@ -1469,18 +1489,17 @@ "@rollup/pluginutils" "^5.1.0" "@rollup/pluginutils@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0" - integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g== + version "5.1.3" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.3.tgz#3001bf1a03f3ad24457591f2c259c8e514e0dbdf" + integrity sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A== dependencies: "@types/estree" "^1.0.0" estree-walker "^2.0.2" - picomatch "^2.3.1" + picomatch "^4.0.2" -"@samvera/ramp@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@samvera/ramp/-/ramp-3.2.0.tgz#c281a6a2970e1bf6def1e2cabc5822ca22409261" - integrity sha512-lJUvPQETvYHWKW8GnO4XmP3D/JUZNNXELm9bDlOEv0PaQIs28FkSozbh/gQlNWh6DCBWUtV6qnG0ZlkNIH+qwQ== +"@samvera/ramp@https://github.com/samvera-labs/ramp.git#25d3c47533c5a452dca4b129294f97c8ced24873": + version "3.2.1" + resolved "https://github.com/samvera-labs/ramp.git#25d3c47533c5a452dca4b129294f97c8ced24873" dependencies: "@rollup/plugin-json" "^6.0.1" "@silvermine/videojs-quality-selector" "^1.3.1" @@ -1517,17 +1536,17 @@ "@types/connect" "*" "@types/node" "*" -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== +"@types/bonjour@^3.5.13": + version "3.5.13" + resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.13.tgz#adf90ce1a105e81dd1f9c61fdc5afda1bfb92956" + integrity sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ== dependencies: "@types/node" "*" -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== +"@types/connect-history-api-fallback@^1.5.4": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz#7de71645a103056b48ac3ce07b3520b819c1d5b3" + integrity sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw== dependencies: "@types/express-serve-static-core" "*" "@types/node" "*" @@ -1539,10 +1558,10 @@ dependencies: "@types/node" "*" -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== +"@types/eslint-scope@^3.7.7": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== dependencies: "@types/eslint" "*" "@types/estree" "*" @@ -1565,6 +1584,11 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== +"@types/estree@^1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== + "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": version "4.17.28" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" @@ -1574,7 +1598,17 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@*", "@types/express@^4.17.13": +"@types/express-serve-static-core@^4.17.33": + version "4.19.6" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267" + integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express@*": version "4.17.13" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== @@ -1584,6 +1618,16 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/express@^4.17.21": + version "4.17.21" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" + integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.33" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1": version "3.3.5" resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494" @@ -1648,16 +1692,18 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== -"@types/mime@*": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" - integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== - "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== +"@types/node-forge@^1.3.0": + version "1.3.11" + resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da" + integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ== + dependencies: + "@types/node" "*" + "@types/node@*": version "16.10.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz#5764ca9aa94470adb4e1185fe2e9f19458992b2e" @@ -1716,20 +1762,28 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== +"@types/retry@0.12.2": + version "0.12.2" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a" + integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow== "@types/scheduler@*": version "0.16.2" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== +"@types/send@*": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" + integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/serve-index@^1.9.4": + version "1.9.4" + resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.4.tgz#e6ae13d5053cb06ed36392110b4f9a49ac4ec898" + integrity sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug== dependencies: "@types/express" "*" @@ -1741,14 +1795,14 @@ "@types/mime" "^1" "@types/node" "*" -"@types/serve-static@^1.13.10": - version "1.15.2" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a" - integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw== +"@types/serve-static@^1.15.5": + version "1.15.7" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714" + integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw== dependencies: "@types/http-errors" "*" - "@types/mime" "*" "@types/node" "*" + "@types/send" "*" "@types/sinonjs__fake-timers@8.1.1": version "8.1.1" @@ -1760,10 +1814,10 @@ resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627" integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg== -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== +"@types/sockjs@^0.3.36": + version "0.3.36" + resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.36.tgz#ce322cf07bcc119d4cbf7f88954f3a3bd0f67535" + integrity sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q== dependencies: "@types/node" "*" @@ -1772,10 +1826,10 @@ resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" integrity sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI= -"@types/ws@^8.5.5": - version "8.5.5" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" - integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== +"@types/ws@^8.5.10": + version "8.5.13" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.13.tgz#6414c280875e2691d0d1e080b05addbf5cb91e20" + integrity sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA== dependencies: "@types/node" "*" @@ -1839,143 +1893,141 @@ global "~4.4.0" is-function "^1.0.1" -"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" - integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== +"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.12.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6" + integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ== dependencies: - "@webassemblyjs/helper-numbers" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-numbers" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" -"@webassemblyjs/floating-point-hex-parser@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" - integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== +"@webassemblyjs/floating-point-hex-parser@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb" + integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA== -"@webassemblyjs/helper-api-error@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" - integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== +"@webassemblyjs/helper-api-error@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7" + integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ== -"@webassemblyjs/helper-buffer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" - integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== +"@webassemblyjs/helper-buffer@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b" + integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA== -"@webassemblyjs/helper-numbers@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" - integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== +"@webassemblyjs/helper-numbers@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d" + integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA== dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.6" - "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/floating-point-hex-parser" "1.13.2" + "@webassemblyjs/helper-api-error" "1.13.2" "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" - integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== +"@webassemblyjs/helper-wasm-bytecode@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b" + integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA== -"@webassemblyjs/helper-wasm-section@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" - integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== +"@webassemblyjs/helper-wasm-section@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348" + integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/wasm-gen" "1.14.1" -"@webassemblyjs/ieee754@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" - integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== +"@webassemblyjs/ieee754@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba" + integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" - integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== +"@webassemblyjs/leb128@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0" + integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" - integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== - -"@webassemblyjs/wasm-edit@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" - integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-opt" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" - "@webassemblyjs/wast-printer" "1.11.6" - -"@webassemblyjs/wasm-gen@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" - integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wasm-opt@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" - integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" - -"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" - integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-api-error" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wast-printer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" - integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@xtuc/long" "4.2.2" +"@webassemblyjs/utf8@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1" + integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ== -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== +"@webassemblyjs/wasm-edit@^1.12.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597" + integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/helper-wasm-section" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-opt" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" + "@webassemblyjs/wast-printer" "1.14.1" + +"@webassemblyjs/wasm-gen@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570" + integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== +"@webassemblyjs/wasm-opt@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b" + integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw== dependencies: - envinfo "^7.7.3" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" + +"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.12.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb" + integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-api-error" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" + +"@webassemblyjs/wast-printer@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07" + integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== + +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xmldom/xmldom@^0.8.3": version "0.8.7" @@ -2013,12 +2065,12 @@ accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acorn-import-assertions@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn@^8.14.0: + version "8.14.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0" + integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== -acorn@^8.7.1, acorn@^8.8.2: +acorn@^8.8.2: version "8.10.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== @@ -2161,11 +2213,6 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - asap@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -2219,9 +2266,9 @@ aws4@^1.8.0: integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== axios@^1.6.0: - version "1.6.8" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" - integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== + version "1.7.7" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" + integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -2322,10 +2369,10 @@ bluebird@~3.4.0: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" integrity sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA== -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== +body-parser@1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== dependencies: bytes "3.1.2" content-type "~1.0.5" @@ -2335,20 +2382,18 @@ body-parser@1.20.2: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.11.0" + qs "6.13.0" raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" -bonjour-service@^1.0.11: - version "1.0.12" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.12.tgz#28fbd4683f5f2e36feedb833e24ba661cac960c3" - integrity sha512-pMmguXYCu63Ug37DluMKEHdxc+aaIf/ay4YbF8Gxtba+9d3u+rmEWy61VK3Z3hp8Rskok3BunHYnG0dUHAsblw== +bonjour-service@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" + integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" fast-deep-equal "^3.1.3" - multicast-dns "^7.2.4" + multicast-dns "^7.2.5" boolbase@^1.0.0: version "1.0.0" @@ -2363,7 +2408,7 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.2, braces@~3.0.2: +braces@^3.0.3, braces@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== @@ -2381,7 +2426,7 @@ browserslist@^4.0.0: nanocolors "^0.2.12" node-releases "^1.1.76" -browserslist@^4.14.5, browserslist@^4.21.4, browserslist@^4.21.9: +browserslist@^4.21.4, browserslist@^4.21.9: version "4.21.10" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0" integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== @@ -2391,6 +2436,16 @@ browserslist@^4.14.5, browserslist@^4.21.4, browserslist@^4.21.9: node-releases "^2.0.13" update-browserslist-db "^1.0.11" +browserslist@^4.24.0: + version "4.24.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== + dependencies: + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" + node-releases "^2.0.18" + update-browserslist-db "^1.1.1" + buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -2417,6 +2472,13 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" +bundle-name@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-4.1.0.tgz#f3b96b34160d6431a19d7688135af7cfb8797889" + integrity sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q== + dependencies: + run-applescript "^7.0.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -2440,6 +2502,17 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -2473,6 +2546,11 @@ caniuse-lite@^1.0.30001517: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001520.tgz#62e2b7a1c7b35269594cf296a80bdf8cb9565006" integrity sha512-tahF5O9EiiTzwTUqAeFjIZbn4Dnqxzz7ktrgGlMYNLH43Ul26IgTMH/zvL3DG0lZxBYnlT04axvInszUsZULdA== +caniuse-lite@^1.0.30001669: + version "1.0.30001680" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz#5380ede637a33b9f9f1fc6045ea99bd142f3da5e" + integrity sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -2515,10 +2593,10 @@ check-more-types@^2.24.0: optionalDependencies: fsevents "~2.3.2" -chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== +chokidar@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -2646,6 +2724,11 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -2661,7 +2744,7 @@ commander@^6.2.1: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.0.0, commander@^7.2.0: +commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -2743,10 +2826,10 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" - integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== +cookie@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9" + integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w== core-js-compat@^3.31.0: version "3.32.0" @@ -3040,17 +3123,32 @@ deepmerge@^4.0, deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== +default-browser-id@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-5.0.0.tgz#a1d98bf960c15082d8a3fa69e83150ccccc3af26" + integrity sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA== + +default-browser@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-5.2.1.tgz#7b7ba61204ff3e425b556869ae6d3e9d9f1712cf" + integrity sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg== dependencies: - execa "^5.0.0" + bundle-name "^4.1.0" + default-browser-id "^5.0.0" -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== delayed-stream@~1.0.0: version "1.0.0" @@ -3096,11 +3194,6 @@ dnd-core@^7.7.0: invariant "^2.2.4" redux "^4.0.1" -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - dns-packet@^5.2.2: version "5.4.0" resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" @@ -3233,6 +3326,11 @@ electron-to-chromium@^1.4.477: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.492.tgz#83fed8beb64ec60578069e15dddd17b13a77ca56" integrity sha512-36K9b/6skMVwAIEsC7GiQ8I8N3soCALVSHqWHzNDtGemAcI9Xu8hP02cywWM0A794rTHm0b0zHPeLJHtgFVamQ== +electron-to-chromium@^1.5.41: + version "1.5.56" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.56.tgz#3213f369efc3a41091c3b2c05bc0f406108ac1df" + integrity sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -3248,6 +3346,11 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +encodeurl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" + integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== + end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -3255,10 +3358,10 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.15.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" - integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== +enhanced-resolve@^5.17.1: + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -3293,6 +3396,18 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es-module-lexer@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" @@ -3303,6 +3418,11 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -3393,21 +3513,6 @@ execa@4.1.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - executable@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" @@ -3415,37 +3520,37 @@ executable@^4.1.1: dependencies: pify "^2.2.0" -express@^4.17.3: - version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== +express@^4.19.2: + version "4.21.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281" + integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.2" + body-parser "1.20.3" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.6.0" + cookie "0.7.1" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.2.0" + finalhandler "1.3.1" fresh "0.5.2" http-errors "2.0.0" - merge-descriptors "1.0.1" + merge-descriptors "1.0.3" methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.7" + path-to-regexp "0.1.10" proxy-addr "~2.0.7" - qs "6.11.0" + qs "6.13.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" + send "0.19.0" + serve-static "1.16.2" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -3521,13 +3626,13 @@ fill-range@^7.1.1: dependencies: to-regex-range "^5.0.1" -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== +finalhandler@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019" + integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ== dependencies: debug "2.6.9" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" on-finished "2.4.1" parseurl "~1.3.3" @@ -3606,11 +3711,6 @@ fs-extra@^9.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-monkey@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -3626,6 +3726,11 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -3650,6 +3755,17 @@ get-intrinsic@^1.1.3: has-proto "^1.0.1" has-symbols "^1.0.3" +get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-stream@^5.0.0, get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" @@ -3657,11 +3773,6 @@ get-stream@^5.0.0, get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - get-value@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" @@ -3695,18 +3806,6 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.1.3: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.2.0: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -3751,7 +3850,7 @@ graceful-fs@^4.1.2: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== -graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: +graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -3776,6 +3875,13 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" @@ -3820,6 +3926,13 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +hasown@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -3854,10 +3967,10 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== +html-entities@^2.4.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f" + integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA== html-minifier-terser@^5.0.1: version "5.1.1" @@ -3935,9 +4048,9 @@ http-parser-js@>=0.5.1: integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6" + integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA== dependencies: "@types/http-proxy" "^1.17.8" http-proxy "^1.18.1" @@ -3968,10 +4081,10 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +hyperdyperid@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b" + integrity sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A== hyphenate-style-name@^1.0.3: version "1.0.4" @@ -4054,10 +4167,10 @@ ini@2.0.0: resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== invariant@^2.1.0, invariant@^2.2.4: version "2.2.4" @@ -4071,10 +4184,10 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== +ipaddr.js@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8" + integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA== is-arguments@^1.0.4: version "1.1.1" @@ -4122,10 +4235,10 @@ is-core-module@^2.2.0: dependencies: has "^1.0.3" -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== is-extglob@^2.1.1: version "2.1.1" @@ -4161,6 +4274,13 @@ is-in-browser@^1.0.2, is-in-browser@^1.1.3: resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g== +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-installed-globally@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" @@ -4169,6 +4289,11 @@ is-installed-globally@~0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" +is-network-error@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997" + integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g== + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -4223,12 +4348,12 @@ is-unicode-supported@^0.1.0: resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== +is-wsl@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" + integrity sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw== dependencies: - is-docker "^2.0.0" + is-inside-container "^1.0.0" isarray@~1.0.0: version "1.0.0" @@ -4465,13 +4590,13 @@ konva@^9.0.0: resolved "https://registry.yarnpkg.com/konva/-/konva-9.3.6.tgz#62b36292dbe06c56eb161d5ead221c2b5c5a8926" integrity sha512-dqR8EbcM0hjuilZCBP6xauQ5V3kH3m9kBcsDkqPypQuRgsXbcXUrxqYxhNbdvKZpYNW8Amq94jAD/C0NY3qfBQ== -launch-editor@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" - integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== +launch-editor@^2.6.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.9.1.tgz#253f173bd441e342d4344b4dae58291abb425047" + integrity sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w== dependencies: picocolors "^1.0.0" - shell-quote "^1.7.3" + shell-quote "^1.8.1" lazy-ass@^1.6.0: version "1.6.0" @@ -4598,9 +4723,9 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: js-tokens "^3.0.0 || ^4.0.0" lop@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/lop/-/lop-0.4.1.tgz#744f1696ef480e68ce1947fe557b09db5af2a738" - integrity sha512-9xyho9why2A2tzm5aIcMWKvzqKsnxrf9B5I+8O30olh6lQU8PH978LqZoI4++37RBgS1Em5i54v1TFs/3wnmXQ== + version "0.4.2" + resolved "https://registry.yarnpkg.com/lop/-/lop-0.4.2.tgz#c9c2f958a39b9da1c2f36ca9ad66891a9fe84640" + integrity sha512-RefILVDQ4DKoRZsJ4Pj22TxE3omDO47yFpkIBoDKzkqPRISs5U1cnAdg/5583YPkWPaLIYHOKRMQSvjFsO26cw== dependencies: duck "^0.1.12" option "~0.2.1" @@ -4659,7 +4784,17 @@ mammoth@^1.4.19: underscore "^1.13.1" xmlbuilder "^10.0.0" -manifesto.js@^4.1.0, manifesto.js@^4.2.14: +manifesto.js@^4.1.0: + version "4.2.20" + resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.20.tgz#67abb70dff9988c343e2d382379889ccbd6c2a0d" + integrity sha512-6J09N3pC335QirVZMXBkp4Mfa9IthKfy1BtGCvyre59z5h4l6OCc62NsyDFCGaysZRyuZ7zY4uzT7xU1g8yVHg== + dependencies: + "@edsilv/http-status-codes" "^1.0.3" + "@iiif/vocabulary" "^1.0.26" + isomorphic-unfetch "^3.0.0" + lodash "^4.17.21" + +manifesto.js@^4.2.14: version "4.2.17" resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.17.tgz#9d06dd50f5442a80897ccf7d88dfe861afb6a343" integrity sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA== @@ -4684,17 +4819,20 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -memfs@^3.4.3: - version "3.4.4" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.4.tgz#e8973cd8060548916adcca58a248e7805c715e89" - integrity sha512-W4gHNUE++1oSJVn8Y68jPXi+mkx3fXR5ITE/Ubz6EQ3xRpCN5k2CQ4AUR8094Z7211F876TyoBACGsIveqgiGA== +memfs@^4.6.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.14.0.tgz#48d5e85a03ea0b428280003212fbca3063531be3" + integrity sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA== dependencies: - fs-monkey "1.0.3" + "@jsonjoy.com/json-pack" "^1.0.3" + "@jsonjoy.com/util" "^1.3.0" + tree-dump "^1.0.1" + tslib "^2.0.0" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge-descriptors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" + integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== merge-stream@^2.0.0: version "2.0.0" @@ -4706,12 +4844,12 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== +micromatch@4.0.8, micromatch@^4.0.2: + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: - braces "^3.0.2" + braces "^3.0.3" picomatch "^2.3.1" mime-db@1.50.0, "mime-db@>= 1.43.0 < 2": @@ -4772,7 +4910,7 @@ minimalistic-assert@^1.0.0: resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== -minimatch@^3.0.4, minimatch@^3.1.1: +minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -4814,7 +4952,7 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multicast-dns@^7.2.4: +multicast-dns@^7.2.5: version "7.2.5" resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== @@ -4885,12 +5023,17 @@ node-releases@^2.0.13: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== + normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +npm-run-path@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -4909,6 +5052,11 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= +object-inspect@^1.13.1: + version "1.13.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a" + integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA== + object-inspect@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" @@ -4919,7 +5067,7 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@2.4.1: +on-finished@2.4.1, on-finished@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== @@ -4938,21 +5086,22 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.0, onetime@^5.1.2: +onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" -open@^8.0.9: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== +open@^10.0.3: + version "10.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-10.1.0.tgz#a7795e6e5d519abe4286d9937bb24b51122598e1" + integrity sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw== dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" + default-browser "^5.2.1" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^3.1.0" option@~0.2.1: version "0.2.4" @@ -4985,12 +5134,13 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== +p-retry@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd" + integrity sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA== dependencies: - "@types/retry" "0.12.0" + "@types/retry" "0.12.2" + is-network-error "^1.0.0" retry "^0.13.1" p-try@^2.0.0: @@ -5076,10 +5226,10 @@ path-parse@^1.0.6, path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +path-to-regexp@0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" + integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== path-type@^4.0.0: version "4.0.0" @@ -5108,10 +5258,10 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picocolors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== +picocolors@^1.1.0, picocolors@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.0" @@ -5123,6 +5273,11 @@ picomatch@^2.2.3, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +picomatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" + integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== + pify@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -5398,13 +5553,13 @@ postcss-value-parser@^4.2.0: integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.3.11: - version "8.4.40" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8" - integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q== + version "8.4.49" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19" + integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA== dependencies: nanoid "^3.3.7" - picocolors "^1.0.1" - source-map-js "^1.2.0" + picocolors "^1.1.1" + source-map-js "^1.2.1" postcss@^8.4.21, postcss@^8.4.24: version "8.4.38" @@ -5512,12 +5667,12 @@ qs@6.10.4: dependencies: side-channel "^1.0.4" -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== +qs@6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== dependencies: - side-channel "^1.0.4" + side-channel "^1.0.6" querystringify@^2.1.1: version "2.2.0" @@ -5597,9 +5752,9 @@ react-dom@^17.0.1: scheduler "^0.20.2" react-error-boundary@^4.0.11: - version "4.0.13" - resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947" - integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ== + version "4.1.2" + resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.1.2.tgz#bc750ad962edb8b135d6ae922c046051eb58f289" + integrity sha512-GQDxZ5Jd+Aq/qUxbCm1UtzmL/s++V7zKgE8yMktJiCQXCCFZnMZh9ng+6/Ne6PjNSXH0L9CjeOEREfRnq6Duag== dependencies: "@babel/runtime" "^7.12.5" @@ -5768,12 +5923,12 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== dependencies: - resolve "^1.9.0" + resolve "^1.20.0" redux-thunk@^2.3.0: version "2.4.2" @@ -5898,7 +6053,7 @@ resolve@^1.14.2: is-core-module "^2.2.0" path-parse "^1.0.6" -resolve@^1.19.0, resolve@^1.9.0: +resolve@^1.19.0: version "1.22.4" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== @@ -5907,6 +6062,15 @@ resolve@^1.19.0, resolve@^1.9.0: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.20.0: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -5925,12 +6089,10 @@ rfdc@^1.3.0: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" +run-applescript@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb" + integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A== rust-result@^1.0.0: version "1.0.0" @@ -5976,9 +6138,9 @@ safe-json-parse@4.0.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sanitize-html@^2.10.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.0.tgz#71aedcdb777897985a4ea1877bf4f895a1170dae" - integrity sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA== + version "2.13.1" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.13.1.tgz#b4639b0a09574ab62b1b353cb99b1b87af742834" + integrity sha512-ZXtKq89oue4RP7abL9wp/9URJcqQNABB5GGJ2acW1sdO8JTVl92f4ygD7Yc9Ze09VAZhnt2zegeU0tbNsdcLYg== dependencies: deepmerge "^4.2.2" escape-string-regexp "^4.0.0" @@ -6039,7 +6201,7 @@ schema-utils@^4.0.0: ajv-formats "^2.1.1" ajv-keywords "^5.0.0" -schema-utils@^4.0.1: +schema-utils@^4.0.1, schema-utils@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== @@ -6054,11 +6216,12 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== +selfsigned@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" + integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== dependencies: + "@types/node-forge" "^1.3.0" node-forge "^1" semver@^6.0.0, semver@^6.3.1: @@ -6080,10 +6243,10 @@ semver@^7.5.3: dependencies: lru-cache "^6.0.0" -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== +send@0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" + integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== dependencies: debug "2.6.9" depd "2.0.0" @@ -6119,15 +6282,27 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== +serve-static@1.16.2: + version "1.16.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296" + integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw== dependencies: - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.18.0" + send "0.19.0" + +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" set-value@^4.1.0: version "4.1.0" @@ -6185,7 +6360,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.7.3: +shell-quote@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== @@ -6199,7 +6374,17 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.2, signal-exit@^3.0.3: +side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + +signal-exit@^3.0.2: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -6241,6 +6426,11 @@ source-map-js@^1.2.0: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== +source-map-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== + source-map-support@~0.5.12: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -6421,7 +6611,7 @@ tapable@^2.0, tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -terser-webpack-plugin@5, terser-webpack-plugin@^5.3.7: +terser-webpack-plugin@5: version "5.3.9" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== @@ -6432,6 +6622,17 @@ terser-webpack-plugin@5, terser-webpack-plugin@^5.3.7: serialize-javascript "^6.0.1" terser "^5.16.8" +terser-webpack-plugin@^5.3.10: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + dependencies: + "@jridgewell/trace-mapping" "^0.3.20" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.1" + terser "^5.26.0" + terser@^4.6.3: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" @@ -6451,6 +6652,21 @@ terser@^5.16.8: commander "^2.20.0" source-map-support "~0.5.20" +terser@^5.26.0: + version "5.36.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.36.0.tgz#8b0dbed459ac40ff7b4c9fd5a3a2029de105180e" + integrity sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + +thingies@^1.20.0: + version "1.21.0" + resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.21.0.tgz#e80fbe58fd6fdaaab8fad9b67bd0a5c943c445c1" + integrity sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g== + throttleit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.1.tgz#304ec51631c3b770c65c6c6f76938b384000f4d5" @@ -6508,11 +6724,21 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== +tree-dump@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.0.2.tgz#c460d5921caeb197bde71d0e9a7b479848c5b8ac" + integrity sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ== + tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.0.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== + tslib@^2.0.3: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" @@ -6632,6 +6858,14 @@ update-browserslist-db@^1.0.11: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== + dependencies: + escalade "^3.2.0" + picocolors "^1.1.0" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -6763,10 +6997,10 @@ warning@^4.0.0, warning@^4.0.3: dependencies: loose-envify "^1.0.0" -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== +watchpack@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" + integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -6801,70 +7035,70 @@ webpack-assets-manifest@5: schema-utils "^3.0" tapable "^2.0" -webpack-cli@4: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== +webpack-cli@5: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" - commander "^7.0.0" + commander "^10.0.1" cross-spawn "^7.0.3" + envinfo "^7.7.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" + interpret "^3.1.1" + rechoir "^0.8.0" webpack-merge "^5.7.3" -webpack-dev-middleware@^5.3.1: - version "5.3.4" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" - integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== +webpack-dev-middleware@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz#40e265a3d3d26795585cff8207630d3a8ff05877" + integrity sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA== dependencies: colorette "^2.0.10" - memfs "^3.4.3" + memfs "^4.6.0" mime-types "^2.1.31" + on-finished "^2.4.1" range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@4: - version "4.15.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz#8944b29c12760b3a45bdaa70799b17cb91b03df7" - integrity sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.5" +webpack-dev-server@5: + version "5.1.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz#8f44147402b4d8ab99bfeb9b6880daa1411064e5" + integrity sha512-aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ== + dependencies: + "@types/bonjour" "^3.5.13" + "@types/connect-history-api-fallback" "^1.5.4" + "@types/express" "^4.17.21" + "@types/serve-index" "^1.9.4" + "@types/serve-static" "^1.15.5" + "@types/sockjs" "^0.3.36" + "@types/ws" "^8.5.10" ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" + bonjour-service "^1.2.1" + chokidar "^3.6.0" colorette "^2.0.10" compression "^1.7.4" connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" + express "^4.19.2" graceful-fs "^4.2.6" - html-entities "^2.3.2" + html-entities "^2.4.0" http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - launch-editor "^2.6.0" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.1.1" + ipaddr.js "^2.1.0" + launch-editor "^2.6.1" + open "^10.0.3" + p-retry "^6.2.0" + schema-utils "^4.2.0" + selfsigned "^2.4.1" serve-index "^1.9.1" sockjs "^0.3.24" spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.13.0" + webpack-dev-middleware "^7.4.2" + ws "^8.18.0" webpack-merge@^5.7.3, webpack-merge@^5.9.0: version "5.9.0" @@ -6880,33 +7114,32 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@5: - version "5.88.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" - integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^1.0.0" - "@webassemblyjs/ast" "^1.11.5" - "@webassemblyjs/wasm-edit" "^1.11.5" - "@webassemblyjs/wasm-parser" "^1.11.5" - acorn "^8.7.1" - acorn-import-assertions "^1.9.0" - browserslist "^4.14.5" + version "5.96.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.96.1.tgz#3676d1626d8312b6b10d0c18cc049fba7ac01f0c" + integrity sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA== + dependencies: + "@types/eslint-scope" "^3.7.7" + "@types/estree" "^1.0.6" + "@webassemblyjs/ast" "^1.12.1" + "@webassemblyjs/wasm-edit" "^1.12.1" + "@webassemblyjs/wasm-parser" "^1.12.1" + acorn "^8.14.0" + browserslist "^4.24.0" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.15.0" + enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" + graceful-fs "^4.2.11" json-parse-even-better-errors "^2.3.1" loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" schema-utils "^3.2.0" tapable "^2.1.1" - terser-webpack-plugin "^5.3.7" - watchpack "^2.4.0" + terser-webpack-plugin "^5.3.10" + watchpack "^2.4.1" webpack-sources "^3.2.3" websocket-driver@>=0.5.1, websocket-driver@^0.7.4: @@ -6977,7 +7210,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@^8.13.0: +ws@^8.18.0: version "8.18.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==