From 2ebc2090991a5adda814e4fb0d7b1623032073a6 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Wed, 18 Mar 2020 14:20:12 -0400
Subject: [PATCH 01/61] Disable Create Timeline button until derivative loads

---
 app/views/media_objects/_timeline.html.erb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/views/media_objects/_timeline.html.erb b/app/views/media_objects/_timeline.html.erb
index 3390ba2f70..29992f7cd9 100644
--- a/app/views/media_objects/_timeline.html.erb
+++ b/app/views/media_objects/_timeline.html.erb
@@ -15,7 +15,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 %>
 
 <div id="timeline-button" style="display: inline-block;">
-  <button type="button" class="btn btn-default" data-toggle="modal" data-target="#timelineModal" style="margin-top: 10px;">
+  <button type="button" class="btn btn-default" id="timeline-btn" data-toggle="modal" data-target="#timelineModal" style="margin-top: 10px;" disabled >
     Create Timeline
   </button>
 </div>
@@ -49,6 +49,17 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 <script>
 $(document).ready(function() {
+  let timelineBtn = $('#timeline-btn');
+  // Enable create timeline button after derivative is loaded
+  timeCheck = setInterval(enableTimelineBtn, 500);
+
+  function enableTimelineBtn() {
+    let currentVal = currentPlayer.duration;
+    if(currentVal > 0) {
+      timelineBtn[0].disabled = false;
+      clearInterval(timeCheck);
+    }
+  }
   $('#timelineModal').on('show.bs.modal', function (e) {
     console.log('in modal builder')
     let $modalBody = $('#timelineModal').find('div#new-timeline-inputs')[0]

From b4f23b16c3c11bae2b7b8938aad8c6e72412147a Mon Sep 17 00:00:00 2001
From: Phil Dinh <phuongdh@gmail.com>
Date: Tue, 24 Mar 2020 09:22:47 -0400
Subject: [PATCH 02/61] Add production stage to Dockerfile (#4053)

* Restructure Dockerfile, add prod stage

* Add build target to docker-compose

* Further slim down prod image

* Allow logging to stdout in production
---
 .dockerignore                     |  7 ++-
 Dockerfile                        | 96 +++++++++++++++++++++----------
 Gemfile                           |  1 +
 config/environments/production.rb | 21 +++++--
 docker-compose.yml                |  9 +--
 docker_init.sh                    |  4 --
 6 files changed, 93 insertions(+), 45 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 248b28f251..662e28b6b9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,10 @@
+.bundle
 .git
 .DS_Store
 .gitignore
 .env
-tmp
 Dockerfile
-docker-compose.yml
\ No newline at end of file
+docker-compose.yml
+node_modules
+public/packs
+tmp
diff --git a/Dockerfile b/Dockerfile
index c4a08dc941..6b8a6e3a5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
 # Base stage for building gems
-FROM        ruby:2.5.5-stretch as base
-ENV         BUNDLER_VERSION 2.0.2
+FROM        ruby:2.5.5-stretch as bundle
 RUN         echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list \
          && apt-get update && apt-get upgrade -y build-essential \
          && apt-get install -y --no-install-recommends \
@@ -8,39 +7,41 @@ RUN         echo "deb http://deb.debian.org/debian stretch-backports main" >> /e
             pkg-config \
             zip \
             git \
-         && gem install bundler \
          && rm -rf /var/lib/apt/lists/* \
          && apt-get clean
 
-RUN         mkdir -p /home/app/avalon
-WORKDIR     /home/app/avalon
-
 COPY        Gemfile ./Gemfile
 COPY        Gemfile.lock ./Gemfile.lock
-RUN         bundle config build.nokogiri --use-system-libraries \
-         && bundle install --with aws development test postgres --without production 
 
+RUN         gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)" \
+         && bundle config build.nokogiri --use-system-libraries
+
+
+# Build development gems
+FROM        bundle as bundle-dev
+RUN         bundle install --with aws development test postgres --without production 
 
-# Download stage takes advantage of parallel build
+
+# Download binaries in parallel
 FROM        ruby:2.5.5-stretch as download
+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/
 RUN         curl https://chromedriver.storage.googleapis.com/2.46/chromedriver_linux64.zip -o /usr/local/bin/chromedriver \
-         && chmod +x /usr/local/bin/chromedriver \
-         && 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/ \
-         && mkdir -p /tmp/ffmpeg && cd /tmp/ffmpeg \
+         && chmod +x /usr/local/bin/chromedriver
+RUN         curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb
+RUN         mkdir -p /tmp/ffmpeg && cd /tmp/ffmpeg \
          && curl https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz | tar xJ \
          && cp `find . -type f -executable` /usr/bin/
 
 
-# Dev stage for building dev image
-FROM        ruby:2.5.5-slim-stretch as dev
-ENV         BUNDLER_VERSION 2.0.2
+# Base stage for building final images
+FROM        ruby:2.5.5-slim-stretch as base
 RUN         apt-get update && apt-get install -y --no-install-recommends curl gnupg2 \
          && curl -sL http://deb.nodesource.com/setup_8.x | bash - \
          && curl -O https://mediaarea.net/repo/deb/repo-mediaarea_1.0-6_all.deb && dpkg -i repo-mediaarea_1.0-6_all.deb \
          && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
          && echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
-RUN         apt-get update && apt-get install -y --no-install-recommends \
+RUN         apt-get update && apt-get install -y --no-install-recommends --allow-unauthenticated \
             yarn \
             nodejs \
             lsof \
@@ -53,23 +54,60 @@ RUN         apt-get update && apt-get install -y --no-install-recommends \
             mediainfo \
             openssh-client \
             zip \
-            imagemagick \
             dumb-init \
-         && gem install bundler \
-         && curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /chrome.deb \
-         && dpkg -i /chrome.deb || apt-get install -yf \
          && ln -s /usr/bin/lsof /usr/sbin/
 
-ARG         AVALON_BRANCH=develop
-ARG         RAILS_ENV=development
-ARG         BASE_URL
-ARG         DATABASE_URL
-ARG         SECRET_KEY_BASE
 
-COPY        --from=base /usr/local/bundle /usr/local/bundle
-COPY        --from=download /usr/local/bin/chromedriver /usr/local/bin/chromedriver
+RUN         useradd -m -U app \
+         && su -s /bin/bash -c "mkdir -p /home/app/avalon" app
+WORKDIR     /home/app/avalon
+
 COPY        --from=download /usr/bin/ff* /usr/bin/
-COPY        --from=download /usr/bin/dockerize /usr/bin/
 
-WORKDIR     /home/app/avalon
+
+
+# Build devevelopment image
+FROM        base as dev
+COPY        --from=bundle-dev /usr/local/bundle /usr/local/bundle
+COPY        --from=download /chrome.deb /
+COPY        --from=download /usr/local/bin/chromedriver /usr/local/bin/chromedriver
+COPY        --from=download /usr/bin/dockerize /usr/bin/
 ADD         docker_init.sh /
+
+ARG         RAILS_ENV=development
+RUN         dpkg -i /chrome.deb || apt-get install -yf
+
+
+# Build production gems
+FROM        bundle as bundle-prod
+RUN         bundle install --without development test --with aws production postgres
+
+
+# Install node modules
+FROM        node:8.17.0-stretch-slim as node-modules
+RUN         apt-get update && apt-get install -y --no-install-recommends git
+COPY        package.json .
+COPY        yarn.lock .
+RUN         yarn install
+
+
+# Build production assets
+FROM        base as assets
+COPY        --from=bundle-prod --chown=app:app /usr/local/bundle /usr/local/bundle
+COPY        --chown=app:app . .
+COPY        --from=node-modules --chown=app:app /node_modules ./node_modules
+
+USER        app
+ENV         RAILS_ENV=production
+
+RUN         bundle exec rake assets:precompile SECRET_KEY_BASE=$(ruby -r 'securerandom' -e 'puts SecureRandom.hex(64)') \
+         && cp config/controlled_vocabulary.yml.example config/controlled_vocabulary.yml
+
+
+# Build production image
+FROM        base as prod
+COPY        --from=assets --chown=app:app /home/app/avalon /home/app/avalon
+COPY        --from=bundle-prod --chown=app:app /usr/local/bundle /usr/local/bundle
+
+USER        app
+ENV         RAILS_ENV=production
diff --git a/Gemfile b/Gemfile
index c3145f2a7e..2e7c3fe30b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -146,6 +146,7 @@ end
 group :production do
   gem 'google-analytics-rails', '1.1.0'
   gem 'lograge'
+  gem 'puma'
 end
 
 # Install the bundle --with aws when running on Amazon Elastic Beanstalk
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0b1efe22d1..da8df52ad5 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -60,16 +60,28 @@
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
   # Enable logging to both stdout and file, in more compact format
-  config.lograge.enabled = true
-  config.lograge.custom_options = lambda do |event|
-    {:time => event.time}
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger.formatter = config.log_formatter
+    config.logger    = ActiveSupport::TaggedLogging.new(logger)
+  else
+    config.lograge.enabled = true
+    config.lograge.custom_options = lambda do |event|
+      {:time => event.time}
+    end
   end
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
   config.log_level = :info
 
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
+  
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
@@ -95,9 +107,6 @@
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 725f50e512..4d2526da8e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.2'
+version: '3.4'
 
 volumes:
   database:
@@ -77,8 +77,10 @@ services:
     <<: *redis
 
   avalon: &avalon
-    image: avalonmediasystem/avalon:7.0-slim-dev-20200225
-    build: .
+    image: avalonmediasystem/avalon:7.1-slim-dev-20200318
+    build:
+      context: .
+      target: dev
     command: bash -c "/docker_init.sh && rails server -b 0.0.0.0"
     depends_on:
       - db
@@ -89,7 +91,6 @@ services:
       - minio
     environment:
       - APP_NAME=avalon
-      - AVALON_BRANCH=develop
       - SETTINGS__DOMAIN=http://localhost:3000
       - BUNDLE_FLAGS=--with development postgres --without production test
       - ENCODE_WORK_DIR=/tmp
diff --git a/docker_init.sh b/docker_init.sh
index e02f8ccbd0..8181cbeb70 100755
--- a/docker_init.sh
+++ b/docker_init.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-cd /home/app/avalon
-export HOME=/home/app
-
-# Workaround from https://github.com/yarnpkg/yarn/issues/2782
 yarn install
 
 bundle install && \

From c1c5f9f7ab47988906d039a2704eaf2f33d44d47 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Tue, 24 Mar 2020 12:05:56 -0400
Subject: [PATCH 03/61] Disable Add to Playlist button until derivative is
 fetched

---
 .../mejs4_plugin_add_to_playlist.es6             | 16 +++++++++++++++-
 app/views/media_objects/_timeline.html.erb       |  3 +--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6
index 0c22f82a42..6d14e4514c 100644
--- a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6
+++ b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6
@@ -60,7 +60,21 @@ Object.assign(MediaElementPlayer.prototype, {
       'add-to-playlist-button';
     player.addPlaylistButton.innerHTML = `<button type="button" aria-controls="${
       t.id
-    }" title="${addTitle}" aria-label="${addTitle}" tabindex="0">${addTitle}</button>`;
+    }" title="${addTitle}" aria-label="${addTitle}" tabindex="0" style="opacity: 0.5; cursor: not-allowed;" disabled>${addTitle}</button>`;
+
+    let playlistBtn = player.addPlaylistButton.childNodes[0];
+
+    let enableBtn = () => {
+      if(player.duration > 0) {
+        playlistBtn.style.opacity = 1;
+        playlistBtn.style.cursor = 'pointer';
+        playlistBtn.disabled = false;
+        clearInterval(timeCheck);
+      }
+    }
+
+    // Enable add to playlist  button after derivative is loaded
+    let timeCheck = setInterval(enableBtn, 500);
 
     // Add control button to player
     t.addControlElement(player.addPlaylistButton, 'addToPlaylist');
diff --git a/app/views/media_objects/_timeline.html.erb b/app/views/media_objects/_timeline.html.erb
index 29992f7cd9..d53be1cf62 100644
--- a/app/views/media_objects/_timeline.html.erb
+++ b/app/views/media_objects/_timeline.html.erb
@@ -54,8 +54,7 @@ $(document).ready(function() {
   timeCheck = setInterval(enableTimelineBtn, 500);
 
   function enableTimelineBtn() {
-    let currentVal = currentPlayer.duration;
-    if(currentVal > 0) {
+    if(currentPlayer.duration > 0) {
       timelineBtn[0].disabled = false;
       clearInterval(timeCheck);
     }

From 927183ce4a64b2563527681a9fc45e40ee0e4a16 Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Tue, 24 Mar 2020 14:45:55 -0400
Subject: [PATCH 04/61] Upgrade acorn from 6.1.1 to 6.4.1

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b93ffebb7f..3ba392376d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1114,9 +1114,9 @@ acorn-dynamic-import@^4.0.0:
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
 acorn@^6.0.5:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
-  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
+  integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
 ajv-errors@^1.0.0:
   version "1.0.1"

From 65e0247513dfaf074be8964db7960403630eb536 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 24 Mar 2020 15:02:25 -0400
Subject: [PATCH 05/61] After the derivative object is destroyed queue a job
 which deletes the actual file from the streaming server

---
 app/jobs/delete_derivative_job.rb | 35 +++++++++++++++++++++++++++++++
 app/models/derivative.rb          | 10 ++++-----
 2 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 app/jobs/delete_derivative_job.rb

diff --git a/app/jobs/delete_derivative_job.rb b/app/jobs/delete_derivative_job.rb
new file mode 100644
index 0000000000..4a61f77d00
--- /dev/null
+++ b/app/jobs/delete_derivative_job.rb
@@ -0,0 +1,35 @@
+# Copyright 2011-2020, 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 'fileutils'
+
+class DeleteDerivativeJob < ActiveJob::Base
+  queue_as :delete_derivative
+
+  def perform(path)
+    Rails.logger.debug "Attempting to delete derivative #{path}"
+
+    path = derivative.absolute_location
+    locator = FileLocator.new(path)
+    if locator.exists?
+      case locator.uri.scheme
+      when 'file' then File.delete(path)
+      when 's3'   then FileLocator::S3File.new(locator.source).object.delete
+      end
+      Rails.logger.info "#{path} has been deleted"
+    else
+      Rails.logger.warn "MasterFile #{path} does not exist"
+    end
+  end
+end
diff --git a/app/models/derivative.rb b/app/models/derivative.rb
index 83239201c7..4895f7096c 100644
--- a/app/models/derivative.rb
+++ b/app/models/derivative.rb
@@ -63,7 +63,7 @@ class Derivative < ActiveFedora::Base
     index.as :displayable
   end
 
-  # before_destroy :retract_distributed_files!
+  after_destroy :delete_file!
 
   def initialize(*args)
     super(*args)
@@ -124,9 +124,7 @@ def bitrate
 
   private
 
-  # TODO: move this into a service class
-  def retract_distributed_files!
-    # no-op in latest ActiveEncode
-    # TODO: Implement this in a different way outside of ActiveEncode
-  end
+    def delete_file!
+      DeleteDerivativeJob.perform_later(absolute_location) if managed
+    end
 end

From aa9ae7e04257b25e579af67a1f6aa17f9f7a03e5 Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Tue, 24 Mar 2020 13:49:30 -0400
Subject: [PATCH 06/61] Update rails to 5.2.4.2 for actionview XSS fix

---
 .circleci/config.yml |   2 +-
 Dockerfile           |   4 ++
 Gemfile              |   2 +-
 Gemfile.lock         | 107 ++++++++++++++++++++++---------------------
 docker-compose.yml   |   2 +-
 5 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 31cb922f2e..caf67e7d9a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
   build:
     docker:
      # Primary container image where all steps run.
-     - image: avalonmediasystem/avalon:7.0-slim-dev-20200225
+     - image: avalonmediasystem/avalon:7.1-slim-dev-20200324
        environment:
         - DATABASE_URL=postgresql://postgres@localhost:5432/postgres
         - FEDORA_URL=http://localhost:8080/fcrepo/rest
diff --git a/Dockerfile b/Dockerfile
index 6b8a6e3a5c..cca6c8a162 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,6 +68,10 @@ COPY        --from=download /usr/bin/ff* /usr/bin/
 
 # Build devevelopment image
 FROM        base as dev
+RUN         apt-get install -y --no-install-recommends --allow-unauthenticated \
+            build-essential \
+            cmake
+
 COPY        --from=bundle-dev /usr/local/bundle /usr/local/bundle
 COPY        --from=download /chrome.deb /
 COPY        --from=download /usr/local/bin/chromedriver /usr/local/bin/chromedriver
diff --git a/Gemfile b/Gemfile
index 2e7c3fe30b..86bf4456e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=5.2.3'
+gem 'rails', '=5.2.4.2'
 gem 'sprockets', '~>3.7.2'
 gem 'sqlite3'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6dcee653d7..5b8daa240e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,25 +112,25 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.4.2)
+      actionpack (= 5.2.4.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.4.2)
+      actionview (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.4.2)
+      activesupport (= 5.2.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -165,18 +165,18 @@ GEM
       nom-xml (>= 0.5.1)
       om (~> 3.1)
       rdf-rdfxml (~> 2.0)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.4.2)
+      activesupport (= 5.2.4.2)
       globalid (>= 0.3.6)
     activejob-traffic_control (0.1.3)
       activejob (>= 4.2)
       activesupport (>= 4.2)
       suo
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.4.2)
+      activesupport (= 5.2.4.2)
+    activerecord (5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       arel (>= 9.0)
     activerecord-session_store (1.1.3)
       actionpack (>= 4.0)
@@ -184,11 +184,11 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (5.2.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -267,7 +267,7 @@ GEM
       sass-rails
       signet
       skydrive
-    builder (3.2.3)
+    builder (3.2.4)
     byebug (11.0.1)
     cancancan (1.17.0)
     capistrano (3.11.0)
@@ -312,7 +312,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     config (1.7.1)
       activesupport (>= 3.0)
       deep_merge (~> 1.2.1)
@@ -387,7 +387,7 @@ GEM
       mail (~> 2.7)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.8.0)
+    erubi (1.9.0)
     execjs (2.7.0)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
@@ -464,7 +464,7 @@ GEM
       hydra-access-controls (= 10.6.2)
       hydra-core (= 10.6.2)
       rails (>= 3.2.6)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     iconv (1.0.8)
     iiif_manifest (0.6.0)
@@ -539,10 +539,10 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    mimemagic (0.3.4)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.0)
     msgpack (1.2.10)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -553,12 +553,12 @@ GEM
       net-ssh (>= 2.6.5, < 6.0.0)
     net-ssh (5.2.0)
     netrc (0.11.0)
-    nio4r (2.3.1)
+    nio4r (2.5.2)
     noid (0.9.0)
     noid-rails (3.0.1)
       actionpack (>= 5.0.0, < 6)
       noid (~> 0.9)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nom-xml (1.1.0)
       activesupport (>= 3.2.18)
@@ -602,7 +602,9 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
-    rack (2.0.8)
+    puma (4.3.3)
+      nio4r (~> 2.0)
+    rack (2.2.2)
     rack-cors (1.1.0)
       rack (>= 2.0.0)
     rack-protection (2.0.7)
@@ -611,18 +613,18 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.4.2)
+      actioncable (= 5.2.4.2)
+      actionmailer (= 5.2.4.2)
+      actionpack (= 5.2.4.2)
+      actionview (= 5.2.4.2)
+      activejob (= 5.2.4.2)
+      activemodel (= 5.2.4.2)
+      activerecord (= 5.2.4.2)
+      activestorage (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.4.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -633,9 +635,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    railties (5.2.4.2)
+      actionpack (= 5.2.4.2)
+      activesupport (= 5.2.4.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -841,14 +843,14 @@ GEM
     sxp (1.0.1)
       rdf (>= 2.2, < 4.0)
     temple (0.8.1)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.9)
     twitter-typeahead-rails (0.11.1.pre.corejavascript)
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uber (0.0.15)
     uglifier (4.1.20)
@@ -877,9 +879,9 @@ GEM
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
     whenever (0.11.0)
       chronic (>= 0.6.3)
     with_locking (1.0.2)
@@ -976,8 +978,9 @@ DEPENDENCIES
   pg
   pry-byebug
   pry-rails
+  puma
   rack-cors
-  rails (= 5.2.3)
+  rails (= 5.2.4.2)
   rails-controller-testing
   rb-readline
   rdf (~> 2.2)
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d2526da8e..de5b337e60 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     <<: *redis
 
   avalon: &avalon
-    image: avalonmediasystem/avalon:7.1-slim-dev-20200318
+    image: avalonmediasystem/avalon:7.1-slim-dev-20200324
     build:
       context: .
       target: dev

From 8da602b48ec7261fc9d0399230b5789b294624de Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Wed, 25 Mar 2020 11:11:06 -0400
Subject: [PATCH 07/61] Fix failing tests

---
 app/controllers/auth_forms_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/auth_forms_controller.rb b/app/controllers/auth_forms_controller.rb
index 28fb8d1531..13fce96aac 100644
--- a/app/controllers/auth_forms_controller.rb
+++ b/app/controllers/auth_forms_controller.rb
@@ -38,7 +38,7 @@ def omniauth_form(strategy_name, phase=:request_phase)
       opts = Devise.omniauth_configs[strategy_name].options
       strategy_class = Devise.omniauth_configs[strategy_name].strategy_class
       strategy = strategy_class.new(opts)
-      html = strategy.send(phase).last.body.first.strip
+      html = strategy.send(phase).last.first.strip
       doc = Nokogiri::HTML(html)
       form = doc.at_xpath('//form')
       form.xpath('label|input').to_a.in_groups_of(2).each do |label, input|

From ac38790fb8b827894e92b5cec2a088b13cc563a2 Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Wed, 25 Mar 2020 13:49:51 -0400
Subject: [PATCH 08/61] Fix DeleteDerivativeJob and add tests

---
 app/jobs/delete_derivative_job.rb       |  4 +--
 spec/factories/derivatives.rb           |  3 +-
 spec/jobs/delete_derivative_job_spec.rb | 44 +++++++++++++++++++++++++
 spec/models/derivative_spec.rb          |  5 +++
 spec/models/master_file_spec.rb         |  4 +--
 5 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 spec/jobs/delete_derivative_job_spec.rb

diff --git a/app/jobs/delete_derivative_job.rb b/app/jobs/delete_derivative_job.rb
index 4a61f77d00..88ba380500 100644
--- a/app/jobs/delete_derivative_job.rb
+++ b/app/jobs/delete_derivative_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright 2011-2020, 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.
@@ -20,7 +21,6 @@ class DeleteDerivativeJob < ActiveJob::Base
   def perform(path)
     Rails.logger.debug "Attempting to delete derivative #{path}"
 
-    path = derivative.absolute_location
     locator = FileLocator.new(path)
     if locator.exists?
       case locator.uri.scheme
@@ -29,7 +29,7 @@ def perform(path)
       end
       Rails.logger.info "#{path} has been deleted"
     else
-      Rails.logger.warn "MasterFile #{path} does not exist"
+      Rails.logger.warn "Derivative #{path} does not exist"
     end
   end
 end
diff --git a/spec/factories/derivatives.rb b/spec/factories/derivatives.rb
index 0f7d5119d3..0d3307608e 100644
--- a/spec/factories/derivatives.rb
+++ b/spec/factories/derivatives.rb
@@ -17,7 +17,7 @@
     duration { "21575" }
     location_url { "rtmp://localhost/vod/mp4:6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning" }
     track_id { "track-6" }
-    hls_url { "http://localhost:3000/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4.m3u8" }
+    hls_url { "http://localhost:3000/streams/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4.m3u8" }
     hls_track_id { "track-8" }
     width { '1024' }
     height { '768' }
@@ -26,6 +26,7 @@
     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' }
 
     trait :with_master_file do
       after(:create) do |d|
diff --git a/spec/jobs/delete_derivative_job_spec.rb b/spec/jobs/delete_derivative_job_spec.rb
new file mode 100644
index 0000000000..ddcd8cd56c
--- /dev/null
+++ b/spec/jobs/delete_derivative_job_spec.rb
@@ -0,0 +1,44 @@
+# Copyright 2011-2020, 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'
+
+describe DeleteDerivativeJob do
+  let(:local_file) { 'file:///temp/media_file.mp4' }
+  let(:s3_file) { 's3://temp/media_file.mp4' }
+  let(:s3_locator) { double("FileLocator::S3File") }
+  let(:s3_obj) { Aws::S3::Object.new(bucket_name: "temp", key: "media_file.mp4") }
+
+  before do
+    allow(File).to receive(:exist?).and_return(true)
+    allow(FileLocator::S3File).to receive(:new).and_return(s3_locator)
+    allow(s3_locator).to receive(:object).and_return(s3_obj)
+  end
+
+  describe "perform" do
+    context 'local file' do
+      it 'gets deleted' do
+        expect(File).to receive(:delete).with(local_file).once
+        DeleteDerivativeJob.perform_now(local_file)
+      end
+    end
+
+    context 's3 file' do
+      it 'gets deleted' do
+        expect(s3_obj).to receive(:delete).once
+        DeleteDerivativeJob.perform_now(s3_file)
+      end
+    end
+  end
+end
diff --git a/spec/models/derivative_spec.rb b/spec/models/derivative_spec.rb
index d762ebc425..6fc982ad2e 100644
--- a/spec/models/derivative_spec.rb
+++ b/spec/models/derivative_spec.rb
@@ -49,6 +49,11 @@
     it "should delete" do
       expect { derivative.destroy }.to change { Derivative.count }.by(-1)
     end
+
+    it "should queue DeleteDerivativeJob" do
+      expect(DeleteDerivativeJob).to receive(:perform_later).once.with(derivative.absolute_location)
+      derivative.destroy
+    end
   end
 
   describe "streaming" do
diff --git a/spec/models/master_file_spec.rb b/spec/models/master_file_spec.rb
index 6aeecc2a4b..c07e0e60b0 100644
--- a/spec/models/master_file_spec.rb
+++ b/spec/models/master_file_spec.rb
@@ -607,13 +607,13 @@ class TestEncode < ActiveEncode::Base
         :mimetype=>nil,
         :quality=>"high",
         :url=>
-         "http://localhost:3000/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4.m3u8"},
+         "http://localhost:3000/streams/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4.m3u8"},
       {:bitrate=>4163842,
         :format=>"video",
         :mimetype=>nil,
         :quality=>"medium",
         :url=>
-         "http://localhost:3000/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4.m3u8"}]
+         "http://localhost:3000/streams/6f69c008-06a4-4bad-bb60-26297f0b4c06/35bddaa0-fbb4-404f-ab76-58f22921529c/warning.mp4.m3u8"}]
     end
     before do
       master_file.derivatives += [FactoryBot.create(:derivative, quality: 'high'), FactoryBot.create(:derivative, quality: 'medium')]

From f847aefb3f0f9f8facb46ac2a19d809717fdb53a Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Thu, 26 Mar 2020 11:57:13 -0400
Subject: [PATCH 09/61] Store Derivative.absolute_location as s3:// URL

---
 app/jobs/delete_derivative_job.rb | 2 +-
 app/models/derivative.rb          | 7 +++++--
 app/models/watched_encode.rb      | 2 +-
 docker-compose.yml                | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/jobs/delete_derivative_job.rb b/app/jobs/delete_derivative_job.rb
index 88ba380500..0e9e260405 100644
--- a/app/jobs/delete_derivative_job.rb
+++ b/app/jobs/delete_derivative_job.rb
@@ -16,7 +16,7 @@
 require 'fileutils'
 
 class DeleteDerivativeJob < ActiveJob::Base
-  queue_as :delete_derivative
+  queue_as :default
 
   def perform(path)
     Rails.logger.debug "Attempting to delete derivative #{path}"
diff --git a/app/models/derivative.rb b/app/models/derivative.rb
index 4895f7096c..f1de771e73 100644
--- a/app/models/derivative.rb
+++ b/app/models/derivative.rb
@@ -63,7 +63,7 @@ class Derivative < ActiveFedora::Base
     index.as :displayable
   end
 
-  after_destroy :delete_file!
+  around_destroy :delete_file!
 
   def initialize(*args)
     super(*args)
@@ -125,6 +125,9 @@ def bitrate
   private
 
     def delete_file!
-      DeleteDerivativeJob.perform_later(absolute_location) if managed
+      loc = absolute_location
+      man = managed
+      yield
+      DeleteDerivativeJob.perform_later(loc) if man
     end
 end
diff --git a/app/models/watched_encode.rb b/app/models/watched_encode.rb
index 5a2d848b57..4858602fff 100644
--- a/app/models/watched_encode.rb
+++ b/app/models/watched_encode.rb
@@ -37,7 +37,7 @@ class WatchedEncode < ActiveEncode::Base
         obj.upload_file file.location
         File.delete file.location
 
-        output.url = obj.public_url
+        output.url = "s3://#{obj.bucket.name}/#{obj.key}"
         output
       end
     end
diff --git a/docker-compose.yml b/docker-compose.yml
index de5b337e60..da8dd4e37a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -116,7 +116,7 @@ services:
       - SETTINGS__DROPBOX__UPLOAD_URI=s3://masterfiles/dropbox/
       - SETTINGS__MASTER_FILE_MANAGEMENT__PATH=s3://preserves/
       - SETTINGS__MASTER_FILE_MANAGEMENT__STRATEGY=MOVE
-      - SETTINGS__STREAMING__CONTENT_PATH=/derivatives/
+      - SETTINGS__STREAMING__CONTENT_PATH=/
       - SETTINGS__STREAMING__STREAM_DEFAULT_QUALITY=medium
       - SETTINGS__STREAMING__HTTP_BASE=http://localhost:8880/avalon
       - SETTINGS__STREAMING__SERVER=nginx

From 6f9ce32adff4255d61166c6ba505a8dd65165718 Mon Sep 17 00:00:00 2001
From: Phil Dinh <phuongdh@gmail.com>
Date: Fri, 27 Mar 2020 16:12:05 -0400
Subject: [PATCH 10/61] Fix locking_runner always returns exit code 255

As suggested by Brian Wheeler. It should only return 255 when killed by a signal.
---
 script/locking_runner | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/locking_runner b/script/locking_runner
index ea37cbc51c..bd1b259718 100755
--- a/script/locking_runner
+++ b/script/locking_runner
@@ -16,6 +16,7 @@ shift
 
 if ( set -o noclobber; echo "$$" > "$LOCKFILE") 2> /dev/null; 
 then
-  trap 'rm -f "$LOCKFILE"; exit 255' INT TERM EXIT
+  trap 'rm -f "$LOCKFILE"; exit 255' INT TERM
   "$@" || true #run the command
+  rm -f "$LOCKFILE"
 fi

From 99954df54442ded57b6b79540ba402a8dd98d2f4 Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Wed, 1 Apr 2020 11:00:41 -0400
Subject: [PATCH 11/61] Fix local derivative file deletion

---
 app/jobs/delete_derivative_job.rb       | 2 +-
 spec/jobs/delete_derivative_job_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/jobs/delete_derivative_job.rb b/app/jobs/delete_derivative_job.rb
index 0e9e260405..3235cea67e 100644
--- a/app/jobs/delete_derivative_job.rb
+++ b/app/jobs/delete_derivative_job.rb
@@ -24,7 +24,7 @@ def perform(path)
     locator = FileLocator.new(path)
     if locator.exists?
       case locator.uri.scheme
-      when 'file' then File.delete(path)
+      when 'file' then File.delete(locator.uri.path)
       when 's3'   then FileLocator::S3File.new(locator.source).object.delete
       end
       Rails.logger.info "#{path} has been deleted"
diff --git a/spec/jobs/delete_derivative_job_spec.rb b/spec/jobs/delete_derivative_job_spec.rb
index ddcd8cd56c..24a21a76fb 100644
--- a/spec/jobs/delete_derivative_job_spec.rb
+++ b/spec/jobs/delete_derivative_job_spec.rb
@@ -29,7 +29,7 @@
   describe "perform" do
     context 'local file' do
       it 'gets deleted' do
-        expect(File).to receive(:delete).with(local_file).once
+        expect(File).to receive(:delete).with("/temp/media_file.mp4").once
         DeleteDerivativeJob.perform_now(local_file)
       end
     end

From 49f73a18913c15af98e810c10d812136fd878276 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Mon, 20 Apr 2020 12:40:56 -0400
Subject: [PATCH 12/61] Use Tempfile instead of managing creation of temp files
 ourselves

---
 app/models/watched_encode.rb            |  5 ++---
 spec/models/pass_through_encode_spec.rb | 18 +++++++-----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/models/watched_encode.rb b/app/models/watched_encode.rb
index 4858602fff..c29328bd28 100644
--- a/app/models/watched_encode.rb
+++ b/app/models/watched_encode.rb
@@ -62,9 +62,8 @@ def persistence_model_attributes(encode, create_options = nil)
 
     def localize_s3_file(url)
       obj = FileLocator::S3File.new(url).object
-      new_dir = "/tmp/#{SecureRandom.uuid}"
-      new_path = "#{new_dir}/#{File.basename url}"
-      FileUtils.mkdir_p new_dir
+      tempfile = Tempfile.new(File.basename(url))
+      new_path = tempfile.path
       obj.download_file new_path
 
       new_path
diff --git a/spec/models/pass_through_encode_spec.rb b/spec/models/pass_through_encode_spec.rb
index 94440489cd..d85fe22fcf 100644
--- a/spec/models/pass_through_encode_spec.rb
+++ b/spec/models/pass_through_encode_spec.rb
@@ -32,10 +32,10 @@
 
   describe 'create' do
     context 'with Minio' do
-      let(:altered_input) { "/tmp/random_uuid/sample.mp4" }
-      let(:altered_output) { "/tmp/random_uuid/sample.high.mp4" }
+      let!(:altered_input) { Tempfile.new("sample.mp4") }
+      let!(:altered_output) { Tempfile.new("sample.high.mp4") }
       let(:running_encode) do
-        described_class.new(altered_input, outputs: [{ label: "high", url: altered_output }]).tap do |e|
+        described_class.new(altered_input.path, outputs: [{ label: "high", url: altered_output.path }]).tap do |e|
           e.id = SecureRandom.uuid
           e.state = :running
           e.created_at = Time.zone.now
@@ -45,19 +45,15 @@
 
       before do
         # Force AWS library to load local file before fakefs is activated
-        FileLocator::S3File.new("s3://bucket/sample.mp4").object
-        FakeFS.activate!
+        FileLocator::S3File.new("s3://bucket/sample.mp4").object.load
         Settings.minio = double("minio", endpoint: "http://minio:9000", public_host: "http://domain:9000")
-        allow(SecureRandom).to receive(:uuid).and_return("random_uuid")
+        allow(Tempfile).to receive(:new).with("sample.mp4").and_return(altered_input)
+        allow(Tempfile).to receive(:new).with("sample.high.mp4").and_return(altered_output)
         allow(Settings).to receive(:encoding).and_return(double(engine_adapter: "pass_through"))
       end
 
-      after do
-        FakeFS.deactivate!
-      end
-
       it 'download the input first' do
-        expect(described_class.engine_adapter).to receive(:create).with(altered_input, hash_including(outputs: [{ label: "high", url: altered_output }])).and_return(running_encode)
+        expect(described_class.engine_adapter).to receive(:create).with(altered_input.path, hash_including(outputs: [{ label: "high", url: altered_output.path }])).and_return(running_encode)
         encode.create!
         expect(File.exist?(altered_input)).to eq true
         expect(File.exist?(altered_output)).to eq true

From 412d8309c54c7f5d988c4ed0412e92901da78020 Mon Sep 17 00:00:00 2001
From: Dananji Withana <dwithana@iu.edu>
Date: Mon, 20 Apr 2020 12:43:44 -0400
Subject: [PATCH 13/61] Preserve fullscreen of player when advancing to next
 section (#4075)

* Preserve fullscreen of player when advancing to next section

Co-authored-by: Sumith Reddi Baddam <sumith.reddy2@gmail.com>

* Fixes from feedback, making new changes work with playlists

* Fix playlists behavior and captions when re-initializing player

* Fix feature positioning

* Fix commented line

Co-authored-by: Sumith Reddi Baddam <sumith.reddy2@gmail.com>
---
 .../avalon_player_new.es6                     | 137 +++++++++++++++---
 .../mejs4_plugin_add_to_playlist.es6          |   5 +
 .../mejs4_plugin_playlist_items.es6           |  59 ++++++--
 .../mediaelement/mediaelement-and-player.js   |  11 +-
 .../mediaelement/mediaelementplayer.scss      |   1 -
 5 files changed, 172 insertions(+), 41 deletions(-)

diff --git a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6 b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
index 67b6970f1d..a70b063954 100644
--- a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
+++ b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
@@ -47,6 +47,8 @@ class MEJSPlayer {
     this.mediaElement = null;
     // Actual MediaElement instance
     this.player = null;
+
+    this.node = null;
     // Add click listeners
     this.addSectionsClickListener();
     // audio or video file?
@@ -127,26 +129,32 @@ class MEJSPlayer {
   }
 
   /**
-   * Make AJAX request for clicked item's stream data
+   * Make AJAX request for clicked/next available items's stream data
    * @function getNewStreamAjax
-   * @param  {string} id - id of master file id
    * @param {string} url Url to get stream data ie. /media_objects/xg94hp52v/section/bc386j20b
+   * @param {boolean} startPlaying once advancing to next item, continue playing after the player is re-initialized
    * @param {Array} playlistItemT Array which contains playlist item clip start and end times.  This is sent in from playlist items plugin, when creating a new instance of the player.
    * @return {void}
    */
-  getNewStreamAjax(id, url, playlistItemsT) {
+  getNewStreamAjax(url, startPlaying, playlistItemsT) {
     $('.media-show-page').removeClass('ready-to-play');
     $.ajax({
       url: url + '/stream',
-      dataType: 'json',
-      data: {
-        content: id
-      }
+      dataType: 'json'
     })
       .done(response => {
-        this.removePlayer();
-        this.setContextVars(response, playlistItemsT);
-        this.createNewPlayer();
+        // Use the existing player iff existing player and new stream are both of type video and
+        // previous item has come to its end
+        if(startPlaying && response.is_video && this.player.isVideo) {
+          // Set currentStreamInfo before switching the player: switchPlayer uses new stream info
+          this.setContextVars(response, playlistItemsT);
+          this.switchPlayer(playlistItemsT);
+        } else {
+          // Set currentStreamInfo after removing the player: removePlayer uses existing stream info
+          this.removePlayer();
+          this.setContextVars(response, playlistItemsT);
+          this.createNewPlayer();
+        }
         this.updateShareLinks();
       })
       .fail(error => {
@@ -217,20 +225,102 @@ class MEJSPlayer {
         .data('mediaObjectId');
 
       // Update helper object noting we want the new media clip to auto start
-      this.switchPlayerHelper = {
+      t.switchPlayerHelper = {
         active: true,
         data: {},
         paused: false
       };
 
-      // Go to next section
-      this.getNewStreamAjax(
-        sectionId,
-        `/media_objects/${mediaObjectId}/section/${sectionId}`
+       // Go to next section
+       t.getNewStreamAjax(
+        `/media_objects/${mediaObjectId}/section/${sectionId}`,
+        true
       );
     }
   }
 
+  /**
+   * Swap the media source and track in the current player instance with values from
+   * the new stream info
+   * @function switchPlayer
+   * @param {Object} playlistItemsT
+   * @returns {void}
+   */
+  switchPlayer(playlistItemsT) {
+    let markup = '';
+
+    this.node.innerHTML = '';
+    this.currentStreamInfo.stream_hls.map(source => {
+      markup += `<source src="${
+        source.url
+      }" type="application/x-mpegURL" data-quality="${source.quality}"/>`;
+    });
+
+    if (this.currentStreamInfo.captions_path) {
+      markup += `<track srclang="en" kind="subtitles" type="${
+        this.currentStreamInfo.captions_format
+      }" src="${this.currentStreamInfo.captions_path}"></track>`;
+    }
+
+    this.node.innerHTML = markup;
+
+    // Bind to canplay event to switch off loading when media is ready
+    this.mediaElement.addEventListener(
+      'canplay',
+      this.handleCanPlay.bind(this)
+    );
+
+    // Build playlists button from the new stream when not in playlists
+    if(!playlistItemsT) {
+      this.player.options.playlistItemDefaultTitle = this.currentStreamInfo.embed_title;
+      this.player.buildaddToPlaylist(this.player, null, null, null);
+    }
+
+    // Initialize playlist items for the new stream
+    if(playlistItemsT) {
+      this.player.buildplaylistItems(this.player, null, null, this.mediaElement);
+    }
+
+    // Build quality
+    this.player.buildquality(this.player, null, null, this.mediaElement);
+
+    this.reInitializeCaptions();
+
+    this.player.load();
+    this.player.play();
+  }
+
+  /** Based on the availability of captions in currentStreamInfo build tracks
+   * in playlists and item page
+   * @function reInitializeCaptions
+   */
+  reInitializeCaptions() {
+    if (this.currentStreamInfo.captions_path) {
+      // Place tracks button after volume button when tracks are available
+      this.player.featurePosition.tracks = this.player.featurePosition.volume + 1;
+      this.player.buildtracks(this.player, null, this.player.layers, this.mediaElement);
+      // Turn on captions
+      this.toggleCaptions();
+    } else {
+      // Clear captions object
+      delete this.player.tracks;
+      this.player.cleartracks(this.player);
+    }
+  }
+
+  /**
+   * Toggle captions on if toggleable and previously on
+   * @function toggleCaptions
+   * @returns {void}
+   */
+  toggleCaptions() {
+    if (this.mediaType==="video" && this.player.options.toggleCaptionsButtonWhenOnlyOne) {
+      if (this.localStorage.getItem('captions') !== '' && this.player.tracks && this.player.tracks.length===1) {
+        this.player.setTrack(this.player.tracks[0].trackId, (typeof keyboard !== 'undefined'));
+      }
+    }
+  }
+
   /**
    * Event handler for clicking on a section link
    * @function handleSectionClick
@@ -249,7 +339,6 @@ class MEJSPlayer {
 
     // Clicked on a different section
     if (dataset.segment !== this.currentStreamInfo.id) {
-      let id = target.dataset.segment;
       let url = target.dataset.nativeUrl.split('?')[0];
 
       // Capture clicked segment or section element id
@@ -258,7 +347,7 @@ class MEJSPlayer {
         data: dataset,
         paused: this.mediaElement.paused
       };
-      this.getNewStreamAjax(id, url);
+      this.getNewStreamAjax(url, false);
     } else {
       // Clicked within the same section...
       const parentPanel = $(target).closest('div[class*=panel]');
@@ -333,17 +422,15 @@ class MEJSPlayer {
       this.player = instance;
     }
 
+    this.node = originalNode;
+
     if (this.player && this.player.media && this.player.media.hlsPlayer && this.player.media.hlsPlayer.config) {
       // Workaround for hlsError bufferFullError: Set max buffer length to 2 minutes
       this.player.media.hlsPlayer.config.maxMaxBufferLength = 120;
     }
 
-    // Toggle captions on if toggleable and previously on
-    if (this.mediaType==="video" && this.player.options.toggleCaptionsButtonWhenOnlyOne) {
-      if (this.localStorage.getItem('captions') !== '' && this.player.tracks && this.player.tracks.length===1) {
-        this.player.setTrack(this.player.tracks[0].trackId, (typeof keyboard !== 'undefined'));
-      }
-    }
+    // Toggle captions
+    this.toggleCaptions();
 
     // Make the player visible
     this.revealPlayer(instance);
@@ -369,7 +456,9 @@ class MEJSPlayer {
     );
 
     // Handle 'ended' event fired by player
-    this.mediaElement.addEventListener('ended', this.handleEnded.bind(this));
+    this.mediaElement.addEventListener('ended',
+      this.handleEnded.bind(this)
+    );
 
     // Show highlighted time in time rail
     if (this.highlightRail) {
diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6
index 6d14e4514c..a552feda40 100644
--- a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6
+++ b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_to_playlist.es6
@@ -51,6 +51,8 @@ Object.assign(MediaElementPlayer.prototype, {
 
     addToPlayListObj.isVideo = player.isVideo;
 
+    player.cleanaddToPlaylist(player);
+
     // Create plugin control button for player
     player.addPlaylistButton = document.createElement('div');
     player.addPlaylistButton.className =
@@ -136,6 +138,9 @@ Object.assign(MediaElementPlayer.prototype, {
         addToPlayListObj.bindHandleCancel
       );
     }
+    if (player && player.addPlaylistButton) {
+      player.addPlaylistButton.remove();
+    }
   },
 
   // Other optional public methods (all documented according to JSDoc specifications)
diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
index d33dd273b0..c482be3e09 100644
--- a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
+++ b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
@@ -49,7 +49,7 @@ Object.assign(MediaElementPlayer.prototype, {
     playlistItemsObj.mejsTimeRailHelper = new MEJSTimeRailHelper();
 
     playlistItemsObj.player = player;
-    playlistItemsObj.currentStreamInfo = mejs4AvalonPlayer.currentStreamInfo;
+    playlistItemsObj.mediaElement = media;
     // Track the number of MEJS 'timeupdate' events which fire after the end time of a playlist item
     playlistItemsObj.endTimeCount = 0;
 
@@ -188,9 +188,10 @@ Object.assign(MediaElementPlayer.prototype, {
      * Analyze the new playlist item and determine how to proceed...
      * @function analyzeNewItemSource
      * @param  {HTMLElement} el <a> anchor element of the new playlist item being processed
+     * @param {Boolean} isEnded
      * @return {void}
      */
-    analyzeNewItemSource(el) {
+    analyzeNewItemSource(el, isEnded) {
       const playlistId = +el.dataset.playlistId;
       const playlistItemId = el.dataset.playlistItemId;
       const playlistItemT = [
@@ -198,7 +199,7 @@ Object.assign(MediaElementPlayer.prototype, {
         el.dataset.clipEndTime / 1000
       ];
       const isSameMediaFile =
-        this.currentStreamInfo.id === el.dataset.masterFileId;
+      this.$nowPlayingLi.find('a').data('masterFileId') === el.dataset.masterFileId;
 
       // Update right column playlist items list
       this.updatePlaylistItemsList(el);
@@ -214,8 +215,6 @@ Object.assign(MediaElementPlayer.prototype, {
         // Set the endTimeCount back to 0
         this.endTimeCount = 0;
         this.setupNextItem();
-        // Rebuild playlist info panels
-        this.rebuildPlaylistInfoPanels(playlistId, playlistItemId);
       } else {
         // Need a new Mediaelement player and media file
         const id = el.dataset.masterFileId;
@@ -228,16 +227,52 @@ Object.assign(MediaElementPlayer.prototype, {
           { id: playlistItemId, playlist_id: playlistId, position: null }
         );
 
+        // Set now playing item in playlist items
+        this.setCurrentItemInternally();
+
         // Get new data and create new player instance
-        mejs4AvalonPlayer.getNewStreamAjax(id, url, playlistItemT);
+        mejs4AvalonPlayer.getNewStreamAjax(url, isEnded, playlistItemT);
+
+        // Use switchItemHelper only when previous item is ended 
+        // and both current and prev items are video
+        const prevItemIsVideo = this.$nowPlayingLi.prev('li').data('isVideo');
+        const currentItemIsVideo = this.$nowPlayingLi.data('isVideo');
+        if(isEnded && prevItemIsVideo && currentItemIsVideo) {
+          this.switchItemHelper();
+        }
       }
+
+      // Rebuild playlist info panels
+      this.rebuildPlaylistInfoPanels(playlistId, playlistItemId);
     },
 
     /**
-     * Local reference to currentStreamInfo, set in parent wrapper js file
-     * @type {Object}
+     * Helper function when re-initializing the player instance when advancing from a
+     * playlist item to next when the playlist item ends
+     * @function switchItemHelper
+     * @returns {void}
      */
-    currentStreamInfo: null,
+    switchItemHelper() {
+      this.mejsMarkersHelper.updateVisualMarkers();
+
+      // Build markers and timerail highlight
+      let promises = [];
+      const playlistItem = mejs4AvalonPlayer.playlistItem;
+      const playlistIds = playlistItem
+      ? [playlistItem.playlist_id, playlistItem.id]
+      : [];
+      promises.push(this.mejsMarkersHelper.getMarkers(...playlistIds));
+      Promise.all(promises)
+        .then(() => {
+          this.mejsMarkersHelper.updateVisualMarkers();
+          mejs4AvalonPlayer.highlightTimeRail([this.startEndTimes.start, this.startEndTimes.end]);
+        })
+        .catch(error => {
+          console.log('Promise rejection error');
+        });
+
+      this.player.buildmarkers(this.player, this.player.controls, null, this.mediaElement);
+    },
 
     /**
      * Helper variable to track the number of times the playlist item's end time handler function has been called
@@ -322,7 +357,7 @@ Object.assign(MediaElementPlayer.prototype, {
         return;
       }
 
-      this.analyzeNewItemSource(el);
+      this.analyzeNewItemSource(el, false);
     },
 
     /**
@@ -347,7 +382,7 @@ Object.assign(MediaElementPlayer.prototype, {
       // Autoplay is 'On'
       if (t.isAutoplay()) {
         const el = $nextItem.find('a')[0];
-        t.analyzeNewItemSource(el);
+        t.analyzeNewItemSource(el, true);
       }
     },
 
@@ -358,7 +393,7 @@ Object.assign(MediaElementPlayer.prototype, {
      */
     handleTimeUpdate() {
       const t = this;
-      const plo = t.playlistItemsObj;
+      const plo = t.playlistItemsObj || t;
       const currentTime = plo.player.getCurrentTime();
       const isEnded = plo.isItemEnded(currentTime);
 
diff --git a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
index 22a92b1cf2..9889de925e 100644
--- a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
+++ b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
@@ -2426,19 +2426,22 @@ Object.assign(_player2.default.prototype, {
 	cleartracks: function cleartracks(player) {
 		if (player) {
 			if (player.captions) {
-				player.captions.remove();
+				delete player.captions;
 			}
 			if (player.chapters) {
-				player.chapters.remove();
+				delete player.chapters;
 			}
 			if (player.captionsText) {
-				player.captionsText.remove();
+				delete player.captionsText;
 			}
 			if (player.captionsButton) {
 				player.captionsButton.remove();
 			}
 			if (player.chaptersButton) {
-				player.chaptersButton.remove();
+				delete player.chaptersButton;
+			}
+			if(player.trackToLoad) {
+				delete player.trackToLoad;
 			}
 		}
 	},
diff --git a/vendor/assets/stylesheets/mediaelement/mediaelementplayer.scss b/vendor/assets/stylesheets/mediaelement/mediaelementplayer.scss
index 7bb06fe757..55962d09e4 100644
--- a/vendor/assets/stylesheets/mediaelement/mediaelementplayer.scss
+++ b/vendor/assets/stylesheets/mediaelement/mediaelementplayer.scss
@@ -704,7 +704,6 @@ Reference: http://blog.rrwd.nl/2015/04/04/the-screen-reader-text-class-why-and-h
     font-size: 16px;
     left: 0;
     line-height: 20px;
-    position: absolute;
     text-align: center;
 }
 

From a60e078e6dccc218d60225a6146e35fe562152a5 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Mon, 20 Apr 2020 17:36:06 -0400
Subject: [PATCH 14/61] Use rails_same_site_cookie to set SameSite on cookies
 This is needed due to changes in browsers' handling of cookies and ignoring
 those without this attribute.  Resolves #4062.

---
 Gemfile      | 1 +
 Gemfile.lock | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 86bf4456e3..4b05cacf19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,7 @@ gem 'bootstrap-toggle-rails'
 gem 'bootstrap_form'
 gem 'iiif_manifest', '~> 0.6'
 gem 'rack-cors', require: 'rack/cors'
+gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'
 gem 'samvera-persona', '~> 0.1.7'
 gem 'speedy-af', '~> 0.1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5b8daa240e..a676df3baa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -635,6 +635,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
+    rails_same_site_cookie (0.1.8)
+      rack (>= 1.5)
+      user_agent_parser (~> 2.5)
     railties (5.2.4.2)
       actionpack (= 5.2.4.2)
       activesupport (= 5.2.4.2)
@@ -859,6 +862,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
+    user_agent_parser (2.6.0)
     warden (1.2.8)
       rack (>= 2.0.6)
     wavefile (1.0.1)
@@ -982,6 +986,7 @@ DEPENDENCIES
   rack-cors
   rails (= 5.2.4.2)
   rails-controller-testing
+  rails_same_site_cookie
   rb-readline
   rdf (~> 2.2)
   rdf-rdfxml

From 247c3f53ef886ac99cb47ffdfa8f91df4de2be86 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 21 Apr 2020 11:57:08 -0400
Subject: [PATCH 15/61] Add contact email and website to collection model,
 form, and admin show view.

Co-authored-by: Dananji Withana <dwithana@iu.edu>
Co-authored-by: Phil Dinh <phuongdh@gmail.com>
---
 app/controllers/admin/collections_controller.rb   |  2 +-
 app/models/admin/collection.rb                    |  8 ++++++++
 app/models/avalon/rdf_vocab.rb                    |  2 ++
 app/views/admin/collections/_form.html.erb        |  2 ++
 app/views/admin/collections/show.html.erb         |  4 ++++
 .../admin_collections_controller_spec.rb          | 12 ++++++++++--
 spec/factories/collections.rb                     |  2 ++
 spec/models/collection_spec.rb                    | 15 ++++++++++++++-
 8 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/collections_controller.rb b/app/controllers/admin/collections_controller.rb
index ee1f3444a3..30672e7eb2 100644
--- a/app/controllers/admin/collections_controller.rb
+++ b/app/controllers/admin/collections_controller.rb
@@ -295,7 +295,7 @@ def poster
   private
 
   def collection_params
-    params.permit(:admin_collection => [:name, :description, :unit, :managers => []])[:admin_collection]
+    params.permit(:admin_collection => [:name, :description, :unit, :contact_email, :website, :managers => []])[:admin_collection]
   end
 
   def check_image_compliance(poster_path)
diff --git a/app/models/admin/collection.rb b/app/models/admin/collection.rb
index e2261f70e2..e22bc5dd72 100644
--- a/app/models/admin/collection.rb
+++ b/app/models/admin/collection.rb
@@ -28,6 +28,8 @@ class Admin::Collection < ActiveFedora::Base
   validates :name, :uniqueness => { :solr_name => 'name_uniq_si'}, presence: true
   validates :unit, presence: true, inclusion: { in: Proc.new{ Admin::Collection.units } }
   validates :managers, length: {minimum: 1, message: "list can't be empty."}
+  validates :contact_email, format: { with: URI::MailTo::EMAIL_REGEXP }
+  validates :website, format: { with: URI.regexp }
 
   property :name, predicate: ::RDF::Vocab::DC.title, multiple: false do |index|
     index.as :stored_sortable
@@ -38,6 +40,12 @@ class Admin::Collection < ActiveFedora::Base
   property :description, predicate: ::RDF::Vocab::DC.description, multiple: false do |index|
     index.as :stored_searchable
   end
+  property :contact_email, predicate: Avalon::RDFVocab::Collection.contact_email, multiple: false do |index|
+    index.as :stored_sortable
+  end
+  property :website, predicate: Avalon::RDFVocab::Collection.website, multiple: false do |index|
+    index.as :stored_sortable
+  end
   property :dropbox_directory_name, predicate: Avalon::RDFVocab::Collection.dropbox_directory_name, multiple: false do |index|
     index.as :stored_sortable
   end
diff --git a/app/models/avalon/rdf_vocab.rb b/app/models/avalon/rdf_vocab.rb
index 97c27cde0c..212d658651 100644
--- a/app/models/avalon/rdf_vocab.rb
+++ b/app/models/avalon/rdf_vocab.rb
@@ -56,6 +56,8 @@ class MediaObject < RDF::StrictVocabulary("http://avalonmediasystem.org/rdf/voca
     end
 
     class Collection < RDF::StrictVocabulary("http://avalonmediasystem.org/rdf/vocab/collection#")
+      property :contact_email,            "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
+      property :website,                  "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :dropbox_directory_name,   "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :default_read_users,       "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :default_read_groups,      "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
diff --git a/app/views/admin/collections/_form.html.erb b/app/views/admin/collections/_form.html.erb
index 76b7d5a2cc..066795663c 100644
--- a/app/views/admin/collections/_form.html.erb
+++ b/app/views/admin/collections/_form.html.erb
@@ -29,6 +29,8 @@ Unless required by applicable law or agreed to in writing, software distributed
         <%= f.select(:unit, Admin::Collection.units) %>
         <% end %>
         <%= f.text_area :description, rows: 3  %>
+        <%= f.email_field :contact_email %>
+        <%= f.url_field :website %>
       </div>
       <div class="modal-footer">
         <a href="#" data-dismiss="modal" aria-hidden="true" class="btn btn-default">Cancel</a>
diff --git a/app/views/admin/collections/show.html.erb b/app/views/admin/collections/show.html.erb
index 0f3e568ff0..2c657f4643 100644
--- a/app/views/admin/collections/show.html.erb
+++ b/app/views/admin/collections/show.html.erb
@@ -45,6 +45,10 @@ Unless required by applicable law or agreed to in writing, software distributed
       <p><%= @collection.unit %></p>
       <p><strong>Description:</strong></p>
       <p class="collection-description"><%= @collection.description %></p>
+      <p><strong>Contact email:</strong></p>
+      <p><%= mail_to(@collection.contact_email) if @collection.contact_email.present? %></p>
+      <p><strong>Website:</strong></p>
+      <p><%= link_to(@collection.website, @collection.website) if @collection.website.present? %></p>
     </div>
     <div class="col-md-3">
       <p><strong>Poster:</strong></p>
diff --git a/spec/controllers/admin_collections_controller_spec.rb b/spec/controllers/admin_collections_controller_spec.rb
index 4b079f4ab3..ec6e4430c9 100644
--- a/spec/controllers/admin_collections_controller_spec.rb
+++ b/spec/controllers/admin_collections_controller_spec.rb
@@ -274,9 +274,12 @@
       # post 'create', format:'json', admin_collection: {name: collection.name, description: collection.description, unit: collection.unit, managers: collection.managers}
     end
     it "should create a new collection" do
-      post 'create', params: { format:'json', admin_collection: {name: collection.name, description: collection.description, unit: collection.unit, managers: collection.managers} }
+      post 'create', params: { format:'json', admin_collection: {name: collection.name, description: collection.description, unit: collection.unit, contact_email: collection.contact_email, website: collection.website, managers: collection.managers} }
       expect(JSON.parse(response.body)['id'].class).to eq String
       expect(JSON.parse(response.body)).not_to include('errors')
+      new_collection = Admin::Collection.find(JSON.parse(response.body)['id'])
+      expect(new_collection.contact_email).to eq collection.contact_email
+      expect(new_collection.website).to eq collection.website
     end
     it "should create a new collection with default manager list containing current API user" do
       post 'create', params: { format:'json', admin_collection: { name: collection.name, description: collection.description, unit: collection.unit } }
@@ -307,6 +310,9 @@
 
     context "update REST API" do
       let!(:collection) { FactoryBot.create(:collection)}
+      let(:contact_email) { Faker::Internet.email }
+      let(:website) { Faker::Internet.url }
+
       before do
         ApiToken.create token: 'secret_token', username: 'archivist1@example.com', email: 'archivist1@example.com'
         request.headers['Avalon-Api-Key'] = 'secret_token'
@@ -314,11 +320,13 @@
 
       it "should update a collection via API" do
         old_description = collection.description
-        put 'update', params: { format: 'json', id: collection.id, admin_collection: {description: collection.description+'new'} }
+        put 'update', params: { format: 'json', id: collection.id, admin_collection: { description: collection.description+'new', contact_email: contact_email, website: website }}
         expect(JSON.parse(response.body)['id'].class).to eq String
         expect(JSON.parse(response.body)).not_to include('errors')
         collection.reload
         expect(collection.description).to eq old_description+'new'
+        expect(collection.contact_email).to eq contact_email
+        expect(collection.website).to eq website
       end
       it "should return 422 if collection update via API failed" do
         allow_any_instance_of(Admin::Collection).to receive(:save).and_return false
diff --git a/spec/factories/collections.rb b/spec/factories/collections.rb
index 1edc00a1d9..0bded5e76f 100644
--- a/spec/factories/collections.rb
+++ b/spec/factories/collections.rb
@@ -17,6 +17,8 @@
     sequence(:name) {|n| "Collection #{n}" }
     unit {"Default Unit"}
     description {Faker::Lorem.sentence}
+    contact_email { Faker::Internet.email }
+    website { Faker::Internet.url }
     managers {[FactoryBot.create(:manager).user_key]}
     editors {[FactoryBot.create(:user).user_key]}
     depositors {[FactoryBot.create(:user).user_key]}
diff --git a/spec/models/collection_spec.rb b/spec/models/collection_spec.rb
index 4ad848fb4a..c0918a562c 100644
--- a/spec/models/collection_spec.rb
+++ b/spec/models/collection_spec.rb
@@ -118,10 +118,17 @@
 
   describe 'validations' do
     subject {wells_collection}
-    let(:wells_collection) {FactoryBot.create(:collection, name: 'Herman B. Wells Collection', unit: "Default Unit", description: "Collection about our 11th university president, 1938-1962", managers: [manager.user_key], editors: [editor.user_key], depositors: [depositor.user_key])}
+    let(:wells_collection) do
+      FactoryBot.create(:collection, name: 'Herman B. Wells Collection', unit: "Default Unit",
+                        description: "Collection about our 11th university president, 1938-1962",
+                        managers: [manager.user_key], editors: [editor.user_key], depositors: [depositor.user_key],
+                        contact_email: contact_email, website: website)
+    end
     let(:manager) {FactoryBot.create(:manager)}
     let(:editor) {FactoryBot.create(:user)}
     let(:depositor) {FactoryBot.create(:user)}
+    let(:contact_email) { Faker::Internet.email }
+    let(:website) { Faker::Internet.url }
 
     it {is_expected.to validate_presence_of(:name)}
     context 'validate uniqueness of name' do
@@ -147,6 +154,10 @@
     end
     it {is_expected.to validate_presence_of(:unit)}
     it {is_expected.to validate_inclusion_of(:unit).in_array(Admin::Collection.units)}
+    it { is_expected.to allow_value('collection@example.com').for(:contact_email) }
+    it { is_expected.not_to allow_value('collection@').for(:contact_email) }
+    it { is_expected.to allow_value('https://collection.example.com').for(:website) }
+    it { is_expected.not_to allow_value('collection.example.com').for(:website) }
     it "should ensure length of :managers is_at_least(1)"
 
     it "should have attributes" do
@@ -157,6 +168,8 @@
       expect(subject.managers).to eq([manager.user_key])
       expect(subject.editors).to eq([editor.user_key])
       expect(subject.depositors).to eq([depositor.user_key])
+      expect(subject.contact_email).to eq(contact_email)
+      expect(subject.website).to eq(website)
       # expect(subject.rightsMetadata).to be_kind_of Hydra::Datastream::RightsMetadata
       # expect(subject.inheritedRights).to be_kind_of Hydra::Datastream::InheritableRightsMetadata
       # expect(subject.defaultRights).to be_kind_of Hydra::Datastream::NonIndexedRightsMetadata

From 25b244aa370f18d654c46c0a07bc5abfef745eee Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Tue, 21 Apr 2020 15:46:36 -0400
Subject: [PATCH 16/61] Attempt to fetch Derivative.absolute_location in
 WaveformJob

---
 app/jobs/waveform_job.rb       | 23 ++++++++++++++++++-----
 spec/jobs/waveform_job_spec.rb |  5 ++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/jobs/waveform_job.rb b/app/jobs/waveform_job.rb
index 3dcfb533b6..2181424739 100644
--- a/app/jobs/waveform_job.rb
+++ b/app/jobs/waveform_job.rb
@@ -24,12 +24,9 @@ def perform(master_file_id, regenerate = false)
     return if master_file.waveform.content.present? && !regenerate
 
     service = WaveformService.new(8, SAMPLES_PER_FRAME)
-    uri = file_uri(master_file) || playlist_url(master_file)
+    uri = file_uri(master_file) || derivative_file_uri(master_file) || playlist_url(master_file)
     json = service.get_waveform_json(uri)
-    if json.blank?
-      Rails.logger.error "No waveform generated for #{master_file.id}"
-      return
-    end
+    raise "No waveform generated for #{master_file.id}" if json.blank?
 
     master_file.waveform.content = Zlib::Deflate.deflate(json)
     master_file.waveform.mime_type = 'application/zlib'
@@ -51,6 +48,22 @@ def file_uri(master_file)
       end
     end
 
+    def derivative_file_uri(master_file)
+      derivatives = master_file.derivatives
+      uri = nil
+
+      # Find the lowest quality stream
+      ['high', 'medium', 'low'].each do |quality|
+        d = derivatives.select { |derivative| derivative.quality == quality }.first
+        if d.present?
+          loc = FileLocator.new(d.absolute_location)
+          uri = loc.location if loc.exist?
+        end
+      end
+
+      uri
+    end
+
     def playlist_url(master_file)
       streams = master_file.hls_streams
       hls_url = nil
diff --git a/spec/jobs/waveform_job_spec.rb b/spec/jobs/waveform_job_spec.rb
index 84d1e5c44d..c5024f3947 100644
--- a/spec/jobs/waveform_job_spec.rb
+++ b/spec/jobs/waveform_job_spec.rb
@@ -89,9 +89,8 @@
     context 'when processing fails to generate waveform data' do
       let(:waveform_json) { nil }
 
-      it 'logs and does not set the waveform' do
-        expect(Rails.logger).to receive(:error).at_least(:once)
-        expect { job.perform(master_file.id, true) }.not_to change { master_file.reload.waveform.content }
+      it 'raises error and does not set the waveform' do
+        expect { job.perform(master_file.id, true) }.to raise_error.and not_change { master_file.reload.waveform.content }
         expect(service).to have_received(:get_waveform_json)
       end
     end

From 34c5290d3f1ce33793f88037d09b8daf686cebb5 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Wed, 22 Apr 2020 16:33:40 -0400
Subject: [PATCH 17/61] Add contact info to collection landing page

---
 .../components/CollectionDescription.js       | 62 --------------
 .../components/CollectionDetails.js           | 82 +++++++++++++++++++
 app/presenters/collection_presenter.rb        |  8 ++
 app/views/collections/show.html.erb           |  6 +-
 4 files changed, 95 insertions(+), 63 deletions(-)
 delete mode 100644 app/javascript/components/CollectionDescription.js
 create mode 100644 app/javascript/components/CollectionDetails.js

diff --git a/app/javascript/components/CollectionDescription.js b/app/javascript/components/CollectionDescription.js
deleted file mode 100644
index 784b6daf31..0000000000
--- a/app/javascript/components/CollectionDescription.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2011-2020, 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  ---
-*/
-
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-
-const CollectionDescription = ({ content = '' }) => {
-  if (!content) return null;
-
-  const wordCount = 40;
-  const words = content.split(' ');
-  const [expanded, setExpanded] = useState(false);
-  const [description, setDescription] = useState(prepInitialDescription());
-
-  function prepInitialDescription() {
-    return words.length > wordCount
-      ? words.slice(0, wordCount).join(' ')
-      : words.join(' ');
-  }
-
-  const handleClick = () => {
-    setDescription(
-      expanded ? words.slice(0, wordCount).join(' ') : words.join(' ')
-    );
-    setExpanded(!expanded);
-  };
-
-  return (
-    <div>
-      <p className="lead document-description">{description}</p>
-      {words.length > wordCount && (
-        <button className="btn btn-link" onClick={handleClick}>
-          <i
-            className={`glyphicon glyphicon-${
-              expanded ? 'menu-up' : 'menu-right'
-            }`}
-          ></i>{' '}
-          Show {expanded ? 'less' : 'more'}
-        </button>
-      )}
-    </div>
-  );
-};
-
-CollectionDescription.propTypes = {
-  content: PropTypes.string
-};
-
-export default CollectionDescription;
diff --git a/app/javascript/components/CollectionDetails.js b/app/javascript/components/CollectionDetails.js
new file mode 100644
index 0000000000..dfc92c3888
--- /dev/null
+++ b/app/javascript/components/CollectionDetails.js
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2011-2020, 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  ---
+*/
+
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+
+const expandBtn = {
+  paddingLeft: '2px'
+};
+
+const descriptionStyle = {
+  fontSize: '16px',
+  fontWeight: '200'
+}
+
+const CollectionDetails = ({ content = '', email = '', website = '' }) => {
+
+  const wordCount = 40;
+  const words = content ? content.split(' ') : [];
+  const [expanded, setExpanded] = useState(false);
+  const [description, setDescription] = useState(prepInitialDescription());
+
+  function prepInitialDescription() {
+    return words.length > wordCount
+      ? `${words.slice(0, wordCount).join(' ')}...`
+      : words.join(' ');
+  }
+
+  const handleClick = () => {
+    setDescription(
+      expanded ? `${words.slice(0, wordCount).join(' ')}...` : words.join(' ')
+    );
+    setExpanded(!expanded);
+  };
+
+  return (
+    <div>
+      {words.length > 0 && (
+        <p className="lead document-description">{description}
+          {words.length > wordCount && (
+            <a className="btn btn-link" style={expandBtn} onClick={handleClick}>
+              Show {expanded ? 'less' : 'more'}
+            </a>
+          )}
+        </p>
+      )}
+      <dl className="dl-horizontal">
+        <dt style={descriptionStyle}>Contact email:</dt>
+        <dd>
+          { email ?  <a href={`mailto:${email}`}>{email}</a>
+            : <span className="info-text-gray">No email</span> }
+        </dd>
+        <dt style={descriptionStyle}>Website:</dt>
+        <dd>
+          { website ? <a href={website}>{website}</a>
+            : <span className="info-text-gray">No website</span> }
+        </dd>
+      </dl>
+    </div>
+  );
+};
+
+CollectionDetails.propTypes = {
+  content: PropTypes.string,
+  email: PropTypes.string,
+  website: PropTypes.string
+};
+
+export default CollectionDetails;
diff --git a/app/presenters/collection_presenter.rb b/app/presenters/collection_presenter.rb
index 6b656357fd..0851310fb4 100644
--- a/app/presenters/collection_presenter.rb
+++ b/app/presenters/collection_presenter.rb
@@ -46,6 +46,14 @@ def collection_url
     Rails.application.routes.url_helpers.collection_url(id)
   end
 
+  def contact_email
+    document["contact_email_ssi"]
+  end
+
+  def website
+    document["website_ssi"]
+  end
+
   def as_json(_)
     {
       id: id,
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 4b2623bf03..03060d65a4 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -40,7 +40,11 @@ Unless required by applicable law or agreed to in writing, software distributed
       <div>
         <h3 class="sub-headline"><strong>Unit:</strong> <%= @doc_presenter.unit %></h3>
         <p class="lead document-description"></p>
-        <%= react_component("CollectionDescription", { content: @doc_presenter.description }) %>
+        <%= react_component("CollectionDetails", 
+          { content: @doc_presenter.description,
+            email: @doc_presenter.contact_email,
+            website: @doc_presenter.website 
+          }) %>
       </div>
     </div>
   </div>

From 8ec1c417d27cd5df157d05eefed01b660e2baad0 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Thu, 23 Apr 2020 13:17:38 -0400
Subject: [PATCH 18/61] Don't display anything if email or website not present

---
 .../components/CollectionDetails.js           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/javascript/components/CollectionDetails.js b/app/javascript/components/CollectionDetails.js
index dfc92c3888..dd0910a612 100644
--- a/app/javascript/components/CollectionDetails.js
+++ b/app/javascript/components/CollectionDetails.js
@@ -58,16 +58,18 @@ const CollectionDetails = ({ content = '', email = '', website = '' }) => {
         </p>
       )}
       <dl className="dl-horizontal">
-        <dt style={descriptionStyle}>Contact email:</dt>
-        <dd>
-          { email ?  <a href={`mailto:${email}`}>{email}</a>
-            : <span className="info-text-gray">No email</span> }
-        </dd>
-        <dt style={descriptionStyle}>Website:</dt>
-        <dd>
-          { website ? <a href={website}>{website}</a>
-            : <span className="info-text-gray">No website</span> }
-        </dd>
+        { email &&
+          <>
+            <dt style={descriptionStyle}>Contact email:</dt>
+            <dd><a href={`mailto:${email}`}>{email}</a></dd>
+          </>
+        }
+        { website &&
+          <>
+            <dt style={descriptionStyle}>Website:</dt>
+            <dd><a href={website}>{website}</a></dd>
+          </>
+        }
       </dl>
     </div>
   );

From 8462fb870781b1e7c5341e5747ad4c4368942451 Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Thu, 23 Apr 2020 14:14:50 -0400
Subject: [PATCH 19/61] Add WaveformJob tests

---
 spec/jobs/waveform_job_spec.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/spec/jobs/waveform_job_spec.rb b/spec/jobs/waveform_job_spec.rb
index c5024f3947..6dd2a6b379 100644
--- a/spec/jobs/waveform_job_spec.rb
+++ b/spec/jobs/waveform_job_spec.rb
@@ -19,6 +19,7 @@
   let(:master_file) { FactoryBot.create(:master_file_with_media_object_and_derivative) }
   let(:waveform_json) { File.read('spec/fixtures/waveform.json') }
   let(:service) { instance_double("WaveformService") }
+  let(:derivative_path) { URI.parse(master_file.derivatives.first.absolute_location).path }
 
   describe "perform" do
     before do
@@ -51,12 +52,25 @@
       end
     end
 
+    context 'when Derivative file is retrievable' do
+      before do
+        allow(File).to receive(:exist?).and_call_original
+        allow(File).to receive(:exist?).with(derivative_path).and_return(true)
+      end
+
+      it 'calls the waveform service with the file location' do
+        job.perform(master_file.id)
+        expect(service).to have_received(:get_waveform_json).with(derivative_path)
+      end
+    end
+
     context 'when not on disk' do
       let(:secure_hls_url) { "https://path/to/mp4:video.mp4/playlist.m3u8?token=abc" }
 
       before do
         allow(File).to receive(:exist?).and_call_original
         allow(File).to receive(:exist?).with(master_file.file_location).and_return(false)
+        allow(File).to receive(:exist?).with(derivative_path).and_return(false)
         allow(SecurityHandler).to receive(:secure_url).and_return(secure_hls_url)
       end
 

From 585a5db46c85a94473ede8d5ec6851c05ad9ca84 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Thu, 23 Apr 2020 17:24:24 -0400
Subject: [PATCH 20/61] Add website label field

---
 .../admin/collections_controller.rb            |  2 +-
 app/controllers/collections_controller.rb      |  4 ++--
 app/javascript/components/CollectionDetails.js |  2 +-
 app/models/admin/collection.rb                 |  7 +++++--
 app/models/avalon/rdf_vocab.rb                 |  3 ++-
 app/presenters/collection_presenter.rb         |  9 +++++----
 app/views/admin/collections/_form.html.erb     |  3 ++-
 app/views/admin/collections/show.html.erb      | 12 ++++++++----
 app/views/collections/show.html.erb            |  2 +-
 config/locales/en.yml                          |  8 ++++++++
 .../admin_collections_controller_spec.rb       | 13 ++++++++-----
 spec/factories/collections.rb                  |  3 ++-
 spec/models/collection_spec.rb                 | 12 +++++++-----
 spec/presenters/collection_presenter_spec.rb   | 18 ++++++++++++++++--
 14 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/app/controllers/admin/collections_controller.rb b/app/controllers/admin/collections_controller.rb
index 30672e7eb2..5fa6dfe215 100644
--- a/app/controllers/admin/collections_controller.rb
+++ b/app/controllers/admin/collections_controller.rb
@@ -295,7 +295,7 @@ def poster
   private
 
   def collection_params
-    params.permit(:admin_collection => [:name, :description, :unit, :contact_email, :website, :managers => []])[:admin_collection]
+    params.permit(:admin_collection => [:name, :description, :unit, :contact_email, :website_label, :website_url, :managers => []])[:admin_collection]
   end
 
   def check_image_compliance(poster_path)
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index d47e194cd1..4bdf552f70 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -24,7 +24,7 @@ def index
     if params[:limit].present?
       collections = collections.sample(params[:limit].to_i)
     end
-    @doc_presenters = collections.collect { |doc| CollectionPresenter.new(doc) }
+    @doc_presenters = collections.collect { |doc| CollectionPresenter.new(doc, view_context) }
 
     respond_to do |format|
       format.html
@@ -37,7 +37,7 @@ def show
     document = response.documents.find { |doc| doc.id == params[:id] }
     # Only go on if params[:id] is in @document_list
     raise CanCan::AccessDenied unless document
-    @doc_presenter = CollectionPresenter.new(document)
+    @doc_presenter = CollectionPresenter.new(document, view_context)
 
     respond_to do |format|
       format.html
diff --git a/app/javascript/components/CollectionDetails.js b/app/javascript/components/CollectionDetails.js
index dd0910a612..87b5c983ad 100644
--- a/app/javascript/components/CollectionDetails.js
+++ b/app/javascript/components/CollectionDetails.js
@@ -67,7 +67,7 @@ const CollectionDetails = ({ content = '', email = '', website = '' }) => {
         { website &&
           <>
             <dt style={descriptionStyle}>Website:</dt>
-            <dd><a href={website}>{website}</a></dd>
+            <dd dangerouslySetInnerHTML={{ __html: website }}></dd>
           </>
         }
       </dl>
diff --git a/app/models/admin/collection.rb b/app/models/admin/collection.rb
index e22bc5dd72..6fdc6086b4 100644
--- a/app/models/admin/collection.rb
+++ b/app/models/admin/collection.rb
@@ -29,7 +29,7 @@ class Admin::Collection < ActiveFedora::Base
   validates :unit, presence: true, inclusion: { in: Proc.new{ Admin::Collection.units } }
   validates :managers, length: {minimum: 1, message: "list can't be empty."}
   validates :contact_email, format: { with: URI::MailTo::EMAIL_REGEXP }
-  validates :website, format: { with: URI.regexp }
+  validates :website_url, format: { with: URI.regexp }
 
   property :name, predicate: ::RDF::Vocab::DC.title, multiple: false do |index|
     index.as :stored_sortable
@@ -43,7 +43,10 @@ class Admin::Collection < ActiveFedora::Base
   property :contact_email, predicate: Avalon::RDFVocab::Collection.contact_email, multiple: false do |index|
     index.as :stored_sortable
   end
-  property :website, predicate: Avalon::RDFVocab::Collection.website, multiple: false do |index|
+  property :website_label, predicate: Avalon::RDFVocab::Collection.website_label, multiple: false do |index|
+    index.as :stored_sortable
+  end
+  property :website_url, predicate: Avalon::RDFVocab::Collection.website_url, multiple: false do |index|
     index.as :stored_sortable
   end
   property :dropbox_directory_name, predicate: Avalon::RDFVocab::Collection.dropbox_directory_name, multiple: false do |index|
diff --git a/app/models/avalon/rdf_vocab.rb b/app/models/avalon/rdf_vocab.rb
index 212d658651..8fd95c8957 100644
--- a/app/models/avalon/rdf_vocab.rb
+++ b/app/models/avalon/rdf_vocab.rb
@@ -57,7 +57,8 @@ class MediaObject < RDF::StrictVocabulary("http://avalonmediasystem.org/rdf/voca
 
     class Collection < RDF::StrictVocabulary("http://avalonmediasystem.org/rdf/vocab/collection#")
       property :contact_email,            "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
-      property :website,                  "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
+      property :website_label,            "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
+      property :website_url,              "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :dropbox_directory_name,   "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :default_read_users,       "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :default_read_groups,      "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
diff --git a/app/presenters/collection_presenter.rb b/app/presenters/collection_presenter.rb
index 0851310fb4..56b7482a2c 100644
--- a/app/presenters/collection_presenter.rb
+++ b/app/presenters/collection_presenter.rb
@@ -13,10 +13,11 @@
 # ---  END LICENSE_HEADER BLOCK  ---
 
 class CollectionPresenter
-  attr_reader :document
+  attr_reader :document, :view_context
 
-  def initialize(solr_doc)
+  def initialize(solr_doc, view_context)
     @document = solr_doc
+    @view_context = view_context
   end
 
   delegate :id, to: :document
@@ -50,8 +51,8 @@ def contact_email
     document["contact_email_ssi"]
   end
 
-  def website
-    document["website_ssi"]
+  def website_link
+    view_context.link_to document["website_label_ssi"], document["website_url_ssi"]
   end
 
   def as_json(_)
diff --git a/app/views/admin/collections/_form.html.erb b/app/views/admin/collections/_form.html.erb
index 066795663c..21cd8a302f 100644
--- a/app/views/admin/collections/_form.html.erb
+++ b/app/views/admin/collections/_form.html.erb
@@ -30,7 +30,8 @@ Unless required by applicable law or agreed to in writing, software distributed
         <% end %>
         <%= f.text_area :description, rows: 3  %>
         <%= f.email_field :contact_email %>
-        <%= f.url_field :website %>
+        <%= f.text_field :website_label %>
+        <%= f.url_field :website_url %>
       </div>
       <div class="modal-footer">
         <a href="#" data-dismiss="modal" aria-hidden="true" class="btn btn-default">Cancel</a>
diff --git a/app/views/admin/collections/show.html.erb b/app/views/admin/collections/show.html.erb
index 2c657f4643..95cbf49342 100644
--- a/app/views/admin/collections/show.html.erb
+++ b/app/views/admin/collections/show.html.erb
@@ -45,10 +45,14 @@ Unless required by applicable law or agreed to in writing, software distributed
       <p><%= @collection.unit %></p>
       <p><strong>Description:</strong></p>
       <p class="collection-description"><%= @collection.description %></p>
-      <p><strong>Contact email:</strong></p>
-      <p><%= mail_to(@collection.contact_email) if @collection.contact_email.present? %></p>
-      <p><strong>Website:</strong></p>
-      <p><%= link_to(@collection.website, @collection.website) if @collection.website.present? %></p>
+      <% if @collection.contact_email.present? %>
+        <p><strong>Contact email:</strong></p>
+        <p><%= mail_to(@collection.contact_email) %></p>
+      <% end %>
+      <% if @collection.website_url.present? %>
+        <p><strong>Website:</strong></p>
+        <p><%= link_to(@collection.website_label, @collection.website_url)%></p>
+      <% end %>
     </div>
     <div class="col-md-3">
       <p><strong>Poster:</strong></p>
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 03060d65a4..e356e3387a 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -43,7 +43,7 @@ Unless required by applicable law or agreed to in writing, software distributed
         <%= react_component("CollectionDetails", 
           { content: @doc_presenter.description,
             email: @doc_presenter.contact_email,
-            website: @doc_presenter.website 
+            website: @doc_presenter.website_link
           }) %>
       </div>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f8bce1cb4e..348e0f11b2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -248,6 +248,7 @@ en:
         description: "Description"
       user:  
         login: "Username or email"
+
   iiif:
     auth:
       confirmLabel: "Login"
@@ -267,3 +268,10 @@ en:
       users:
         index:
           email_label: Email
+
+  helpers:
+    label:
+      admin_collection:
+        contact_email: "Contact Email"
+        website_label: "Website Name"
+        website_url: "Website Address"
diff --git a/spec/controllers/admin_collections_controller_spec.rb b/spec/controllers/admin_collections_controller_spec.rb
index ec6e4430c9..452ff5ab0b 100644
--- a/spec/controllers/admin_collections_controller_spec.rb
+++ b/spec/controllers/admin_collections_controller_spec.rb
@@ -274,12 +274,13 @@
       # post 'create', format:'json', admin_collection: {name: collection.name, description: collection.description, unit: collection.unit, managers: collection.managers}
     end
     it "should create a new collection" do
-      post 'create', params: { format:'json', admin_collection: {name: collection.name, description: collection.description, unit: collection.unit, contact_email: collection.contact_email, website: collection.website, managers: collection.managers} }
+      post 'create', params: { format:'json', admin_collection: {name: collection.name, description: collection.description, unit: collection.unit, contact_email: collection.contact_email, website_label: collection.website_label, website_url: collection.website_url, managers: collection.managers} }
       expect(JSON.parse(response.body)['id'].class).to eq String
       expect(JSON.parse(response.body)).not_to include('errors')
       new_collection = Admin::Collection.find(JSON.parse(response.body)['id'])
       expect(new_collection.contact_email).to eq collection.contact_email
-      expect(new_collection.website).to eq collection.website
+      expect(new_collection.website_label).to eq collection.website_label
+      expect(new_collection.website_url).to eq collection.website_url
     end
     it "should create a new collection with default manager list containing current API user" do
       post 'create', params: { format:'json', admin_collection: { name: collection.name, description: collection.description, unit: collection.unit } }
@@ -311,7 +312,8 @@
     context "update REST API" do
       let!(:collection) { FactoryBot.create(:collection)}
       let(:contact_email) { Faker::Internet.email }
-      let(:website) { Faker::Internet.url }
+      let(:website_label) { Faker::Lorem.words.join(' ') }
+      let(:website_url) { Faker::Internet.url }
 
       before do
         ApiToken.create token: 'secret_token', username: 'archivist1@example.com', email: 'archivist1@example.com'
@@ -320,13 +322,14 @@
 
       it "should update a collection via API" do
         old_description = collection.description
-        put 'update', params: { format: 'json', id: collection.id, admin_collection: { description: collection.description+'new', contact_email: contact_email, website: website }}
+        put 'update', params: { format: 'json', id: collection.id, admin_collection: { description: collection.description+'new', contact_email: contact_email, website_label: website_label, website_url: website_url }}
         expect(JSON.parse(response.body)['id'].class).to eq String
         expect(JSON.parse(response.body)).not_to include('errors')
         collection.reload
         expect(collection.description).to eq old_description+'new'
         expect(collection.contact_email).to eq contact_email
-        expect(collection.website).to eq website
+        expect(collection.website_label).to eq website_label
+        expect(collection.website_url).to eq website_url
       end
       it "should return 422 if collection update via API failed" do
         allow_any_instance_of(Admin::Collection).to receive(:save).and_return false
diff --git a/spec/factories/collections.rb b/spec/factories/collections.rb
index 0bded5e76f..ea54ae9584 100644
--- a/spec/factories/collections.rb
+++ b/spec/factories/collections.rb
@@ -18,7 +18,8 @@
     unit {"Default Unit"}
     description {Faker::Lorem.sentence}
     contact_email { Faker::Internet.email }
-    website { Faker::Internet.url }
+    website_label { Faker::Lorem.words.join(' ') }
+    website_url { Faker::Internet.url }
     managers {[FactoryBot.create(:manager).user_key]}
     editors {[FactoryBot.create(:user).user_key]}
     depositors {[FactoryBot.create(:user).user_key]}
diff --git a/spec/models/collection_spec.rb b/spec/models/collection_spec.rb
index c0918a562c..c61f3799ca 100644
--- a/spec/models/collection_spec.rb
+++ b/spec/models/collection_spec.rb
@@ -122,13 +122,14 @@
       FactoryBot.create(:collection, name: 'Herman B. Wells Collection', unit: "Default Unit",
                         description: "Collection about our 11th university president, 1938-1962",
                         managers: [manager.user_key], editors: [editor.user_key], depositors: [depositor.user_key],
-                        contact_email: contact_email, website: website)
+                        contact_email: contact_email, website_url: website_url, website_label: website_label)
     end
     let(:manager) {FactoryBot.create(:manager)}
     let(:editor) {FactoryBot.create(:user)}
     let(:depositor) {FactoryBot.create(:user)}
     let(:contact_email) { Faker::Internet.email }
-    let(:website) { Faker::Internet.url }
+    let(:website_label) { Faker::Lorem.words.join(' ') }
+    let(:website_url) { Faker::Internet.url }
 
     it {is_expected.to validate_presence_of(:name)}
     context 'validate uniqueness of name' do
@@ -156,8 +157,8 @@
     it {is_expected.to validate_inclusion_of(:unit).in_array(Admin::Collection.units)}
     it { is_expected.to allow_value('collection@example.com').for(:contact_email) }
     it { is_expected.not_to allow_value('collection@').for(:contact_email) }
-    it { is_expected.to allow_value('https://collection.example.com').for(:website) }
-    it { is_expected.not_to allow_value('collection.example.com').for(:website) }
+    it { is_expected.to allow_value('https://collection.example.com').for(:website_url) }
+    it { is_expected.not_to allow_value('collection.example.com').for(:website_url) }
     it "should ensure length of :managers is_at_least(1)"
 
     it "should have attributes" do
@@ -169,7 +170,8 @@
       expect(subject.editors).to eq([editor.user_key])
       expect(subject.depositors).to eq([depositor.user_key])
       expect(subject.contact_email).to eq(contact_email)
-      expect(subject.website).to eq(website)
+      expect(subject.website_label).to eq(website_label)
+      expect(subject.website_url).to eq(website_url)
       # expect(subject.rightsMetadata).to be_kind_of Hydra::Datastream::RightsMetadata
       # expect(subject.inheritedRights).to be_kind_of Hydra::Datastream::InheritableRightsMetadata
       # expect(subject.defaultRights).to be_kind_of Hydra::Datastream::NonIndexedRightsMetadata
diff --git a/spec/presenters/collection_presenter_spec.rb b/spec/presenters/collection_presenter_spec.rb
index e6ae01ccf2..e96785f36f 100644
--- a/spec/presenters/collection_presenter_spec.rb
+++ b/spec/presenters/collection_presenter_spec.rb
@@ -20,22 +20,36 @@
   let(:unit) { "Default Unit" }
   let(:description) { "The long form description of this collection." }
   let(:has_poster) { true }
+  let(:website_label) { Faker::Lorem.words.join(' ') }
+  let(:website_url) { Faker::Internet.url }
+  let(:contact_email) { Faker::Internet.email }
+  let(:website_link) { "<a href='#{website_label}'>#{website_url}</a>" }
   let(:solr_doc) do
     SolrDocument.new(
       id: id,
       "name_ssi": name,
       "unit_ssi": unit,
       "description_tesim": [description],
-      "has_poster_bsi": has_poster
+      "has_poster_bsi": has_poster,
+      "website_label_ssi": website_label,
+      "website_url_ssi": website_url,
+      "contact_email_ssi": contact_email
     )
   end
-  subject(:presenter) { described_class.new(solr_doc) }
+  let(:view_context) { double('View Context', website_link: website_link) }
+  subject(:presenter) { described_class.new(solr_doc, view_context) }
+
+  before do
+    allow(view_context).to receive(:link_to).with(website_label, website_url).and_return(website_link)
+  end
 
   it 'provides getters for descriptive fields' do
     expect(presenter.id).to eq id
     expect(presenter.name).to eq name
     expect(presenter.unit).to eq unit
     expect(presenter.description).to eq description
+    expect(presenter.contact_email).to eq contact_email
+    expect(presenter.website_link).to eq website_link
   end
 
   describe '#poster_url' do

From 7a2ecb5b262f3c32dd05a93135dc8a0ca38d48f3 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Fri, 24 Apr 2020 07:39:35 -0400
Subject: [PATCH 21/61] Only validate format of contact email and website url
 when value is present

---
 app/models/admin/collection.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/admin/collection.rb b/app/models/admin/collection.rb
index 6fdc6086b4..9287695d0d 100644
--- a/app/models/admin/collection.rb
+++ b/app/models/admin/collection.rb
@@ -28,8 +28,8 @@ class Admin::Collection < ActiveFedora::Base
   validates :name, :uniqueness => { :solr_name => 'name_uniq_si'}, presence: true
   validates :unit, presence: true, inclusion: { in: Proc.new{ Admin::Collection.units } }
   validates :managers, length: {minimum: 1, message: "list can't be empty."}
-  validates :contact_email, format: { with: URI::MailTo::EMAIL_REGEXP }
-  validates :website_url, format: { with: URI.regexp }
+  validates :contact_email, format: { with: URI::MailTo::EMAIL_REGEXP }, allow_blank: true
+  validates :website_url, format: { with: URI.regexp }, allow_blank: true
 
   property :name, predicate: ::RDF::Vocab::DC.title, multiple: false do |index|
     index.as :stored_sortable

From fa7747cedef50f6b39b0e4b78110c4f6016546ae Mon Sep 17 00:00:00 2001
From: Sumith Reddi Baddam <sumith.reddy2@gmail.com>
Date: Mon, 27 Apr 2020 12:40:30 -0400
Subject: [PATCH 22/61] Changed the embeded_code display to trim spaces

---
 app/views/media_objects/_embed_resource.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/media_objects/_embed_resource.html.erb b/app/views/media_objects/_embed_resource.html.erb
index 5ac9bce84c..39ef1fe28e 100644
--- a/app/views/media_objects/_embed_resource.html.erb
+++ b/app/views/media_objects/_embed_resource.html.erb
@@ -18,9 +18,7 @@ Unless required by applicable law or agreed to in writing, software distributed
     <div class="tab-pane" id="embed-tab">
       <% if @currentStream.present? %>
       <p class="muted">Copy the text below to embed this resource</p>
-      <textarea class="col-md-6" rows="3" id="embed-part" onClick="this.select();" readonly="readonly">
-        <%= @currentStream.embed_code(MasterFile::EMBED_SIZE[:medium], { urlappend: '/embed' }) %>
-      </textarea>
+      <textarea class="col-md-6" rows="3" id="embed-part" onClick="this.select();" readonly="readonly"><%= @currentStream.embed_code(MasterFile::EMBED_SIZE[:medium], { urlappend: '/embed' }) %></textarea>
       <% else %>
       <p class="muted"> <%= I18n.t('media_object.empty_share_link_notice') %> </p>
       <% end %>

From 173125b8fcfebde6be16f341081e70c4c06522ee Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 10 Mar 2020 14:45:22 -0400
Subject: [PATCH 23/61] Rebuild list of current user's virtual groups stored in
 user_session when starting/stopping impersonation.

---
 .../samvera/persona/users_controller.rb       |   5 +
 .../samvera/persona/user_controller_spec.rb   | 101 ++++++++++++++++++
 spec/factories/users.rb                       |   2 +-
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 spec/controllers/samvera/persona/user_controller_spec.rb

diff --git a/app/controllers/samvera/persona/users_controller.rb b/app/controllers/samvera/persona/users_controller.rb
index 666fe554a3..b16cd00e5e 100644
--- a/app/controllers/samvera/persona/users_controller.rb
+++ b/app/controllers/samvera/persona/users_controller.rb
@@ -14,6 +14,7 @@
 
 # Copied here in full from samvera-persona 0.1.7
 # Added prepend_view_path
+# Added LDAP group recalculation in impersonate and stop_impersonating
 # TODO: Determine why this is necessary and remove this override
 module Samvera
   class Persona::UsersController < ApplicationController
@@ -77,11 +78,15 @@ def update
     def impersonate
       user = User.find(params[:id])
       impersonate_user(user)
+      # Recalculate user_session[:virtual_groups]
+      user_session[:virtual_groups] = current_user.ldap_groups
       redirect_to main_app.root_path
     end
 
     def stop_impersonating
       stop_impersonating_user
+      # Recalculate user_session[:virtual_groups]
+      user_session[:virtual_groups] = current_user.ldap_groups
       redirect_to main_app.persona_users_path, notice: t('.become.over')
     end
 
diff --git a/spec/controllers/samvera/persona/user_controller_spec.rb b/spec/controllers/samvera/persona/user_controller_spec.rb
new file mode 100644
index 0000000000..e7498be153
--- /dev/null
+++ b/spec/controllers/samvera/persona/user_controller_spec.rb
@@ -0,0 +1,101 @@
+require 'rails_helper'
+
+RSpec.describe Samvera::Persona::UsersController, type: :controller do
+  describe "#index" do
+    let(:user) {FactoryBot.create(:admin)}
+    before do
+      sign_in(user)
+    end
+
+    it "is successful" do
+      get :index
+      expect(response).to be_successful
+      expect(assigns[:presenter]).to be_kind_of Samvera::Persona::UsersPresenter
+    end
+  end
+
+  context 'as an anonymous user' do
+    let(:user) { FactoryBot.create(:user) }
+
+    describe 'DELETE #destroy' do
+      subject { User.find_by(id: user.id) }
+
+      before { delete :destroy, params: { id: user.id } }
+
+      it "doesn't delete the user and redirects to login" do
+        expect(subject).not_to be_nil
+        expect(response).to redirect_to controller.main_app.new_user_session_path
+      end
+    end
+  end
+
+  context 'as an admin user' do
+    let(:user) { FactoryBot.create(:admin) }
+    before { sign_in user }
+
+    describe 'DELETE #destroy' do
+      before { delete :destroy, params: { id: user.to_param } }
+
+      it "deletes the user and displays success message" do
+        expect{ User.find(user.id) }.to raise_error(ActiveRecord::RecordNotFound)
+        expect(flash[:notice]).to match "has been successfully deleted."
+      end
+
+      it "deletes the user without paranoia gem" do
+        # expect{User.with_deleted.find(user.id)}.to_not raise_error
+        expect(User.exists?(user.id)).to eq false
+      end
+    end
+  end
+
+  context 'pretender' do
+    let(:admin) { FactoryBot.create(:admin) }
+    let(:ldap_groups) { [] }
+    before do
+      sign_in admin
+      allow(current_user).to receive(:ldap_groups).and_return(ldap_groups)
+    end
+
+    describe 'POST #impersonate' do
+      let(:current_user) { FactoryBot.create(:user) }
+
+      it 'allows you to impersonate another user' do
+        post :impersonate, params: { id: current_user.id }
+        expect(response).to redirect_to(controller.main_app.root_path)
+      end
+
+      context 'with external groups' do
+        let(:ldap_groups) { ['ldap_group1', 'ldap_group2'] }
+
+        before do
+          allow(User).to receive(:find).with(current_user.to_param).and_return(current_user)
+        end
+
+        it 'sets the virtual groups for the new user' do
+          expect { post :impersonate, params: { id: current_user.id }}.to change { @controller.user_session[:virtual_groups] }.from(nil).to(ldap_groups)
+        end
+      end
+    end
+
+    describe 'POST #stop_impersonating' do
+      let(:current_user) { FactoryBot.create(:user) }
+
+      it 'allows you to stop impersonating' do
+        post :stop_impersonating, params: { id: current_user.id }
+        expect(response).to redirect_to(controller.main_app.persona_users_path)
+      end
+
+      context 'with external groups' do
+        let(:old_ldap_groups) { ['ldap_group1', 'ldap_group2'] }
+
+        before do
+          @controller.user_session[:virtual_groups] = old_ldap_groups
+        end
+
+        it 'sets the virtual groups for the new user' do  
+          expect { post :stop_impersonating, params: { id: current_user.id }}.to change { @controller.user_session[:virtual_groups] }.from(old_ldap_groups).to([])
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index ee1b699da1..e7349b6457 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -18,7 +18,7 @@
     username { [Faker::Name.last_name.gsub("'",""),Faker::Name.first_name.gsub("'","")].join('.').downcase }
     password { 'testing123' }
 
-    factory :administrator do
+    factory :administrator, aliases: [:admin] do
       after(:create) do |user|
         begin
           Avalon::RoleControls.add_user_role(user.user_key, 'administrator')

From 4cebe43037cc7848e38f6fe0b7a0791c6ecf7223 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Mon, 27 Apr 2020 16:50:46 -0400
Subject: [PATCH 24/61] New sme build with, peaks.js upgrade for adding
 precsion option

---
 yarn.lock | 249 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 127 insertions(+), 122 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3ba392376d..c67f9277f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -663,12 +663,12 @@
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
 "@babel/runtime-corejs2@^7.0.0":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.8.4.tgz#e4ed23a8be40fa26b97fb649deaba8144c987593"
-  integrity sha512-7jU2FgNqNHX6yTuU/Dr/vH5/O8eVL9U85MG5aDw1LzGfCvvhXC1shdXfVzCQDsoY967yrAKeLujRv7l8BU+dZA==
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.9.2.tgz#f11d074ff99b9b4319b5ecf0501f12202bf2bf4d"
+  integrity sha512-ayjSOxuK2GaSDJFCtLgHnYjuMyIpViNujWrZo8GUpN60/n7juzJKK5yOo6RFVb0zdU9ACJFK+MsZrUnj3OmXMw==
   dependencies:
     core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2":
   version "7.4.3"
@@ -677,12 +677,12 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
-  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
+"@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
+  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.3.4":
   version "7.3.4"
@@ -729,36 +729,36 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@emotion/hash@^0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.4.tgz#f14932887422c9056b15a8d222a9074a7dfa2831"
-  integrity sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A==
+"@emotion/hash@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
+  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@fortawesome/fontawesome-common-types@^0.2.26":
-  version "0.2.26"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.26.tgz#6e0b13a752676036f8196f8a1500d53a27b4adc1"
-  integrity sha512-CcM/fIFwZlRdiWG/25xE/wHbtyUuCtqoCTrr6BsWw7hH072fR++n4L56KPydAr3ANgMJMjT8v83ZFIsDc7kE+A==
+"@fortawesome/fontawesome-common-types@^0.2.28":
+  version "0.2.28"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.28.tgz#1091bdfe63b3f139441e9cba27aa022bff97d8b2"
+  integrity sha512-gtis2/5yLdfI6n0ia0jH7NJs5i/Z/8M/ZbQL6jXQhCthEOe5Cr5NcQPhgTvFxNOtURE03/ZqUcEskdn2M+QaBg==
 
 "@fortawesome/fontawesome-svg-core@^1.2.4":
-  version "1.2.26"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.26.tgz#671569271d6b532cdea5e3deb8ff16f8b7ac251d"
-  integrity sha512-3Dfd/v2IztP1TxKOxZiB5+4kaOZK9mNy0KU1vVK7nFlPWz3gzxrCWB+AloQhQUoJ8HhGqbzjliK89Vl7PExGbw==
+  version "1.2.28"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.28.tgz#e5b8c8814ef375f01f5d7c132d3c3a2f83a3abf9"
+  integrity sha512-4LeaNHWvrneoU0i8b5RTOJHKx7E+y7jYejplR7uSVB34+mp3Veg7cbKk7NBCLiI4TyoWS1wh9ZdoyLJR8wSAdg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.26"
+    "@fortawesome/fontawesome-common-types" "^0.2.28"
 
 "@fortawesome/free-solid-svg-icons@^5.3.1":
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.0.tgz#8decac5844e60453cc0c7c51437d1461df053a35"
-  integrity sha512-CnpsWs6GhTs9ekNB3d8rcO5HYqRkXbYKf2YNiAlTWbj5eVlPqsd/XH1F9If8jkcR1aegryAbln/qYeKVZzpM0g==
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.13.0.tgz#44d9118668ad96b4fd5c9434a43efc5903525739"
+  integrity sha512-IHUgDJdomv6YtG4p3zl1B5wWf9ffinHIvebqQOmV3U+3SLw4fC+LUCCgwfETkbTtjy5/Qws2VoVf6z/ETQpFpg==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.26"
+    "@fortawesome/fontawesome-common-types" "^0.2.28"
 
 "@fortawesome/react-fontawesome@^0.1.2":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.8.tgz#cb6d4dd3aeec45b6ff2d48c812317a6627618511"
-  integrity sha512-I5h9YQg/ePA3Br9ISS18fcwOYmzQYDSM1ftH03/8nHkiqIVHtUyQBw482+60dnzvlr82gHt3mGm+nDUp159FCw==
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.9.tgz#c865b9286c707407effcec99958043711367cd02"
+  integrity sha512-49V3WNysLZU5fZ3sqSuys4nGRytsrxJktbv3vuaXkEoxv22C6T7TEG0TW6+nqVjMnkfCQd5xOnmJoZHMF78tOw==
   dependencies:
-    prop-types "^15.5.10"
+    prop-types "^15.7.2"
 
 "@material-ui/core@4.2.1":
   version "4.2.1"
@@ -790,17 +790,17 @@
     "@babel/runtime" "^7.2.0"
 
 "@material-ui/styles@^4.2.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.0.tgz#10c31859f6868cfa9d3adf6b6c3e32c9d676bc76"
-  integrity sha512-nJHum4RqYBPWsjL/9JET8Z02FZ9gSizlg/7LWVFpIthNzpK6OQ5OSRR4T4x9/p+wK3t1qNn3b1uI4XpnZaPxOA==
+  version "4.9.10"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.10.tgz#182ccdd0bc8525a459486499bbaebcd92b0db3ab"
+  integrity sha512-EXIXlqVyFDnjXF6tj72y6ZxiSy+mHtrsCo3Srkm3XUeu3Z01aftDBy7ZSr3TQ02gXHTvDSBvegp3Le6p/tl7eA==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@emotion/hash" "^0.7.4"
-    "@material-ui/types" "^5.0.0"
-    "@material-ui/utils" "^4.7.1"
+    "@emotion/hash" "^0.8.0"
+    "@material-ui/types" "^5.0.1"
+    "@material-ui/utils" "^4.9.6"
     clsx "^1.0.2"
     csstype "^2.5.2"
-    hoist-non-react-statics "^3.2.1"
+    hoist-non-react-statics "^3.3.2"
     jss "^10.0.3"
     jss-plugin-camel-case "^10.0.3"
     jss-plugin-default-unit "^10.0.3"
@@ -812,12 +812,12 @@
     prop-types "^15.7.2"
 
 "@material-ui/system@^4.3.0":
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.1.tgz#beb6595e1b164317340bdc5a629a6798fc35f82d"
-  integrity sha512-CLrJK2aKNWNwruGVTRf+rLz96P4jmozpY2UaCE6hBTa1oGsQ396YXOQQABQ4c0igawmdyf5iQb0zs9j5zsAf1w==
+  version "4.9.10"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.10.tgz#5de6ec7bea0f222b10b45e5bd5bb8b9a7b938926"
+  integrity sha512-E+t0baX2TBZk6ALm8twG6objpsxLdMM4MDm1++LMt2m7CetCAEc3aIAfDaprk4+tm5hFT1Cah5dRWk8EeIFQYw==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.7.1"
+    "@material-ui/utils" "^4.9.6"
     prop-types "^15.7.2"
 
 "@material-ui/types@^4.1.1":
@@ -827,15 +827,15 @@
   dependencies:
     "@types/react" "*"
 
-"@material-ui/types@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.0.tgz#26d6259dc6b39f4c2e1e9aceff7a11e031941741"
-  integrity sha512-UeH2BuKkwDndtMSS0qgx1kCzSMw+ydtj0xx/XbFtxNSTlXydKwzs5gVW5ZKsFlAkwoOOQ9TIsyoCC8hq18tOwg==
+"@material-ui/types@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz#c4954063cdc196eb327ee62c041368b1aebb6d61"
+  integrity sha512-wURPSY7/3+MAtng3i26g+WKwwNE3HEeqa/trDBR5+zWKmcjO+u9t7Npu/J1r+3dmIa/OeziN9D/18IrBKvKffw==
 
-"@material-ui/utils@^4.1.0", "@material-ui/utils@^4.7.1":
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.7.1.tgz#dc16c7f0d2cd02fbcdd5cfe601fd6863ae3cc652"
-  integrity sha512-+ux0SlLdlehvzCk2zdQ3KiS3/ylWvuo/JwAGhvb8dFVvwR21K28z0PU9OQW2PGogrMEdvX3miEI5tGxTwwWiwQ==
+"@material-ui/utils@^4.1.0", "@material-ui/utils@^4.9.6":
+  version "4.9.12"
+  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.9.12.tgz#0d639f1c1ed83fffb2ae10c21d15a938795d9e65"
+  integrity sha512-/0rgZPEOcZq5CFA4+4n6Q6zk7fi8skHhH2Bcra8R3epoJEYy5PL55LuMazPtPH1oKeRausDV/Omz4BbgFsn1HQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
     prop-types "^15.7.2"
@@ -932,9 +932,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@^16.9.11":
-  version "16.9.19"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.19.tgz#c842aa83ea490007d29938146ff2e4d9e4360c40"
-  integrity sha512-LJV97//H+zqKWMms0kvxaKYJDG05U2TtQB3chRLF8MPNs+MQh/H1aGlyDUxjaHvu08EAGerdX2z4LTBc7ns77A==
+  version "16.9.34"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
+  integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -2280,11 +2280,11 @@ css-url-regex@^1.1.0:
   integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=
 
 css-vendor@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz#4e6d53d953c187981576d6a542acc9fb57174bda"
-  integrity sha512-VS9Rjt79+p7M0WkPqcAza4Yq1ZHrsHrwf7hPL/bjQB+c1lwmAI+1FXxYTYt818D/50fFVflw0XKleiBN5RITkg==
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
+  integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==
   dependencies:
-    "@babel/runtime" "^7.6.2"
+    "@babel/runtime" "^7.8.3"
     is-in-browser "^1.0.2"
 
 css-what@2.1, css-what@^2.1.2:
@@ -2383,9 +2383,9 @@ csso@^3.5.1:
     css-tree "1.0.0-alpha.29"
 
 csstype@^2.2.0, csstype@^2.5.2, csstype@^2.6.5, csstype@^2.6.7:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.8.tgz#0fb6fc2417ffd2816a418c9336da74d7f07db431"
-  integrity sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b"
+  integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
@@ -2616,11 +2616,11 @@ dom-helpers@^3.2.0, dom-helpers@^3.2.1, dom-helpers@^3.3.1, dom-helpers@^3.4.0:
     "@babel/runtime" "^7.1.2"
 
 dom-helpers@^5.0.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz#7233248eb3a2d1f74aafca31e52c5299cc8ce821"
-  integrity sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz#4609680ab5c79a45f2531441f1949b79d6587f4b"
+  integrity sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==
   dependencies:
-    "@babel/runtime" "^7.6.3"
+    "@babel/runtime" "^7.8.7"
     csstype "^2.6.7"
 
 dom-serializer@0:
@@ -2830,10 +2830,10 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
-eventemitter2@~6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.0.0.tgz#218eb512c3603c5341724b6af7b686a1aa5ab8f5"
-  integrity sha512-ZuNWHD7S7IoikyEmx35vPU8H1W0L+oi644+4mSTg7nwXvBQpIwQL7DPjYUF0VMB0jPkNMo3MqD07E7MYrkFmjQ==
+eventemitter2@~6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.3.1.tgz#14ec7db8c659aa9b36ad2ce4bfcaba95ad525536"
+  integrity sha512-cxfu3g0IBn/JEhAPV33NZTi8llQQ5j62D0Yf4ir1U9uQ1DlRZLL3Hh2E/+TWDprSy4BETWvrGBZMUexuC2b6Lw==
 
 eventemitter3@3.1.0, eventemitter3@^3.0.0:
   version "3.1.0"
@@ -3466,7 +3466,7 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0:
+hoist-non-react-statics@^3.2.1, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -4173,68 +4173,68 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jss-plugin-camel-case@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.4.tgz#3dedecec1e5bba0bf6141c2c05e2ab11ea4b468d"
-  integrity sha512-+wnqxJsyfUnOn0LxVg3GgZBSjfBCrjxwx7LFxwVTUih0ceGaXKZoieheNOaTo5EM4w8bt1nbb8XonpQCj67C6A==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.1.1.tgz#8e73ecc4f1d0f8dfe4dd31f6f9f2782588970e78"
+  integrity sha512-MDIaw8FeD5uFz1seQBKz4pnvDLnj5vIKV5hXSVdMaAVq13xR6SVTVWkIV/keyTs5txxTvzGJ9hXoxgd1WTUlBw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     hyphenate-style-name "^1.0.3"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-default-unit@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.4.tgz#df03885de20f20a1fc1c21bdb7c62e865ee400d9"
-  integrity sha512-T0mhL/Ogp/quvod/jAHEqKvptLDxq7Cj3a+7zRuqK8HxUYkftptN89wJElZC3rshhNKiogkEYhCWenpJdFvTBg==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.1.1.tgz#2df86016dfe73085eead843f5794e3890e9c5c47"
+  integrity sha512-UkeVCA/b3QEA4k0nIKS4uWXDCNmV73WLHdh2oDGZZc3GsQtlOCuiH3EkB/qI60v2MiCq356/SYWsDXt21yjwdg==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-global@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.4.tgz#412245b56133cc88bec654a70d82d5922619f4c5"
-  integrity sha512-N8n9/GHENZce+sqE4UYiZiJtI+t+erT/BypHOrNYAfIoNEj7OYsOEKfIo2P0GpLB3QyDAYf5eo9XNdZ8veEkUA==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.1.1.tgz#36b0d6d9facb74dfd99590643708a89260747d14"
+  integrity sha512-VBG3wRyi3Z8S4kMhm8rZV6caYBegsk+QnQZSVmrWw6GVOT/Z4FA7eyMu5SdkorDlG/HVpHh91oFN56O4R9m2VA==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-nested@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.4.tgz#4d15ad13995fb6e4125618006473a096d2475d75"
-  integrity sha512-QM21BKVt8LDeoRfowvAMh/s+/89VYrreIIE6ch4pvw0oAXDWw1iorUPlqLZ7uCO3UL0uFtQhJq3QMLN6Lr1v0A==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.1.1.tgz#5c3de2b8bda344de1ebcef3a4fd30870a29a8a8c"
+  integrity sha512-ozEu7ZBSVrMYxSDplPX3H82XHNQk2DQEJ9TEyo7OVTPJ1hEieqjDFiOQOxXEj9z3PMqkylnUbvWIZRDKCFYw5Q==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
     tiny-warning "^1.0.2"
 
 jss-plugin-props-sort@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.4.tgz#43c880ff8dfcf858f809f663ece5e65a1d945b5a"
-  integrity sha512-WoETdOCjGskuin/OMt2uEdDPLZF3vfQuHXF+XUHGJrq0BAapoyGQDcv37SeReDlkRAbVXkEZPsIMvYrgHSHFiA==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.1.1.tgz#34bddcbfaf9430ec8ccdf92729f03bb10caf1785"
+  integrity sha512-g/joK3eTDZB4pkqpZB38257yD4LXB0X15jxtZAGbUzcKAVUHPl9Jb47Y7lYmiGsShiV4YmQRqG1p2DHMYoK91g==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-rule-value-function@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.4.tgz#2f4cf4a86ad3eba875bb48cb9f4a7ed35cb354e7"
-  integrity sha512-0hrzOSWRF5ABJGaHrlnHbYZjU877Ofzfh2id3uLtBvemGQLHI+ldoL8/+6iPSRa7M8z8Ngfg2vfYhKjUA5gA0g==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.1.1.tgz#be00dac6fc394aaddbcef5860b9eca6224d96382"
+  integrity sha512-ClV1lvJ3laU9la1CUzaDugEcwnpjPTuJ0yGy2YtcU+gG/w9HMInD5vEv7xKAz53Bk4WiJm5uLOElSEshHyhKNw==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.0.4"
+    jss "10.1.1"
 
 jss-plugin-vendor-prefixer@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.4.tgz#1626ef612a4541cff17cf96815e1740155214ed2"
-  integrity sha512-4JgEbcrdeMda1qvxTm1CnxFJAWVV++VLpP46HNTrfH7VhVlvUpihnUNs2gAlKuRT/XSBuiWeLAkrTqF4NVrPig==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.1.1.tgz#8348b20749f790beebab3b6a8f7075b07c2cfcfd"
+  integrity sha512-09MZpQ6onQrhaVSF6GHC4iYifQ7+4YC/tAP6D4ZWeZotvCMq1mHLqNKRIaqQ2lkgANjlEot2JnVi1ktu4+L4pw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     css-vendor "^2.0.7"
-    jss "10.0.4"
+    jss "10.1.1"
 
-jss@10.0.4, jss@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.0.4.tgz#46ebdde1c40c9a079d64f3334cb88ae28fd90bfd"
-  integrity sha512-GqHmeDK83qbqMAVjxyPfN1qJVTKZne533a9bdCrllZukUM8npG/k+JumEPI86IIB5ifaZAHG2HAsUziyxOiooQ==
+jss@10.1.1, jss@^10.0.3:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.1.1.tgz#450b27d53761af3e500b43130a54cdbe157ea332"
+  integrity sha512-Xz3qgRUFlxbWk1czCZibUJqhVPObrZHxY3FPsjCXhDld4NOj1BgM14Ir5hVm+Qr6OLqVljjGvoMcCdXNOAbdkQ==
   dependencies:
     "@babel/runtime" "^7.3.1"
     csstype "^2.6.5"
@@ -4275,10 +4275,10 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
-konva@~4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/konva/-/konva-4.1.3.tgz#9ae6c47b86421243b599f22dba0e2fde8fbb5f15"
-  integrity sha512-2O3trjfeRPAMsBUm9XexsmxOCdi95etxMVqYsc+9JzaIP1KFhNKF2TNr5z8gIVrrXmOxtfZSdWNku6h+Rofb4g==
+konva@~5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/konva/-/konva-5.0.2.tgz#1b54228b40c92672fbfdfafdc6e4fb9c2da675cd"
+  integrity sha512-AvbPl+7QYX21JLCFw45OApPBqeVkuMQVrloMIpcgG8QFfMm24BtYMF0LO0sS43A3/90GL4iRMHKlkHlPBBDYtw==
 
 last-call-webpack-plugin@^3.0.0:
   version "3.0.0"
@@ -5312,15 +5312,15 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-peaks.js@^0.17.0:
-  version "0.17.0"
-  resolved "https://registry.yarnpkg.com/peaks.js/-/peaks.js-0.17.0.tgz#ed07144552ca4ef9e4568776a2eb6cd0b459283c"
-  integrity sha512-0rAfXk4A5cLzgQB0AuLA36l4NV1+ynJSpBQOWnKx8vGYx+8/ShBz8x5ibCePCzAs5aX2uLR2ZetHMftpjPUESQ==
+peaks.js@^0.20.0:
+  version "0.20.0"
+  resolved "https://registry.yarnpkg.com/peaks.js/-/peaks.js-0.20.0.tgz#d7d022a4fdf0fdb6f7f3f119ab5405cbc290e47d"
+  integrity sha512-ljx9wzR/i2kAn17nxWKEVzQr53ERQegClc+x9rfKYQmdje+DemWODAVRADFQN52WQswJ57QtUIcZ2bno3nRTHQ==
   dependencies:
     colors.css "~3.0.0"
-    eventemitter2 "~6.0.0"
-    konva "~4.1.0"
-    waveform-data "~3.1.0"
+    eventemitter2 "~6.3.1"
+    konva "~5.0.2"
+    waveform-data "~3.3.1"
 
 performance-now@^2.1.0:
   version "2.1.0"
@@ -6304,9 +6304,9 @@ react-is@^16.3.2:
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
 react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.2:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 react-is@^16.8.1:
   version "16.8.4"
@@ -6377,7 +6377,7 @@ react-redux@^6.0.0:
 
 "react-structural-metadata-editor@https://github.com/avalonmediasystem/react-structural-metadata-editor":
   version "1.1.0"
-  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#203d6909947de1b7bce7cd915b09d5b286fcf9fa"
+  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#d1c9e58caf0ef6bd521786477e20e18a8313fa11"
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@fortawesome/fontawesome-svg-core" "^1.2.4"
@@ -6389,7 +6389,7 @@ react-redux@^6.0.0:
     base-64 "^0.1.0"
     hls.js "0.12.3-canary.4258"
     lodash "4.17.13"
-    peaks.js "^0.17.0"
+    peaks.js "^0.20.0"
     prop-types "^15.6.2"
     react-bootstrap "0.33.1"
     react-dnd "^7.0.2"
@@ -6559,6 +6559,11 @@ regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
   integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
+regenerator-runtime@^0.13.4:
+  version "0.13.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
+  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+
 regenerator-transform@^0.13.4:
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"
@@ -6757,9 +6762,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
     aproba "^1.1.1"
 
 rxjs@^6.4.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -7798,10 +7803,10 @@ waveform-data@^2.1.2:
   dependencies:
     inline-worker "~1.1.0"
 
-waveform-data@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/waveform-data/-/waveform-data-3.1.0.tgz#bfe38ffa0cc7e5328e0b1192c6d1ef25b22cd90f"
-  integrity sha512-Xephsy9bCJmDPVeXNYhoZ7HTSzUMKMxAd/buZ4urewhLjLYpWqqBTWOoEaV2eQ/VjroHweE28C4ngu1o+1ZoXw==
+waveform-data@~3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/waveform-data/-/waveform-data-3.3.1.tgz#19657a05e966d3efcc3206668f60a233d26975d2"
+  integrity sha512-GxwvVJDnTro2WCFvb4tp9GscC+/OCfoELM8z9b0yvjQzi0Lyr0DE/yhyWBDg0H9xjHiZl+cnI5ZQKDxnD/wE/Q==
   dependencies:
     inline-worker "~1.1.0"
 

From 99eba8eb3a4b80db65bb62bd392d6d775a9fa9ff Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 28 Apr 2020 14:55:10 -0400
Subject: [PATCH 25/61] Stub constants in tests to avoid affecting other tests

---
 spec/models/user_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8fc3b8c341..cc0ff28d1d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -108,8 +108,8 @@
 
   describe "#ldap_groups" do
     before do
-      Avalon::GROUP_LDAP = Net::LDAP.new unless defined?(Avalon::GROUP_LDAP)
-      Avalon::GROUP_LDAP_TREE = 'ou=Test,dc=avalonmediasystem,dc=org'.freeze unless defined?(Avalon::GROUP_LDAP_TREE)
+      stub_const("Avalon::GROUP_LDAP", Net::LDAP.new)
+      stub_const("Avalon::GROUP_LDAP_TREE", 'ou=Test,dc=avalonmediasystem,dc=org'.freeze)
     end
     it "should return [] if LDAP is not configured" do
       hide_const("Avalon::GROUP_LDAP")

From 501ddcdadff2ccf1bada65f6f5338a4f31b8f832 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Thu, 30 Apr 2020 09:31:31 -0400
Subject: [PATCH 26/61] Upgrade audio_waveform-ruby and get json upgrade with
 it

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4b05cacf19..ce43ead1a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git"
 
 # Media Access & Transcoding
 gem 'active_encode', '~> 0.7.0'
-gem 'audio_waveform-ruby', require: 'audio_waveform'
+gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
 gem 'browse-everything', '~> 0.13.0'
 gem 'fastimage'
 gem 'media_element_add_to_playlist', git: 'https://github.com/avalonmediasystem/media-element-add-to-playlist.git', tag: 'avalon-r6.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index a676df3baa..257b7a2e3c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -202,8 +202,8 @@ GEM
     api-pagination (4.8.2)
     arel (9.0.0)
     ast (2.4.0)
-    audio_waveform-ruby (1.0.4)
-      json (~> 2.1.0)
+    audio_waveform-ruby (1.0.7)
+      json (~> 2.3)
     autoprefixer-rails (9.5.1.1)
       execjs
     aws-eventstream (1.0.3)
@@ -483,7 +483,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.1.0)
+    json (2.3.0)
     json-ld (3.0.2)
       multi_json (~> 1.12)
       rdf (>= 2.2.8, < 4.0)
@@ -913,7 +913,7 @@ DEPENDENCIES
   activerecord-session_store
   acts_as_list
   api-pagination
-  audio_waveform-ruby
+  audio_waveform-ruby (~> 1.0.7)
   avalon-about!
   avalon-workflow!
   aws-sdk (~> 2.0)

From e8154c4a75b76837966bfa06f5f9264d33aed093 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Thu, 30 Apr 2020 12:41:34 -0400
Subject: [PATCH 27/61] Add tests for SpeedyAF MasterFile Proxy; fix
 #encoder_class

---
 app/presenters/speedy_af/proxy/master_file.rb |  6 +-
 .../speedy_af/proxy/master_file_spec.rb       | 97 +++++++++++++++++++
 2 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 spec/presenters/speedy_af/proxy/master_file_spec.rb

diff --git a/app/presenters/speedy_af/proxy/master_file.rb b/app/presenters/speedy_af/proxy/master_file.rb
index c959db38c7..1d1259b11f 100644
--- a/app/presenters/speedy_af/proxy/master_file.rb
+++ b/app/presenters/speedy_af/proxy/master_file.rb
@@ -14,7 +14,11 @@
 
 class SpeedyAF::Proxy::MasterFile < SpeedyAF::Base
   def encoder_class
-    find_encoder_class(encoder_classname) || find_encoder_class(workflow_name.to_s.classify) || find_encoder_class((Settings.encoding.engine_adapter + "_encode").classify) || MasterFile.default_encoder_class || WatchedEncode
+    find_encoder_class(encoder_classname) ||
+      find_encoder_class("#{workflow_name}_encode".classify) ||
+      find_encoder_class((Settings.encoding.engine_adapter + "_encode").classify) ||
+      MasterFile.default_encoder_class ||
+      WatchedEncode
   end
 
   def find_encoder_class(klass_name)
diff --git a/spec/presenters/speedy_af/proxy/master_file_spec.rb b/spec/presenters/speedy_af/proxy/master_file_spec.rb
new file mode 100644
index 0000000000..033c1595bf
--- /dev/null
+++ b/spec/presenters/speedy_af/proxy/master_file_spec.rb
@@ -0,0 +1,97 @@
+# Copyright 2011-2020, 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'
+
+describe SpeedyAF::Proxy::MasterFile do
+  let(:master_file) { FactoryBot.create(:master_file) }
+  subject(:presenter) { described_class.find(master_file.id) }
+
+  describe "#encoder_class" do
+      before :all do
+        class WorkflowEncode < ActiveEncode::Base
+        end
+
+        module EncoderModule
+          class MyEncoder < ActiveEncode::Base
+          end
+        end
+      end
+
+      after :all do
+        EncoderModule.send(:remove_const, :MyEncoder)
+        Object.send(:remove_const, :EncoderModule)
+        Object.send(:remove_const, :WorkflowEncode)
+      end
+
+      before do
+        stub_const("MasterFile::WORKFLOWS", ['fullaudio', 'avalon', 'pass_through', 'avalon-skip-transcoding', 'avalon-skip-transcoding-audio', 'workflow', 'nonexistent_workflow_encoder'])
+      end
+
+      it "should default to WatchedEncode" do
+        expect(subject.encoder_class).to eq(WatchedEncode)
+      end
+
+      context 'with workflow name' do
+        let(:master_file) { FactoryBot.create(:master_file, workflow_name: 'workflow') }
+        it "should infer the class from a workflow name" do
+          expect(subject.encoder_class).to eq(WorkflowEncode)
+        end
+      end
+
+      context 'with bad workflow name' do
+        let(:master_file) { FactoryBot.create(:master_file, workflow_name: 'nonexistent_workflow_encoder') }
+        it "should fall back to Watched when a workflow class can't be resolved" do
+          expect(subject.encoder_class).to eq(WatchedEncode)
+        end
+      end
+
+      context 'with encoder class name' do
+        let(:master_file) { FactoryBot.create(:master_file, encoder_classname: 'EncoderModule::MyEncoder') }
+        it "should resolve an explicitly named encoder class" do
+          expect(subject.encoder_class).to eq(EncoderModule::MyEncoder)
+        end
+      end
+
+      context 'with bad encoder class name' do
+        let(:master_file) { FactoryBot.create(:master_file, encoder_classname: 'EncoderModule::NonexistentEncoder') }
+        it "should fall back to WatchedEncode when an encoder class can't be resolved" do
+          expect(subject.encoder_class).to eq(WatchedEncode)
+        end
+      end
+
+      context 'with bad encoder class name' do
+        let(:master_file) { FactoryBot.create(:master_file, encoder_class: EncoderModule::MyEncoder) }
+        it "should correctly set the encoder classname from the encoder" do
+          expect(subject.encoder_classname).to eq('EncoderModule::MyEncoder')
+        end
+      end
+
+      context 'with an encoder class named after the engine adapter' do
+        before :all do
+          class TestEncode < ActiveEncode::Base
+          end
+        end
+    
+        after :all do
+          Object.send(:remove_const, :TestEncode)
+        end
+    
+        it "should find the encoder class" do
+          expect(Settings.encoding.engine_adapter).to eq "test"
+          expect(subject.encoder_class).to eq(TestEncode)
+        end
+      end
+  end
+end

From 0b3d093d6201b002600449cb64b07d885be160e3 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Fri, 1 May 2020 10:27:56 -0400
Subject: [PATCH 28/61] Fix replay

Replay complete testing and reset to pending both used a different means of making the payload than registering a new entry.
---
 lib/avalon/batch/ingest.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/avalon/batch/ingest.rb b/lib/avalon/batch/ingest.rb
index 3a07463691..9edce8fbc2 100644
--- a/lib/avalon/batch/ingest.rb
+++ b/lib/avalon/batch/ingest.rb
@@ -104,7 +104,7 @@ def replay_entry(entry, position)
         previous_entry = @previous_entries[position - 1]
         # Case 0, determine if we even have an updated at all
         # If the payload is the same it means no change and complete true means the migration ran
-        return nil if previous_entry.payload == entry.fields.to_json && previous_entry.complete
+        return nil if previous_entry.payload == entry.to_json && previous_entry.complete
 
         # Case 1, if there is a payload change and the item never completed, reset to pending
         # Also reset to pending if there is an error
@@ -129,7 +129,7 @@ def replay_entry(entry, position)
       # @param [BatchEntries] the previous batch entry to reset_to_pending
       # @return [BatchEntries] the reset entrt
       def reset_to_pending(previous_entry, entry)
-        previous_entry.payload = entry.fields.to_json
+        previous_entry.payload = entry.to_json
         previous_entry.error = false
         previous_entry.error_message = false
         previous_entry.complete = false

From 1bf876cf6ab392817b03184e260455b98e1da590 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Fri, 1 May 2020 10:39:13 -0400
Subject: [PATCH 29/61] Don't error the batch process when media object isn't
 found.

---
 lib/avalon/batch/ingest.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/avalon/batch/ingest.rb b/lib/avalon/batch/ingest.rb
index 9edce8fbc2..64d932572a 100644
--- a/lib/avalon/batch/ingest.rb
+++ b/lib/avalon/batch/ingest.rb
@@ -112,7 +112,7 @@ def replay_entry(entry, position)
 
         # Case 2, if there is a published media object we cannot replay
         unless previous_entry.media_object_pid.nil?
-          mo = MediaObject.find(previous_entry.media_object_pid)
+          mo = MediaObject.find(previous_entry.media_object_pid) rescue nil
           unless mo.nil? # meaning the media_object has been deleted since last time this ran
             if mo.published?
               published_error(previous_entry)

From 5af019760ab2019390eeccaad7a6efdb3e98089d Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Fri, 1 May 2020 10:47:11 -0400
Subject: [PATCH 30/61] Only give published error when item has been published

---
 app/jobs/ingest_batch_entry_job.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/jobs/ingest_batch_entry_job.rb b/app/jobs/ingest_batch_entry_job.rb
index 074a5b0450..0c87da42c5 100644
--- a/app/jobs/ingest_batch_entry_job.rb
+++ b/app/jobs/ingest_batch_entry_job.rb
@@ -19,8 +19,11 @@ class IngestBatchEntryJob < ActiveJob::Base
   def perform(batch_entry)
     # Validation checking that it is okay to ingest this batch entry
     if batch_entry.media_object_pid.present? && MediaObject.exists?(batch_entry.media_object_pid)
-      published_error(batch_entry)
-      return
+      mo = MediaObject.find(batch_entry.media_object_pid)
+      if mo.published?
+        published_error(batch_entry)
+        return
+      end
     end
 
 

From bb91f7039fe6e1721cfc8b051a48aed47d19bab9 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Fri, 1 May 2020 14:52:28 -0400
Subject: [PATCH 31/61] Add test; rename test file; switch rescue to guard
 clause

---
 lib/avalon/batch/ingest.rb                     |  2 +-
 spec/factories/batch_entries.rb                |  2 +-
 ...y_job.rb => ingest_batch_entry_job_spec.rb} | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)
 rename spec/jobs/{ingest_batch_entry_job.rb => ingest_batch_entry_job_spec.rb} (53%)

diff --git a/lib/avalon/batch/ingest.rb b/lib/avalon/batch/ingest.rb
index 64d932572a..27a0fd5e54 100644
--- a/lib/avalon/batch/ingest.rb
+++ b/lib/avalon/batch/ingest.rb
@@ -112,7 +112,7 @@ def replay_entry(entry, position)
 
         # Case 2, if there is a published media object we cannot replay
         unless previous_entry.media_object_pid.nil?
-          mo = MediaObject.find(previous_entry.media_object_pid) rescue nil
+          mo = MediaObject.find(previous_entry.media_object_pid) if MediaObject.exists?(previous_entry.media_object_pid)
           unless mo.nil? # meaning the media_object has been deleted since last time this ran
             if mo.published?
               published_error(previous_entry)
diff --git a/spec/factories/batch_entries.rb b/spec/factories/batch_entries.rb
index 654efb9237..531aa3b0ae 100644
--- a/spec/factories/batch_entries.rb
+++ b/spec/factories/batch_entries.rb
@@ -20,6 +20,6 @@
     current_status { 'registered' }
     error_message {}
     media_object_pid { 'kfd39dnw' }
-    payload { "{\"publish\":false,\"hidden\":false,\"fields\":{\"title\":[\"Dolorum\"],\"creator\":[\"Carroll, Nora\"],\"date_issued\":[\"2012\"],\"other_identifier\":[\"ABC123\"],\"other_identifier_type\":[\"local\"],\"related_item_url\":[\"http://www.example.com/text.pdf\"],\"related_item_label\":[\"Example Item PDF\"],\"rights_statement\":[\"http://rightsstatements.org/vocab/InC/1.0/\"],\"terms_of_use\":[\"Terms of Use Language\"],\"language\":[\"English\"],\"physical_description\":[\"16mm Reel\"],\"note\":[\"This is a test general note\"],\"note_type\":[\"general\"],\"abstract\":[\"Test abstract\"],\"statement_of_responsibility\":[\"Test Statement of Responsibility\"]},\"files\":[{\"file\":\"spec/fixtures/jazz-performance.mp3\",\"offset\":\"00:00:00.500\",\"label\":\"Quis quo\",\"date_digitized\":\"2015-10-30\"}],\"position\":3,\"user_key\":\"frances.dickens@reichel.com\",\"collection\":\"zc77sq08x\"}" }
+    payload { "{\"publish\":false,\"hidden\":false,\"fields\":{\"title\":[\"Dolorum\"],\"creator\":[\"Carroll, Nora\"],\"date_issued\":[\"2012\"],\"other_identifier\":[\"ABC123\"],\"other_identifier_type\":[\"local\"],\"related_item_url\":[\"http://www.example.com/text.pdf\"],\"related_item_label\":[\"Example Item PDF\"],\"rights_statement\":[\"http://rightsstatements.org/vocab/InC/1.0/\"],\"terms_of_use\":[\"Terms of Use Language\"],\"language\":[\"English\"],\"physical_description\":[\"16mm Reel\"],\"note\":[\"This is a test general note\"],\"note_type\":[\"general\"],\"abstract\":[\"Test abstract\"],\"statement_of_responsibility\":[\"Test Statement of Responsibility\"]},\"files\":[{\"file\":\"spec/fixtures/jazz-performance.mp3\",\"offset\":\"00:00:00.500\",\"label\":\"Quis quo\",\"date_digitized\":\"2015-10-30\"}],\"position\":3,\"user_key\":\"frances.dickens@reichel.com\",\"collection\":\"#{batch_registries.collection}\"}" }
   end
 end
diff --git a/spec/jobs/ingest_batch_entry_job.rb b/spec/jobs/ingest_batch_entry_job_spec.rb
similarity index 53%
rename from spec/jobs/ingest_batch_entry_job.rb
rename to spec/jobs/ingest_batch_entry_job_spec.rb
index 2091bd91b9..ad8c651055 100644
--- a/spec/jobs/ingest_batch_entry_job.rb
+++ b/spec/jobs/ingest_batch_entry_job_spec.rb
@@ -15,12 +15,26 @@
 require 'rails_helper'
 
 describe IngestBatchEntryJob do
-  let(:batch_entry) { FactoryBot.create(:batch_entries) }
-  let!(:collection) { FactoryBot.create(:collection, id: 'zc77sq08x') }
+  let(:collection) { FactoryBot.create(:collection) }
+  let(:batch_registry) { FactoryBot.create(:batch_registries, collection: collection.id) }
+  let(:batch_entry) { FactoryBot.create(:batch_entries, batch_registries: batch_registry) }
 
   describe "perform" do
     it 'runs' do
       expect { described_class.perform_now(batch_entry) }.to change { MediaObject.count }.by(1)
     end
+
+    context 'when media object exists and is published' do
+      let(:published_media_object) { FactoryBot.build(:published_media_object) }
+
+      before do
+        allow(MediaObject).to receive(:exists?).with(batch_entry.media_object_pid).and_return(true)
+        allow(MediaObject).to receive(:find).with(batch_entry.media_object_pid).and_return(published_media_object)
+      end
+
+      it 'sets an error state' do
+        expect { described_class.perform_now(batch_entry) }.to change { batch_entry.error }.from(false).to(true)
+      end
+    end
   end
 end

From 5863a4e66e4b413e1a9bbcbdae822bb3d5d5aca2 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Mon, 4 May 2020 11:41:23 -0400
Subject: [PATCH 32/61] Remove guard clause since it isn't related to this
 bugfix

---
 lib/avalon/batch/ingest.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/avalon/batch/ingest.rb b/lib/avalon/batch/ingest.rb
index 27a0fd5e54..9edce8fbc2 100644
--- a/lib/avalon/batch/ingest.rb
+++ b/lib/avalon/batch/ingest.rb
@@ -112,7 +112,7 @@ def replay_entry(entry, position)
 
         # Case 2, if there is a published media object we cannot replay
         unless previous_entry.media_object_pid.nil?
-          mo = MediaObject.find(previous_entry.media_object_pid) if MediaObject.exists?(previous_entry.media_object_pid)
+          mo = MediaObject.find(previous_entry.media_object_pid)
           unless mo.nil? # meaning the media_object has been deleted since last time this ran
             if mo.published?
               published_error(previous_entry)

From ddfa8c69d32edd7df88e03fb463235fdbdd3ff81 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 5 May 2020 14:11:09 -0400
Subject: [PATCH 33/61] Use standard rdf predicates; make website label
 optional

---
 app/models/admin/collection.rb             | 4 ++--
 app/models/avalon/rdf_vocab.rb             | 2 --
 app/views/admin/collections/_form.html.erb | 4 ++--
 app/views/admin/collections/show.html.erb  | 3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/models/admin/collection.rb b/app/models/admin/collection.rb
index 9287695d0d..37a4ece7a3 100644
--- a/app/models/admin/collection.rb
+++ b/app/models/admin/collection.rb
@@ -40,13 +40,13 @@ class Admin::Collection < ActiveFedora::Base
   property :description, predicate: ::RDF::Vocab::DC.description, multiple: false do |index|
     index.as :stored_searchable
   end
-  property :contact_email, predicate: Avalon::RDFVocab::Collection.contact_email, multiple: false do |index|
+  property :contact_email, predicate: ::RDF::Vocab::SCHEMA.email, multiple: false do |index|
     index.as :stored_sortable
   end
   property :website_label, predicate: Avalon::RDFVocab::Collection.website_label, multiple: false do |index|
     index.as :stored_sortable
   end
-  property :website_url, predicate: Avalon::RDFVocab::Collection.website_url, multiple: false do |index|
+  property :website_url, predicate: ::RDF::Vocab::SCHEMA.url, multiple: false do |index|
     index.as :stored_sortable
   end
   property :dropbox_directory_name, predicate: Avalon::RDFVocab::Collection.dropbox_directory_name, multiple: false do |index|
diff --git a/app/models/avalon/rdf_vocab.rb b/app/models/avalon/rdf_vocab.rb
index 8fd95c8957..3a092e4c6e 100644
--- a/app/models/avalon/rdf_vocab.rb
+++ b/app/models/avalon/rdf_vocab.rb
@@ -56,9 +56,7 @@ class MediaObject < RDF::StrictVocabulary("http://avalonmediasystem.org/rdf/voca
     end
 
     class Collection < RDF::StrictVocabulary("http://avalonmediasystem.org/rdf/vocab/collection#")
-      property :contact_email,            "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :website_label,            "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
-      property :website_url,              "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :dropbox_directory_name,   "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :default_read_users,       "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
       property :default_read_groups,      "rdfs:isDefinedBy" => %(avr-collection:).freeze, type: "rdfs:Class".freeze
diff --git a/app/views/admin/collections/_form.html.erb b/app/views/admin/collections/_form.html.erb
index 21cd8a302f..b481eb4328 100644
--- a/app/views/admin/collections/_form.html.erb
+++ b/app/views/admin/collections/_form.html.erb
@@ -29,9 +29,9 @@ Unless required by applicable law or agreed to in writing, software distributed
         <%= f.select(:unit, Admin::Collection.units) %>
         <% end %>
         <%= f.text_area :description, rows: 3  %>
-        <%= f.email_field :contact_email %>
+        <%= f.text_field :contact_email %>
+        <%= f.text_field :website_url %>
         <%= f.text_field :website_label %>
-        <%= f.url_field :website_url %>
       </div>
       <div class="modal-footer">
         <a href="#" data-dismiss="modal" aria-hidden="true" class="btn btn-default">Cancel</a>
diff --git a/app/views/admin/collections/show.html.erb b/app/views/admin/collections/show.html.erb
index 95cbf49342..efb9c1461e 100644
--- a/app/views/admin/collections/show.html.erb
+++ b/app/views/admin/collections/show.html.erb
@@ -51,7 +51,8 @@ Unless required by applicable law or agreed to in writing, software distributed
       <% end %>
       <% if @collection.website_url.present? %>
         <p><strong>Website:</strong></p>
-        <p><%= link_to(@collection.website_label, @collection.website_url)%></p>
+        <% website_label = @collection.website_label.present? ? @collection.website_label : @collection.website_url %>
+        <p><%= link_to(website_label, @collection.website_url)%></p>
       <% end %>
     </div>
     <div class="col-md-3">

From c0e32ef5665138fdd740b2e5a4f49c8ad80d01d2 Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Wed, 6 May 2020 13:33:10 -0400
Subject: [PATCH 34/61] Add webpacker compile to production stage in Dockerfile

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cca6c8a162..b43967975b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,8 +104,9 @@ COPY        --from=node-modules --chown=app:app /node_modules ./node_modules
 USER        app
 ENV         RAILS_ENV=production
 
-RUN         bundle exec rake assets:precompile SECRET_KEY_BASE=$(ruby -r 'securerandom' -e 'puts SecureRandom.hex(64)') \
-         && cp config/controlled_vocabulary.yml.example config/controlled_vocabulary.yml
+RUN         SECRET_KEY_BASE=$(ruby -r 'securerandom' -e 'puts SecureRandom.hex(64)') bundle exec rake webpacker:compile
+RUN         SECRET_KEY_BASE=$(ruby -r 'securerandom' -e 'puts SecureRandom.hex(64)') bundle exec rake assets:precompile
+RUN         cp config/controlled_vocabulary.yml.example config/controlled_vocabulary.yml
 
 
 # Build production image

From 938bf559f4d5df14f1bf3d24cee7312c8cb3b8a6 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Thu, 7 May 2020 11:46:42 -0400
Subject: [PATCH 35/61] New SME build with fix for flashing warning on load

---
 yarn.lock | 59 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c67f9277f0..885cb72b30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -663,9 +663,9 @@
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
 "@babel/runtime-corejs2@^7.0.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.9.2.tgz#f11d074ff99b9b4319b5ecf0501f12202bf2bf4d"
-  integrity sha512-ayjSOxuK2GaSDJFCtLgHnYjuMyIpViNujWrZo8GUpN60/n7juzJKK5yOo6RFVb0zdU9ACJFK+MsZrUnj3OmXMw==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.9.6.tgz#acd5d6351384cc2828dc211aa5426a90476bf4a8"
+  integrity sha512-TcdM3xc7weMrwTawuG3BTjtVE3mQLXUPQ9CxTbSKOrhn3QAcqCJ2fz+IIv25wztzUnhNZat7hr655YJa61F3zg==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
@@ -678,9 +678,9 @@
     regenerator-runtime "^0.13.2"
 
 "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
-  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
+  version "7.9.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
+  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -790,15 +790,15 @@
     "@babel/runtime" "^7.2.0"
 
 "@material-ui/styles@^4.2.0":
-  version "4.9.10"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.10.tgz#182ccdd0bc8525a459486499bbaebcd92b0db3ab"
-  integrity sha512-EXIXlqVyFDnjXF6tj72y6ZxiSy+mHtrsCo3Srkm3XUeu3Z01aftDBy7ZSr3TQ02gXHTvDSBvegp3Le6p/tl7eA==
+  version "4.9.13"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz#08b3976bdd21c38bc076693d95834f97539f3b15"
+  integrity sha512-lWlXJanBdHQ18jW/yphedRokHcvZD1GdGzUF/wQxKDsHwDDfO45ZkAxuSBI202dG+r1Ph483Z3pFykO2obeSRA==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/hash" "^0.8.0"
     "@material-ui/types" "^5.0.1"
     "@material-ui/utils" "^4.9.6"
-    clsx "^1.0.2"
+    clsx "^1.0.4"
     csstype "^2.5.2"
     hoist-non-react-statics "^3.3.2"
     jss "^10.0.3"
@@ -812,9 +812,9 @@
     prop-types "^15.7.2"
 
 "@material-ui/system@^4.3.0":
-  version "4.9.10"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.10.tgz#5de6ec7bea0f222b10b45e5bd5bb8b9a7b938926"
-  integrity sha512-E+t0baX2TBZk6ALm8twG6objpsxLdMM4MDm1++LMt2m7CetCAEc3aIAfDaprk4+tm5hFT1Cah5dRWk8EeIFQYw==
+  version "4.9.13"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz#adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"
+  integrity sha512-6AlpvdW6KJJ5bF1Xo2OD13sCN8k+nlL36412/bWnWZOKIfIMo/Lb8c8d1DOIaT/RKWxTEUaWnKZjabVnA3eZjA==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@material-ui/utils" "^4.9.6"
@@ -1838,7 +1838,7 @@ clone-deep@^2.0.1:
     kind-of "^6.0.0"
     shallow-clone "^1.0.0"
 
-clsx@^1.0.2:
+clsx@^1.0.2, clsx@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz#62937c6adfea771247c34b54d320fb99624f5702"
   integrity sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA==
@@ -2840,6 +2840,11 @@ eventemitter3@3.1.0, eventemitter3@^3.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
   integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
+eventemitter3@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
 events@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
@@ -3442,12 +3447,12 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-hls.js@0.12.3-canary.4258:
-  version "0.12.3-canary.4258"
-  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.12.3-canary.4258.tgz#9ef7e89a85609222497512b9baed806712246901"
-  integrity sha512-uSNt4fDVNb5rMpgMGjFvVaIqWwwRnIFiCrTY2zHCIQbaKgw8DOhA3QC5ImYdv8nXiZod5LS69dYxjnj/u8+3nw==
+hls.js@^0.13.3-canary.5556:
+  version "0.13.3-canary.5556"
+  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.3-canary.5556.tgz#061dc478ff9472c68c1c9c421c9b7cfa696169d6"
+  integrity sha512-7lzGB3Q0PSySlahRjF2imhoO9F0NvCCaTwpeEeSam8hFTVmC+STKwcqj+K5+C79hPJJXVwPICLHAtDdpG4IYDw==
   dependencies:
-    eventemitter3 "3.1.0"
+    eventemitter3 "4.0.0"
     url-toolkit "^2.1.6"
 
 "hls.js@https://github.com/avalonmediasystem/hls.js#stricter_ts_probing":
@@ -4276,9 +4281,9 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 konva@~5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/konva/-/konva-5.0.2.tgz#1b54228b40c92672fbfdfafdc6e4fb9c2da675cd"
-  integrity sha512-AvbPl+7QYX21JLCFw45OApPBqeVkuMQVrloMIpcgG8QFfMm24BtYMF0LO0sS43A3/90GL4iRMHKlkHlPBBDYtw==
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/konva/-/konva-5.0.3.tgz#a6ff4da2dfdcd36c33459255c5b7d9fe3e908898"
+  integrity sha512-OF5nWlVapUleqEW+0Bn1xNMMydFpPyo4aKS4UmHX2tt6Qvk+5e0PrkhwcM0htL/M+M+RObCnm8IYCTrsT3bNKw==
 
 last-call-webpack-plugin@^3.0.0:
   version "3.0.0"
@@ -6377,7 +6382,7 @@ react-redux@^6.0.0:
 
 "react-structural-metadata-editor@https://github.com/avalonmediasystem/react-structural-metadata-editor":
   version "1.1.0"
-  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#d1c9e58caf0ef6bd521786477e20e18a8313fa11"
+  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#59fbd62fa2d3c14e231124871a537025dde18639"
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@fortawesome/fontawesome-svg-core" "^1.2.4"
@@ -6387,7 +6392,7 @@ react-redux@^6.0.0:
     "@material-ui/icons" "4.2.1"
     axios "^0.19.0"
     base-64 "^0.1.0"
-    hls.js "0.12.3-canary.4258"
+    hls.js "^0.13.3-canary.5556"
     lodash "4.17.13"
     peaks.js "^0.20.0"
     prop-types "^15.6.2"
@@ -6423,9 +6428,9 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.1, react-transition-g
     react-lifecycles-compat "^3.0.4"
 
 react-transition-group@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
-  integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
+  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"

From cf9cf72715f9a8e01ac47044470ca1cd8b61a09a Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Thu, 7 May 2020 14:10:56 -0400
Subject: [PATCH 36/61] Simplify by using #presence

---
 app/views/admin/collections/show.html.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/admin/collections/show.html.erb b/app/views/admin/collections/show.html.erb
index efb9c1461e..638307c495 100644
--- a/app/views/admin/collections/show.html.erb
+++ b/app/views/admin/collections/show.html.erb
@@ -51,8 +51,7 @@ Unless required by applicable law or agreed to in writing, software distributed
       <% end %>
       <% if @collection.website_url.present? %>
         <p><strong>Website:</strong></p>
-        <% website_label = @collection.website_label.present? ? @collection.website_label : @collection.website_url %>
-        <p><%= link_to(website_label, @collection.website_url)%></p>
+        <p><%= link_to(@collection.website_label.presence || @collection.website_url, @collection.website_url)%></p>
       <% end %>
     </div>
     <div class="col-md-3">

From 62710414745c876f4d44402d035c0c038d1cc138 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 12 May 2020 16:19:01 -0400
Subject: [PATCH 37/61] Use Object#const_get instead of
 ActiveEncode::Base.descendants to get encoder class to avoid issue of
 #descendants iterating over all instatiated objects and possibly returning
 classes that are not longer declared as constants.  This is probably an
 edge-case which only affects tests but this new approach may also be faster.

Also declare classes as anonymous classes and stub constants within
test.
---
 app/models/master_file.rb                     |  4 ++-
 app/presenters/speedy_af/proxy/master_file.rb |  4 ++-
 spec/models/master_file_spec.rb               | 31 +++-------------
 .../speedy_af/proxy/master_file_spec.rb       | 36 ++++---------------
 4 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/app/models/master_file.rb b/app/models/master_file.rb
index 1d194ab93e..762ee356ee 100644
--- a/app/models/master_file.rb
+++ b/app/models/master_file.rb
@@ -725,7 +725,9 @@ def update_ingest_batch
   end
 
   def find_encoder_class(klass_name)
-    ActiveEncode::Base.descendants.find { |c| c.name == klass_name }
+    return nil if klass_name.blank? || !Object.const_defined?(klass_name)
+    klass = Object.const_get(klass_name)
+    return klass if klass.ancestors.include?(ActiveEncode::Base)
   end
 
   def stop_processing!
diff --git a/app/presenters/speedy_af/proxy/master_file.rb b/app/presenters/speedy_af/proxy/master_file.rb
index 1d1259b11f..b5ef78cb2e 100644
--- a/app/presenters/speedy_af/proxy/master_file.rb
+++ b/app/presenters/speedy_af/proxy/master_file.rb
@@ -22,7 +22,9 @@ def encoder_class
   end
 
   def find_encoder_class(klass_name)
-    ActiveEncode::Base.descendants.find { |c| c.name == klass_name }
+    return nil if klass_name.blank? || !Object.const_defined?(klass_name)
+    klass = Object.const_get(klass_name)
+    return klass if klass.ancestors.include?(ActiveEncode::Base)
   end
 
   def display_title
diff --git a/spec/models/master_file_spec.rb b/spec/models/master_file_spec.rb
index c07e0e60b0..397e13fbbc 100644
--- a/spec/models/master_file_spec.rb
+++ b/spec/models/master_file_spec.rb
@@ -322,29 +322,14 @@
   end
 
   describe "#encoder_class" do
-    subject { FactoryBot.create(:master_file) }
-
-    before :all do
-      class WorkflowEncode < ActiveEncode::Base
-      end
-
-      module EncoderModule
-        class MyEncoder < ActiveEncode::Base
-        end
-      end
-    end
-
-    after :all do
-      EncoderModule.send(:remove_const, :MyEncoder)
-      Object.send(:remove_const, :EncoderModule)
-      Object.send(:remove_const, :WorkflowEncode)
-    end
+    subject { FactoryBot.build(:master_file) }
 
     it "should default to WatchedEncode" do
       expect(subject.encoder_class).to eq(WatchedEncode)
     end
 
     it "should infer the class from a workflow name" do
+      stub_const("WorkflowEncode", Class.new(ActiveEncode::Base))
       subject.workflow_name = 'workflow'
       expect(subject.encoder_class).to eq(WorkflowEncode)
     end
@@ -355,6 +340,7 @@ class MyEncoder < ActiveEncode::Base
     end
 
     it "should resolve an explicitly named encoder class" do
+      stub_const("EncoderModule::MyEncoder", Class.new(ActiveEncode::Base))
       subject.encoder_classname = 'EncoderModule::MyEncoder'
       expect(subject.encoder_class).to eq(EncoderModule::MyEncoder)
     end
@@ -365,6 +351,7 @@ class MyEncoder < ActiveEncode::Base
     end
 
     it "should correctly set the encoder classname from the encoder" do
+      stub_const("EncoderModule::MyEncoder", Class.new(ActiveEncode::Base))
       subject.encoder_class = EncoderModule::MyEncoder
       expect(subject.encoder_classname).to eq('EncoderModule::MyEncoder')
     end
@@ -374,16 +361,8 @@ class MyEncoder < ActiveEncode::Base
     end
 
     context 'with an encoder class named after the engine adapter' do
-      before :all do
-        class TestEncode < ActiveEncode::Base
-        end
-      end
-  
-      after :all do
-        Object.send(:remove_const, :TestEncode)
-      end
-  
       it "should find the encoder class" do
+        stub_const("TestEncode", Class.new(ActiveEncode::Base))
         expect(Settings.encoding.engine_adapter).to eq "test"
         expect(subject.encoder_class).to eq(TestEncode)
       end
diff --git a/spec/presenters/speedy_af/proxy/master_file_spec.rb b/spec/presenters/speedy_af/proxy/master_file_spec.rb
index 033c1595bf..8826d456dc 100644
--- a/spec/presenters/speedy_af/proxy/master_file_spec.rb
+++ b/spec/presenters/speedy_af/proxy/master_file_spec.rb
@@ -19,33 +19,16 @@
   subject(:presenter) { described_class.find(master_file.id) }
 
   describe "#encoder_class" do
-      before :all do
-        class WorkflowEncode < ActiveEncode::Base
-        end
-
-        module EncoderModule
-          class MyEncoder < ActiveEncode::Base
-          end
-        end
-      end
-
-      after :all do
-        EncoderModule.send(:remove_const, :MyEncoder)
-        Object.send(:remove_const, :EncoderModule)
-        Object.send(:remove_const, :WorkflowEncode)
-      end
-
-      before do
-        stub_const("MasterFile::WORKFLOWS", ['fullaudio', 'avalon', 'pass_through', 'avalon-skip-transcoding', 'avalon-skip-transcoding-audio', 'workflow', 'nonexistent_workflow_encoder'])
-      end
-
       it "should default to WatchedEncode" do
         expect(subject.encoder_class).to eq(WatchedEncode)
       end
 
       context 'with workflow name' do
         let(:master_file) { FactoryBot.create(:master_file, workflow_name: 'workflow') }
+
         it "should infer the class from a workflow name" do
+          stub_const("MasterFile::WORKFLOWS", ['workflow'])
+          stub_const("WorkflowEncode", Class.new(ActiveEncode::Base))
           expect(subject.encoder_class).to eq(WorkflowEncode)
         end
       end
@@ -53,6 +36,7 @@ class MyEncoder < ActiveEncode::Base
       context 'with bad workflow name' do
         let(:master_file) { FactoryBot.create(:master_file, workflow_name: 'nonexistent_workflow_encoder') }
         it "should fall back to Watched when a workflow class can't be resolved" do
+          stub_const("MasterFile::WORKFLOWS", ['nonexistent_workflow_encoder'])
           expect(subject.encoder_class).to eq(WatchedEncode)
         end
       end
@@ -60,6 +44,7 @@ class MyEncoder < ActiveEncode::Base
       context 'with encoder class name' do
         let(:master_file) { FactoryBot.create(:master_file, encoder_classname: 'EncoderModule::MyEncoder') }
         it "should resolve an explicitly named encoder class" do
+          stub_const("EncoderModule::MyEncoder", Class.new(ActiveEncode::Base))
           expect(subject.encoder_class).to eq(EncoderModule::MyEncoder)
         end
       end
@@ -74,21 +59,14 @@ class MyEncoder < ActiveEncode::Base
       context 'with bad encoder class name' do
         let(:master_file) { FactoryBot.create(:master_file, encoder_class: EncoderModule::MyEncoder) }
         it "should correctly set the encoder classname from the encoder" do
+          stub_const("EncoderModule::MyEncoder", Class.new(ActiveEncode::Base))
           expect(subject.encoder_classname).to eq('EncoderModule::MyEncoder')
         end
       end
 
       context 'with an encoder class named after the engine adapter' do
-        before :all do
-          class TestEncode < ActiveEncode::Base
-          end
-        end
-    
-        after :all do
-          Object.send(:remove_const, :TestEncode)
-        end
-    
         it "should find the encoder class" do
+          stub_const("TestEncode", Class.new(ActiveEncode::Base))
           expect(Settings.encoding.engine_adapter).to eq "test"
           expect(subject.encoder_class).to eq(TestEncode)
         end

From a0e9d55b4c263e556efad97df46b145510ebc0bc Mon Sep 17 00:00:00 2001
From: Phil Dinh <phuongdh@gmail.com>
Date: Thu, 14 May 2020 16:25:16 -0400
Subject: [PATCH 38/61] Increase default DB pool setting for prod

So sidekiq can run multiple jobs in parallel.
---
 config/database.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/database.yml b/config/database.yml
index 1ac246c8fe..d2e70a7f1f 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,7 +6,7 @@
 #
 default: &default
   adapter: sqlite3
-  pool: 5
+  pool: 10
   timeout: 10000
 
 development:
@@ -18,8 +18,10 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
+  pool: 20
   database: db/test.sqlite3
 
 production:
   <<: *default
+  pool: 20
   database: db/production.sqlite3

From 25bed8493531d14722ebe3d5c2ad0e625a196d76 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Mon, 18 May 2020 10:42:45 -0400
Subject: [PATCH 39/61] Add probe service for UV support

As noted as needed in https://github.com/avalonmediasystem/avalon/issues/4081#issuecomment-625469328
---
 app/models/iiif_canvas_presenter.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/iiif_canvas_presenter.rb b/app/models/iiif_canvas_presenter.rb
index 61c4d6d15d..d77ae9e467 100644
--- a/app/models/iiif_canvas_presenter.rb
+++ b/app/models/iiif_canvas_presenter.rb
@@ -149,6 +149,11 @@ def auth_service
         "label": I18n.t('iiif.auth.label'),
         "profile": "http://iiif.io/api/auth/1/login",
         "service": [
+          {
+            "@id": Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: 'auto'),
+            "@type": "AuthProbeService1",
+            "profile": "http://iiif.io/api/auth/1/probe"
+          },
           {
             "@id": Rails.application.routes.url_helpers.iiif_auth_token_url(id: master_file.id),
             "@type": "AuthTokenService1",

From 9ce7e997c6f9429b0379788a0d2c4f3d3add5df2 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Mon, 18 May 2020 12:43:46 -0400
Subject: [PATCH 40/61] Upgrade to rails 5.2.4.3 for security patches

---
 Gemfile      |  2 +-
 Gemfile.lock | 76 ++++++++++++++++++++++++++--------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Gemfile b/Gemfile
index ce43ead1a6..75e8a901be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=5.2.4.2'
+gem 'rails', '=5.2.4.3'
 gem 'sprockets', '~>3.7.2'
 gem 'sqlite3'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 257b7a2e3c..5c2e1fa76c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,25 +112,25 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.2)
-      actionpack (= 5.2.4.2)
+    actioncable (5.2.4.3)
+      actionpack (= 5.2.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
+    actionmailer (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.2)
-      actionview (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionpack (5.2.4.3)
+      actionview (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionview (5.2.4.3)
+      activesupport (= 5.2.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -165,18 +165,18 @@ GEM
       nom-xml (>= 0.5.1)
       om (~> 3.1)
       rdf-rdfxml (~> 2.0)
-    activejob (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activejob (5.2.4.3)
+      activesupport (= 5.2.4.3)
       globalid (>= 0.3.6)
     activejob-traffic_control (0.1.3)
       activejob (>= 4.2)
       activesupport (>= 4.2)
       suo
-    activemodel (5.2.4.2)
-      activesupport (= 5.2.4.2)
-    activerecord (5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       arel (>= 9.0)
     activerecord-session_store (1.1.3)
       actionpack (>= 4.0)
@@ -184,11 +184,11 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0)
-    activestorage (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
+    activestorage (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.2)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -542,7 +542,7 @@ GEM
     mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     msgpack (1.2.10)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -613,18 +613,18 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.2)
-      actioncable (= 5.2.4.2)
-      actionmailer (= 5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      activestorage (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    rails (5.2.4.3)
+      actioncable (= 5.2.4.3)
+      actionmailer (= 5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
+      activestorage (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.2)
+      railties (= 5.2.4.3)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -638,9 +638,9 @@ GEM
     rails_same_site_cookie (0.1.8)
       rack (>= 1.5)
       user_agent_parser (~> 2.5)
-    railties (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    railties (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -984,7 +984,7 @@ DEPENDENCIES
   pry-rails
   puma
   rack-cors
-  rails (= 5.2.4.2)
+  rails (= 5.2.4.3)
   rails-controller-testing
   rails_same_site_cookie
   rb-readline

From 2cb714ab72ddbbff10e389ba108f9a456f04cd85 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Mon, 18 May 2020 14:25:21 -0400
Subject: [PATCH 41/61] Simply and avoid error handling by using
 safe_constantize

---
 app/models/master_file.rb                           | 5 ++---
 app/presenters/speedy_af/proxy/master_file.rb       | 5 ++---
 spec/models/master_file_spec.rb                     | 5 +++++
 spec/presenters/speedy_af/proxy/master_file_spec.rb | 7 +++++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/models/master_file.rb b/app/models/master_file.rb
index 762ee356ee..78a2f4b936 100644
--- a/app/models/master_file.rb
+++ b/app/models/master_file.rb
@@ -725,9 +725,8 @@ def update_ingest_batch
   end
 
   def find_encoder_class(klass_name)
-    return nil if klass_name.blank? || !Object.const_defined?(klass_name)
-    klass = Object.const_get(klass_name)
-    return klass if klass.ancestors.include?(ActiveEncode::Base)
+    klass = klass_name&.safe_constantize
+    klass if klass&.ancestors&.include?(ActiveEncode::Base)
   end
 
   def stop_processing!
diff --git a/app/presenters/speedy_af/proxy/master_file.rb b/app/presenters/speedy_af/proxy/master_file.rb
index b5ef78cb2e..737d86bd2f 100644
--- a/app/presenters/speedy_af/proxy/master_file.rb
+++ b/app/presenters/speedy_af/proxy/master_file.rb
@@ -22,9 +22,8 @@ def encoder_class
   end
 
   def find_encoder_class(klass_name)
-    return nil if klass_name.blank? || !Object.const_defined?(klass_name)
-    klass = Object.const_get(klass_name)
-    return klass if klass.ancestors.include?(ActiveEncode::Base)
+    klass = klass_name&.safe_constantize
+    klass if klass&.ancestors&.include?(ActiveEncode::Base)
   end
 
   def display_title
diff --git a/spec/models/master_file_spec.rb b/spec/models/master_file_spec.rb
index 397e13fbbc..13f02ffd52 100644
--- a/spec/models/master_file_spec.rb
+++ b/spec/models/master_file_spec.rb
@@ -339,6 +339,11 @@
       expect(subject.encoder_class).to eq(WatchedEncode)
     end
 
+    it "should fall back to Watched when a workflow class can't be resolved" do
+      subject.encoder_classname = 'my-awesomeEncode'
+      expect(subject.encoder_class).to eq(WatchedEncode)
+    end
+
     it "should resolve an explicitly named encoder class" do
       stub_const("EncoderModule::MyEncoder", Class.new(ActiveEncode::Base))
       subject.encoder_classname = 'EncoderModule::MyEncoder'
diff --git a/spec/presenters/speedy_af/proxy/master_file_spec.rb b/spec/presenters/speedy_af/proxy/master_file_spec.rb
index 8826d456dc..b2266baaab 100644
--- a/spec/presenters/speedy_af/proxy/master_file_spec.rb
+++ b/spec/presenters/speedy_af/proxy/master_file_spec.rb
@@ -41,6 +41,13 @@
         end
       end
 
+      context 'with invalid class name' do
+        let(:master_file) { FactoryBot.create(:master_file, encoder_classname: 'my-awesomeEncode') }
+        it "should fall back to Watched when a workflow class can't be resolved" do
+          expect(subject.encoder_class).to eq(WatchedEncode)
+        end
+      end
+
       context 'with encoder class name' do
         let(:master_file) { FactoryBot.create(:master_file, encoder_classname: 'EncoderModule::MyEncoder') }
         it "should resolve an explicitly named encoder class" do

From 4cd3f4511933a98f235995a4563bff870c452c74 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Mon, 18 May 2020 14:50:43 -0400
Subject: [PATCH 42/61] Pass quality to #auth_service for probe id

---
 app/models/iiif_canvas_presenter.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/iiif_canvas_presenter.rb b/app/models/iiif_canvas_presenter.rb
index d77ae9e467..6d600e6394 100644
--- a/app/models/iiif_canvas_presenter.rb
+++ b/app/models/iiif_canvas_presenter.rb
@@ -51,7 +51,7 @@ def video_display_content(quality)
                                            height: master_file.height.to_i,
                                            duration: stream_info[:duration],
                                            type: 'Video',
-                                           auth_service: auth_service)
+                                           auth_service: auth_service(quality))
     end
 
     def audio_content
@@ -63,7 +63,7 @@ def audio_display_content(quality)
                                            label: quality,
                                            duration: stream_info[:duration],
                                            type: 'Sound',
-                                           auth_service: auth_service)
+                                           auth_service: auth_service(quality))
     end
 
     def stream_urls
@@ -136,7 +136,7 @@ def structure_ng_xml
       @structure_ng_xml ||= (s = master_file.structuralMetadata.content).nil? ? Nokogiri::XML(nil) : Nokogiri::XML(s)
     end
 
-    def auth_service
+    def auth_service(quality)
       {
         "context": "http://iiif.io/api/auth/1/context.json",
         "@id": Rails.application.routes.url_helpers.new_user_session_url(login_popup: 1),
@@ -150,7 +150,7 @@ def auth_service
         "profile": "http://iiif.io/api/auth/1/login",
         "service": [
           {
-            "@id": Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: 'auto'),
+            "@id": Rails.application.routes.url_helpers.hls_manifest_master_file_url(master_file.id, quality: quality),
             "@type": "AuthProbeService1",
             "profile": "http://iiif.io/api/auth/1/probe"
           },

From 948849fd2a0fcd9614698766b312f781736fe135 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Mon, 18 May 2020 16:08:11 -0400
Subject: [PATCH 43/61] New SME build with react-dnd disabled when inline
 eiditing is in progress

---
 yarn.lock | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 885cb72b30..e76795e9a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -790,13 +790,13 @@
     "@babel/runtime" "^7.2.0"
 
 "@material-ui/styles@^4.2.0":
-  version "4.9.13"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz#08b3976bdd21c38bc076693d95834f97539f3b15"
-  integrity sha512-lWlXJanBdHQ18jW/yphedRokHcvZD1GdGzUF/wQxKDsHwDDfO45ZkAxuSBI202dG+r1Ph483Z3pFykO2obeSRA==
+  version "4.9.14"
+  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.14.tgz#0a9e93a2bf24e8daa0811411a6f3dabdafbe9a07"
+  integrity sha512-zecwWKgRU2VzdmutNovPB4s5LKI0TWyZKc/AHfPu9iY8tg4UoLjpa4Rn9roYrRfuTbBZHI6b0BXcQ8zkis0nzQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/hash" "^0.8.0"
-    "@material-ui/types" "^5.0.1"
+    "@material-ui/types" "^5.1.0"
     "@material-ui/utils" "^4.9.6"
     clsx "^1.0.4"
     csstype "^2.5.2"
@@ -812,12 +812,13 @@
     prop-types "^15.7.2"
 
 "@material-ui/system@^4.3.0":
-  version "4.9.13"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz#adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"
-  integrity sha512-6AlpvdW6KJJ5bF1Xo2OD13sCN8k+nlL36412/bWnWZOKIfIMo/Lb8c8d1DOIaT/RKWxTEUaWnKZjabVnA3eZjA==
+  version "4.9.14"
+  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f"
+  integrity sha512-oQbaqfSnNlEkXEziDcJDDIy8pbvwUmZXWNqlmIwDqr/ZdCK8FuV3f4nxikUh7hvClKV2gnQ9djh5CZFTHkZj3w==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@material-ui/utils" "^4.9.6"
+    csstype "^2.5.2"
     prop-types "^15.7.2"
 
 "@material-ui/types@^4.1.1":
@@ -827,10 +828,10 @@
   dependencies:
     "@types/react" "*"
 
-"@material-ui/types@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz#c4954063cdc196eb327ee62c041368b1aebb6d61"
-  integrity sha512-wURPSY7/3+MAtng3i26g+WKwwNE3HEeqa/trDBR5+zWKmcjO+u9t7Npu/J1r+3dmIa/OeziN9D/18IrBKvKffw==
+"@material-ui/types@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
+  integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
 
 "@material-ui/utils@^4.1.0", "@material-ui/utils@^4.9.6":
   version "4.9.12"
@@ -932,9 +933,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@^16.9.11":
-  version "16.9.34"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
-  integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
+  version "16.9.35"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368"
+  integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -2840,10 +2841,10 @@ eventemitter3@3.1.0, eventemitter3@^3.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
   integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
-eventemitter3@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
-  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+eventemitter3@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
+  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
 
 events@^3.0.0:
   version "3.0.0"
@@ -3448,11 +3449,11 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 hls.js@^0.13.3-canary.5556:
-  version "0.13.3-canary.5556"
-  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.3-canary.5556.tgz#061dc478ff9472c68c1c9c421c9b7cfa696169d6"
-  integrity sha512-7lzGB3Q0PSySlahRjF2imhoO9F0NvCCaTwpeEeSam8hFTVmC+STKwcqj+K5+C79hPJJXVwPICLHAtDdpG4IYDw==
+  version "0.13.3-canary.5602"
+  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.3-canary.5602.tgz#f1f502ef5b535313522ace3d87003adb4a72a522"
+  integrity sha512-MTMaYyHUYy3+YvCChFdW3dFd0oAIu++Bp35NGOIe15twfD4eyRgYwYGdFVlwQipN/mCW7L0vPEqrwvFSOednNA==
   dependencies:
-    eventemitter3 "4.0.0"
+    eventemitter3 "^4.0.3"
     url-toolkit "^2.1.6"
 
 "hls.js@https://github.com/avalonmediasystem/hls.js#stricter_ts_probing":
@@ -6382,7 +6383,7 @@ react-redux@^6.0.0:
 
 "react-structural-metadata-editor@https://github.com/avalonmediasystem/react-structural-metadata-editor":
   version "1.1.0"
-  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#59fbd62fa2d3c14e231124871a537025dde18639"
+  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#11405154ef5c498fccf1b03f840899fb6e3ce357"
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@fortawesome/fontawesome-svg-core" "^1.2.4"
@@ -7809,9 +7810,9 @@ waveform-data@^2.1.2:
     inline-worker "~1.1.0"
 
 waveform-data@~3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/waveform-data/-/waveform-data-3.3.1.tgz#19657a05e966d3efcc3206668f60a233d26975d2"
-  integrity sha512-GxwvVJDnTro2WCFvb4tp9GscC+/OCfoELM8z9b0yvjQzi0Lyr0DE/yhyWBDg0H9xjHiZl+cnI5ZQKDxnD/wE/Q==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/waveform-data/-/waveform-data-3.3.2.tgz#4801c7535e3116579fb501fb9f5cac0722ab63fa"
+  integrity sha512-F50MPz9tglSekTkaSKsqpNOYGI8Xl5yJkz6ivjUANNv2hkNaK7jPrQhdhfiWFBQVsCSRu8CFMkMMDKEVbJaXTg==
   dependencies:
     inline-worker "~1.1.0"
 

From d958c7f8fba445e28b9cb6826cddf4bebd6f53a5 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Thu, 21 May 2020 09:52:01 -0400
Subject: [PATCH 44/61] New SME build

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e76795e9a8..0462e5c969 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3449,9 +3449,9 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 hls.js@^0.13.3-canary.5556:
-  version "0.13.3-canary.5602"
-  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.3-canary.5602.tgz#f1f502ef5b535313522ace3d87003adb4a72a522"
-  integrity sha512-MTMaYyHUYy3+YvCChFdW3dFd0oAIu++Bp35NGOIe15twfD4eyRgYwYGdFVlwQipN/mCW7L0vPEqrwvFSOednNA==
+  version "0.13.3-canary.5621"
+  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.3-canary.5621.tgz#082c2479898f8df2dda490d42d34f4fa811ac44e"
+  integrity sha512-BNmS7UQHRmw5Ut8+O9TDPqyXal+PiQLp0FmpyRvV9h77TX7BY3VxEvsymmh3WIxyavwsVNMVjs/wh7/bGjHK9g==
   dependencies:
     eventemitter3 "^4.0.3"
     url-toolkit "^2.1.6"
@@ -6383,7 +6383,7 @@ react-redux@^6.0.0:
 
 "react-structural-metadata-editor@https://github.com/avalonmediasystem/react-structural-metadata-editor":
   version "1.1.0"
-  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#11405154ef5c498fccf1b03f840899fb6e3ce357"
+  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#2ced29f6d1369ee05c3c6ecc214b93de20e95907"
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@fortawesome/fontawesome-svg-core" "^1.2.4"

From 2de20690ada2f633bb538788055225723e731543 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Fri, 22 May 2020 09:24:13 -0400
Subject: [PATCH 45/61] New SME build with support for playing media file with
 spacebar

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 0462e5c969..229d56660b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6383,7 +6383,7 @@ react-redux@^6.0.0:
 
 "react-structural-metadata-editor@https://github.com/avalonmediasystem/react-structural-metadata-editor":
   version "1.1.0"
-  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#2ced29f6d1369ee05c3c6ecc214b93de20e95907"
+  resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#5511ad1382d4ed0e3c7ca5b15aec8d077cdf7a79"
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@fortawesome/fontawesome-svg-core" "^1.2.4"

From e66a338d241454122ccc7daa3aa559a559add152 Mon Sep 17 00:00:00 2001
From: phuongdh <phuongdh@gmail.com>
Date: Thu, 21 May 2020 17:14:08 -0400
Subject: [PATCH 46/61] Skip waveform generation if no audio track

Co-authored-by: cjcolvar <cjcolvar@indiana.edu>
---
 app/jobs/waveform_job.rb        |  2 +-
 app/models/master_file.rb       |  6 ++++++
 spec/jobs/waveform_job_spec.rb  | 12 ++++++++++++
 spec/models/master_file_spec.rb |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/jobs/waveform_job.rb b/app/jobs/waveform_job.rb
index 2181424739..23b438c44c 100644
--- a/app/jobs/waveform_job.rb
+++ b/app/jobs/waveform_job.rb
@@ -21,7 +21,7 @@ class WaveformJob < ActiveJob::Base
 
   def perform(master_file_id, regenerate = false)
     master_file = MasterFile.find(master_file_id)
-    return if master_file.waveform.content.present? && !regenerate
+    return if master_file.waveform.content.present? && !regenerate || !master_file.has_audio?
 
     service = WaveformService.new(8, SAMPLES_PER_FRAME)
     uri = file_uri(master_file) || derivative_file_uri(master_file) || playlist_url(master_file)
diff --git a/app/models/master_file.rb b/app/models/master_file.rb
index 78a2f4b936..5f021c72c8 100644
--- a/app/models/master_file.rb
+++ b/app/models/master_file.rb
@@ -469,6 +469,12 @@ def self.post_processing_move_filename(oldpath, options = {})
     end
   end
 
+  def has_audio?
+    # The MasterFile doesn't have an audio track unless the first derivative does
+    # This is useful to skip unnecessary waveform generation
+    derivatives.any?(&:audio_codec)
+  end
+
   def has_poster?
     !poster.empty?
   end
diff --git a/spec/jobs/waveform_job_spec.rb b/spec/jobs/waveform_job_spec.rb
index 6dd2a6b379..5945038f67 100644
--- a/spec/jobs/waveform_job_spec.rb
+++ b/spec/jobs/waveform_job_spec.rb
@@ -108,5 +108,17 @@
         expect(service).to have_received(:get_waveform_json)
       end
     end
+
+    context 'when there is no audio track' do
+      before do
+        allow(master_file).to receive(:has_audio?).and_return false
+        allow(MasterFile).to receive(:find).with(master_file.id).and_return(master_file)
+      end
+
+      it 'does not call waveform service' do
+        expect { job.perform(master_file.id) }.not_to change { master_file.reload.waveform.content }
+        expect(service).not_to have_received(:get_waveform_json)
+      end
+    end
   end
 end
diff --git a/spec/models/master_file_spec.rb b/spec/models/master_file_spec.rb
index 13f02ffd52..b20db2e31f 100644
--- a/spec/models/master_file_spec.rb
+++ b/spec/models/master_file_spec.rb
@@ -676,4 +676,5 @@
       end
     end
   end
+
 end

From 12e3900fc29455e002efb53c640849b0c7bfac0d Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Fri, 29 May 2020 09:57:16 -0400
Subject: [PATCH 47/61] Update kaminari due to security issue

---
 Gemfile.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5c2e1fa76c..1bacc69f39 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -488,18 +488,18 @@ GEM
       multi_json (~> 1.12)
       rdf (>= 2.2.8, < 4.0)
     jwt (2.1.0)
-    kaminari (1.1.1)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     ldp (1.0.0)

From b891ba8f84c28427315e0a04cb885e868bae5040 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Tue, 2 Jun 2020 17:17:16 -0400
Subject: [PATCH 48/61] Carry forward the set volume from a section to next
 section

---
 .../javascripts/media_player_wrapper/avalon_player_new.es6    | 3 +++
 .../javascripts/mediaelement/mediaelement-and-player.js       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6 b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
index a70b063954..61ca0bbaf9 100644
--- a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
+++ b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
@@ -284,6 +284,9 @@ class MEJSPlayer {
     // Build quality
     this.player.buildquality(this.player, null, null, this.mediaElement);
 
+    // Set startVolume in options from the current mediaelement instance
+    this.player.options.startVolume = this.mediaElement.volume;
+
     this.reInitializeCaptions();
 
     this.player.load();
diff --git a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
index 9889de925e..acb729ec42 100644
--- a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
+++ b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
@@ -3039,7 +3039,7 @@ Object.assign(_player2.default.prototype, {
 			keys: [38],
 			action: function action(player) {
 				var volumeSlider = player.getElement(player.container).querySelector('.' + _player.config.classPrefix + 'volume-slider');
-				if (volumeSlider || player.getElement(player.container).querySelector('.' + _player.config.classPrefix + 'volume-slider').matches(':focus')) {
+				if (volumeSlider) {
 					volumeSlider.style.display = 'block';
 				}
 				if (player.isVideo) {
@@ -3076,8 +3076,8 @@ Object.assign(_player2.default.prototype, {
 		}, {
 			keys: [77],
 			action: function action(player) {
-				player.getElement(player.container).querySelector('.' + _player.config.classPrefix + 'volume-slider').style.display = 'block';
 				if (player.isVideo) {
+					player.getElement(player.container).querySelector('.' + _player.config.classPrefix + 'volume-slider').style.display = 'block';
 					player.showControls();
 					player.startControlsTimer();
 				}

From 4ab7057aead3ba488038efd28758811057a754f3 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Wed, 3 Jun 2020 14:40:52 -0400
Subject: [PATCH 49/61] Carry forward selected quality from a section to the
 next

---
 .../javascripts/media_player_wrapper/avalon_player_new.es6 | 6 ++++++
 .../javascripts/mediaelement/plugins/quality-avalon.js     | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6 b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
index 61ca0bbaf9..28d05d7611 100644
--- a/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
+++ b/app/assets/javascripts/media_player_wrapper/avalon_player_new.es6
@@ -281,6 +281,9 @@ class MEJSPlayer {
       this.player.buildplaylistItems(this.player, null, null, this.mediaElement);
     }
 
+    // Set defaultQuality in player options before building the quality feature
+    this.player.options.defaultQuality = this.localStorage.getItem('quality');
+
     // Build quality
     this.player.buildquality(this.player, null, null, this.mediaElement);
 
@@ -578,6 +581,9 @@ class MEJSPlayer {
    */
   initializePlayer() {
     let currentStreamInfo = this.currentStreamInfo;
+    // Set default quality value in localStorage  
+    this.localStorage.setItem('quality', this.defaultQuality);
+
     // Mediaelement default root level configuration
     let defaults = {
       pluginPath: '/assets/mediaelement/shims/',
diff --git a/vendor/assets/javascripts/mediaelement/plugins/quality-avalon.js b/vendor/assets/javascripts/mediaelement/plugins/quality-avalon.js
index 3c5a16b1d5..589f879e3e 100755
--- a/vendor/assets/javascripts/mediaelement/plugins/quality-avalon.js
+++ b/vendor/assets/javascripts/mediaelement/plugins/quality-avalon.js
@@ -95,6 +95,10 @@
                 var keyExist = t.keyExist(qualityMap, value);
                 if (keyExist) {
                   label = value;
+                } else if(t.keyExist(qualityMap, 'auto')) {
+                  // When default quality src is not present, but 'auto'
+                  // quality src is available
+                  label = 'auto';
                 } else {
                   var keyValue = t.getMapIndex(qualityMap, 0);
                   label = keyValue.key;
@@ -230,6 +234,9 @@
                 var self = this,
                   newQuality = self.value;
 
+                // Set new quality value in localStorage
+                window.localStorage.setItem('quality', newQuality);
+
                 var selected = player.qualitiesButton.querySelectorAll(
                   '.' + t.options.classPrefix + 'qualities-selected'
                 );

From e2ba4e9edcb83a6c5ca252d6b3f1cc0c479b34ef Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Wed, 3 Jun 2020 16:48:28 -0400
Subject: [PATCH 50/61] Fix for breaking autoplay in playlists

---
 .../media_player_wrapper/mejs4_plugin_playlist_items.es6   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
index c482be3e09..3b3ffc4621 100644
--- a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
+++ b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
@@ -286,7 +286,12 @@ Object.assign(MediaElementPlayer.prototype, {
      * @return {Object} jQuery object
      */
     getNextItem() {
-      return this.$nowPlayingLi.next('li');
+      let nextItem = this.$nowPlayingLi.next('li');
+      // When next item is not a valid playlist item (e.g. from a deleted item) get the item after that
+      if(nextItem[0].className != 'queue') {
+        nextItem =  nextItem.next('li');
+      }
+      return nextItem;
     },
 
     /**

From 41c49884944c5ba48de6abaa5f207854325cb711 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Thu, 4 Jun 2020 11:53:40 -0400
Subject: [PATCH 51/61] Add comments for mediaelement.js changes

---
 .../javascripts/mediaelement/mediaelement-and-player.js  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
index acb729ec42..25b1dad12f 100644
--- a/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
+++ b/vendor/assets/javascripts/mediaelement/mediaelement-and-player.js
@@ -3039,6 +3039,11 @@ Object.assign(_player2.default.prototype, {
 			keys: [38],
 			action: function action(player) {
 				var volumeSlider = player.getElement(player.container).querySelector('.' + _player.config.classPrefix + 'volume-slider');
+				/**
+				 * Removing condition for having focus on volumeSlider element;
+				 * volumeSlider is the volume control slider for video players, therefore using up arrow key on audio players to increase
+				 * volume doesn't work with this condition. This is already removed for reducing volume in line 3064 (under keys: [40])
+				 */
 				if (volumeSlider) {
 					volumeSlider.style.display = 'block';
 				}
@@ -3077,6 +3082,10 @@ Object.assign(_player2.default.prototype, {
 			keys: [77],
 			action: function action(player) {
 				if (player.isVideo) {
+					/**
+					 * Following element is present only in video players, therefore the mute functionality doesn't work for audio players
+					 * since the code breaks when trying to find this element
+					 */
 					player.getElement(player.container).querySelector('.' + _player.config.classPrefix + 'volume-slider').style.display = 'block';
 					player.showControls();
 					player.startControlsTimer();

From f8a184f1ee4b55159c6f97cfe5d14a2231c7e874 Mon Sep 17 00:00:00 2001
From: Dananji Withana <dwithana@iu.edu>
Date: Thu, 4 Jun 2020 11:55:33 -0400
Subject: [PATCH 52/61] Update
 app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6

Co-authored-by: Chris Colvard <cjcolvar@indiana.edu>
---
 .../media_player_wrapper/mejs4_plugin_playlist_items.es6      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
index 3b3ffc4621..48254c0792 100644
--- a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
+++ b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_playlist_items.es6
@@ -288,8 +288,8 @@ Object.assign(MediaElementPlayer.prototype, {
     getNextItem() {
       let nextItem = this.$nowPlayingLi.next('li');
       // When next item is not a valid playlist item (e.g. from a deleted item) get the item after that
-      if(nextItem[0].className != 'queue') {
-        nextItem =  nextItem.next('li');
+      if(nextItem[0].className !== 'queue') {
+        nextItem = nextItem.next('li');
       }
       return nextItem;
     },

From 501b1bfc05b2d63f919bc9dbf6ba85ba3ffe03e8 Mon Sep 17 00:00:00 2001
From: Sumith Reddi Baddam <sumith.reddy2@gmail.com>
Date: Thu, 4 Jun 2020 17:30:00 -0400
Subject: [PATCH 53/61] Zero width (#4110)

Remove zero-width characters from the beginning and end of all parameters in all controller actions

* Add String#remove_zero_width_chars to remove all zero width unicode characters
* Add before action in ApplicationController to strip zero-width
characters from all parameters including child arrays and hashes.

Co-authored-by: Sumith Baddam <sumith.reddy2@gmail.com>
---
 app/controllers/application_controller.rb     | 23 ++++++++++
 config/initializers/avalon.rb                 |  1 +
 lib/string_additions.rb                       | 23 ++++++++++
 .../admin_collections_controller_spec.rb      | 11 +++++
 .../application_controller_spec.rb            | 17 ++++++++
 spec/lib/string_additions_spec.rb             | 42 +++++++++++++++++++
 6 files changed, 117 insertions(+)
 create mode 100644 lib/string_additions.rb
 create mode 100644 spec/lib/string_additions_spec.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f2fcd15f06..c8ac308d4e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -32,6 +32,7 @@ class ApplicationController < ActionController::Base
   around_action :handle_api_request, if: proc{|c| request.format.json? || request.format.atom? }
   before_action :rewrite_v4_ids, if: proc{|c| request.method_symbol == :get && [params[:id], params[:content]].compact.any? { |i| i =~ /^[a-z]+:[0-9]+$/}}
   before_action :set_no_cache_headers, if: proc{|c| request.xhr? }
+  prepend_before_action :remove_zero_width_chars
 
   def set_no_cache_headers
     response.headers["Cache-Control"] = "no-cache, no-store"
@@ -202,4 +203,26 @@ def authenticate_user!(_opts = {})
   def after_invite_path_for(_inviter, _invitee = nil)
     main_app.persona_users_path
   end
+
+  private
+
+    def remove_zero_width_chars
+      # params is a ActionController::Parameters
+      strip_zero_width_chars!(params)
+    end
+
+    def strip_zero_width_chars!(obj)
+      case obj
+      when String
+        obj.remove_zero_width_chars
+      when Array
+        obj.map! { |child| strip_zero_width_chars!(child) }
+      when Hash
+        obj.transform_values! { |value| strip_zero_width_chars!(value) }
+      when ActionController::Parameters
+        obj.each { |k, v| obj[k] = strip_zero_width_chars!(v) }
+      else
+        obj
+      end
+    end
 end
diff --git a/config/initializers/avalon.rb b/config/initializers/avalon.rb
index eb2d69cdc9..639524698a 100644
--- a/config/initializers/avalon.rb
+++ b/config/initializers/avalon.rb
@@ -5,5 +5,6 @@
 # out what is available. See lib/avalon/dropbox.rb for details on the API
 require 'avalon/dropbox'
 require 'avalon/batch'
+require 'string_additions'
 
 I18n.config.enforce_available_locales = true
diff --git a/lib/string_additions.rb b/lib/string_additions.rb
new file mode 100644
index 0000000000..6cc0e86258
--- /dev/null
+++ b/lib/string_additions.rb
@@ -0,0 +1,23 @@
+# Copyright 2011-2020, 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 StringAdditions
+  ZERO_WIDTH_CHARS = ["\u200B", "\u200C", "\u200D", "\uFEFF", "\u2060"].freeze
+
+  # Removes zero-width character from beginning and end of string
+  def remove_zero_width_chars
+    gsub(/^[#{String::ZERO_WIDTH_CHARS.join}]/, '').gsub(/[#{String::ZERO_WIDTH_CHARS.join}]$/, '')
+  end
+end
+String.prepend(StringAdditions)
diff --git a/spec/controllers/admin_collections_controller_spec.rb b/spec/controllers/admin_collections_controller_spec.rb
index 452ff5ab0b..66e9315f2e 100644
--- a/spec/controllers/admin_collections_controller_spec.rb
+++ b/spec/controllers/admin_collections_controller_spec.rb
@@ -94,6 +94,17 @@
       collection.reload
       expect(manager).not_to be_in(collection.managers)
     end
+
+    context 'with zero-width characters' do
+      let(:manager) { FactoryBot.create(:manager) }
+      let(:manager_key) { "#{manager.user_key}\u200B" }
+
+      it "should add users to manager role" do
+        put 'update', params: { id: collection.id, submit_add_manager: 'Add', add_manager: manager_key }
+        collection.reload
+        expect(manager).to be_in(collection.managers)
+      end
+    end
   end
 
   describe "#edit" do
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index d6364dddc8..d31cc55511 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -111,4 +111,21 @@ def show
       expect(controller.after_invite_path_for(nil)).to eq('/persona/users')
     end
   end
+
+  describe 'remove_zero_width_chars' do
+    it 'removes zero-width chars from string params' do
+      post :create, params: { id: 'abc1234', key: "\u200Bvalue\u2060" }
+      expect(controller.params[:key]).to eq "value"
+    end
+
+    it 'removes zero-width chars from array params' do
+      post :create, params: { id: 'abc1234', key: ["\u200Bvalue\u2060"] }
+      expect(controller.params[:key]).to eq ["value"]
+    end
+
+    it 'removes zero-width chars from hash params' do
+      post :create, params: { id: 'abc1234', key: { subkey: "\u200Bvalue\u2060" } }
+      expect(controller.params[:key][:subkey]).to eq "value"
+    end
+  end
 end
diff --git a/spec/lib/string_additions_spec.rb b/spec/lib/string_additions_spec.rb
new file mode 100644
index 0000000000..f39db39db4
--- /dev/null
+++ b/spec/lib/string_additions_spec.rb
@@ -0,0 +1,42 @@
+# Copyright 2011-2020, 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'
+
+describe 'StringAdditions' do
+  describe 'remove_zero_width_chars' do
+    it 'removes zero-width characters from the beginning and end of strings' do
+      String::ZERO_WIDTH_CHARS.each do |char|
+        expect("test#{char}".remove_zero_width_chars).to eq 'test'
+        expect("#{char}test".remove_zero_width_chars).to eq 'test'
+      end
+    end
+
+    it 'does not remove zero-width characters from the middle of strings' do
+      String::ZERO_WIDTH_CHARS.each do |char|
+        expect("test#{char}test".remove_zero_width_chars).to eq "test#{char}test"
+        expect("#{char}test#{char}test#{char}".remove_zero_width_chars).to eq "test#{char}test"
+      end
+    end
+
+    it 'does not remove non-zero-width characters' do
+      expect('test'.remove_zero_width_chars).to eq 'test'
+      expect('test '.remove_zero_width_chars).to eq 'test '
+      expect(' test '.remove_zero_width_chars).to eq ' test '
+      expect('test test'.remove_zero_width_chars).to eq 'test test'
+      expect("\ttest\t".remove_zero_width_chars).to eq "\ttest\t"
+      expect("\ntest\n".remove_zero_width_chars).to eq "\ntest\n"
+    end
+  end
+end
\ No newline at end of file

From 12ff657d3e335d877afd137284dd97dceed2c9d0 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Thu, 4 Jun 2020 17:38:22 -0400
Subject: [PATCH 54/61] Bump version of websocket-extensions

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1bacc69f39..ffbee9a1f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -885,7 +885,7 @@ GEM
       railties (>= 4.2)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     whenever (0.11.0)
       chronic (>= 0.6.3)
     with_locking (1.0.2)

From 50ff1302fc450fe716af97666253fdb58f94698d Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Mon, 8 Jun 2020 10:57:14 -0400
Subject: [PATCH 55/61] Upgrade JS dependencies in yarn.lock

---
 package.json |  5 ++++-
 yarn.lock    | 47 +++++++++--------------------------------------
 2 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 539263e930..55d9913f3b 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,10 @@
     "mixin-deep": "^1.3.2",
     "serialize-javascript": "^2.1.1",
     "set-value": "^2.0.1",
-    "tar": "^4.4.13"
+    "tar": "^4.4.13",
+    "minimist": "^1.2.3",
+    "acorn": "^6.4.1",
+    "kind-of": "^6.0.3"
   },
   "scripts": {
     "start-collection-index": "webpack-dev-server --mode development --config config/webpack/collection_index.js --host 0.0.0.0",
diff --git a/yarn.lock b/yarn.lock
index 229d56660b..f4835ee5fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1114,7 +1114,7 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn@^6.0.5:
+acorn@^6.0.5, acorn@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
@@ -3831,11 +3831,6 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
 is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
@@ -4257,29 +4252,10 @@ killable@^1.0.0:
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 konva@~5.0.2:
   version "5.0.3"
@@ -4634,15 +4610,10 @@ minimatch@^3.0.4, minimatch@~3.0.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.1.3, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+minimist@0.0.8, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
   version "2.9.0"

From 723104ed7bc73230e93d2ac78aff8c0a164ad866 Mon Sep 17 00:00:00 2001
From: Phuong Dinh <phuongdh@gmail.com>
Date: Tue, 9 Jun 2020 12:18:32 -0400
Subject: [PATCH 56/61] Upgrade Puma to 4.3.5 for security fix

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ffbee9a1f4..5b9304bb9c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -602,7 +602,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
-    puma (4.3.3)
+    puma (4.3.5)
       nio4r (~> 2.0)
     rack (2.2.2)
     rack-cors (1.1.0)

From b503310d22289d12eb797ea2c5460286c88890be Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 9 Jun 2020 12:24:13 -0400
Subject: [PATCH 57/61] Bump version to 7.1.1

---
 config/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index cba1033f89..dff96d3c51 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -8,7 +8,7 @@
 Bundler.require(*Rails.groups)
 
 module Avalon
-  VERSION = '7.1.0'
+  VERSION = '7.1.1'
 
   class Application < Rails::Application
     require 'avalon/configuration'

From 8178982104a2b39b1070bf68a4169d961d5450bd Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 9 Jun 2020 12:55:14 -0400
Subject: [PATCH 58/61] Add spec matcher not_change for chaining matchers

---
 spec/spec_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4d38783a46..d5293ce204 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -116,3 +116,5 @@
   Kernel.srand config.seed
 =end
 end
+
+RSpec::Matchers.define_negated_matcher :not_change, :change

From a20fcd326022644469a25f3175fdbead3f021345 Mon Sep 17 00:00:00 2001
From: Chris Colvard <cjcolvar@indiana.edu>
Date: Tue, 9 Jun 2020 14:34:47 -0400
Subject: [PATCH 59/61] Upgrade serialize-javascript and websocket-extensions

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 55d9913f3b..07e581074a 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "lodash.template": "^4.5.0",
     "lodash.mergewith": "^4.6.2",
     "mixin-deep": "^1.3.2",
-    "serialize-javascript": "^2.1.1",
+    "serialize-javascript": "^3.1.0",
     "set-value": "^2.0.1",
     "tar": "^4.4.13",
     "minimist": "^1.2.3",
diff --git a/yarn.lock b/yarn.lock
index f4835ee5fc..ed15065e05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6163,7 +6163,7 @@ querystringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
   integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -6855,10 +6855,12 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-serialize-javascript@^1.4.0, serialize-javascript@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
-  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
+serialize-javascript@^1.4.0, serialize-javascript@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+  dependencies:
+    randombytes "^2.1.0"
 
 serve-index@^1.7.2:
   version "1.9.1"
@@ -7925,9 +7927,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 whatwg-fetch@>=0.10.0:
   version "3.0.0"

From 29bd4e0b3bceb16d30f207d0a1e53a546aa12a05 Mon Sep 17 00:00:00 2001
From: Dananji <dan9131@gmail.com>
Date: Tue, 9 Jun 2020 16:12:45 -0400
Subject: [PATCH 60/61] Upgrade dot-prop yarn package from 4.2.0 to 5.2.0

---
 package.json |  3 ++-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 07e581074a..2008b293db 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,8 @@
     "tar": "^4.4.13",
     "minimist": "^1.2.3",
     "acorn": "^6.4.1",
-    "kind-of": "^6.0.3"
+    "kind-of": "^6.0.3",
+    "dot-prop": "^5.2.0"
   },
   "scripts": {
     "start-collection-index": "webpack-dev-server --mode development --config config/webpack/collection_index.js --host 0.0.0.0",
diff --git a/yarn.lock b/yarn.lock
index ed15065e05..8dce5e996d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2665,12 +2665,12 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-dot-prop@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+dot-prop@^4.1.1, dot-prop@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
   dependencies:
-    is-obj "^1.0.0"
+    is-obj "^2.0.0"
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -3952,10 +3952,10 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
 is-path-cwd@^1.0.0:
   version "1.0.0"

From 1a6d521236ea51db2c0d92476aa5c9df8c989675 Mon Sep 17 00:00:00 2001
From: Phuong Dinh <phuongdh@gmail.com>
Date: Mon, 15 Jun 2020 14:35:56 -0400
Subject: [PATCH 61/61] Update license header

---
 .../better_active_elastic_job_adapter.rb           |  2 +-
 lib/avalon/authentication.rb                       |  2 +-
 lib/avalon/batch.rb                                |  2 +-
 lib/avalon/batch/entry.rb                          |  2 +-
 lib/avalon/batch/file_manifest.rb                  |  2 +-
 lib/avalon/batch/ingest.rb                         |  2 +-
 lib/avalon/batch/manifest.rb                       |  2 +-
 lib/avalon/batch/package.rb                        |  2 +-
 lib/avalon/batch/s3_manifest.rb                    |  2 +-
 lib/avalon/bib_retriever.rb                        |  2 +-
 lib/avalon/bib_retriever/sru.rb                    |  2 +-
 lib/avalon/bib_retriever/zoom.rb                   |  2 +-
 lib/avalon/configuration.rb                        |  2 +-
 lib/avalon/controlled_vocabulary.rb                |  2 +-
 lib/avalon/controller/controller_behavior.rb       |  2 +-
 lib/avalon/dropbox.rb                              |  2 +-
 lib/avalon/elastic_transcoder.rb                   | 14 ++++++++++++++
 lib/avalon/file_resolver.rb                        |  2 +-
 lib/avalon/intercom.rb                             |  2 +-
 lib/avalon/m3u8_reader.rb                          |  2 +-
 lib/avalon/role_controls.rb                        |  2 +-
 lib/avalon/routing/can_constraint.rb               |  2 +-
 lib/avalon/sanitizer.rb                            |  2 +-
 lib/avalon/solr_config_uploader.rb                 | 14 ++++++++++++++
 lib/avalon/stream_mapper.rb                        |  2 +-
 lib/avalon/variations_mapping_service.rb           |  2 +-
 lib/avalon/variations_playlist_importer.rb         |  2 +-
 lib/avalon/variations_timeline_importer.rb         |  2 +-
 lib/capistrano/tasks/glob.rake                     | 14 ++++++++++++++
 lib/capistrano/tasks/hls.rake                      | 14 ++++++++++++++
 lib/hydra/multiple_policy_aware_ability.rb         | 14 ++++++++++++++
 ...ple_policy_aware_access_controls_enforcement.rb | 14 ++++++++++++++
 lib/tasks/avalon.rake                              |  2 +-
 lib/tasks/avalon_api.rake                          |  2 +-
 lib/tasks/aws.rake                                 | 14 ++++++++++++++
 lib/tasks/wipeout.rake                             |  2 +-
 lib/tasks/zookeeper.rake                           |  2 +-
 37 files changed, 128 insertions(+), 30 deletions(-)

diff --git a/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb b/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb
index 9d88055b86..8890e18393 100644
--- a/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb
+++ b/lib/active_job/queue_adapters/better_active_elastic_job_adapter.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/authentication.rb b/lib/avalon/authentication.rb
index 8f685c56a6..a5926dacf3 100644
--- a/lib/avalon/authentication.rb
+++ b/lib/avalon/authentication.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/batch.rb b/lib/avalon/batch.rb
index dad545b518..82b47dc5c0 100644
--- a/lib/avalon/batch.rb
+++ b/lib/avalon/batch.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/batch/entry.rb b/lib/avalon/batch/entry.rb
index a50117cddc..c9bb1e0a5e 100644
--- a/lib/avalon/batch/entry.rb
+++ b/lib/avalon/batch/entry.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/batch/file_manifest.rb b/lib/avalon/batch/file_manifest.rb
index 5dcd3a29ba..5939c0047a 100644
--- a/lib/avalon/batch/file_manifest.rb
+++ b/lib/avalon/batch/file_manifest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/batch/ingest.rb b/lib/avalon/batch/ingest.rb
index 9edce8fbc2..4b9bc8bcf1 100644
--- a/lib/avalon/batch/ingest.rb
+++ b/lib/avalon/batch/ingest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/batch/manifest.rb b/lib/avalon/batch/manifest.rb
index c5863ac5c6..37e7bae972 100644
--- a/lib/avalon/batch/manifest.rb
+++ b/lib/avalon/batch/manifest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/batch/package.rb b/lib/avalon/batch/package.rb
index 622f726ef1..26337dfd90 100644
--- a/lib/avalon/batch/package.rb
+++ b/lib/avalon/batch/package.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/batch/s3_manifest.rb b/lib/avalon/batch/s3_manifest.rb
index c54afc6bf5..d011b4454e 100644
--- a/lib/avalon/batch/s3_manifest.rb
+++ b/lib/avalon/batch/s3_manifest.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/bib_retriever.rb b/lib/avalon/bib_retriever.rb
index e5b59f16a7..f04cb95cca 100644
--- a/lib/avalon/bib_retriever.rb
+++ b/lib/avalon/bib_retriever.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/bib_retriever/sru.rb b/lib/avalon/bib_retriever/sru.rb
index 1f7a765f46..0f565365ad 100644
--- a/lib/avalon/bib_retriever/sru.rb
+++ b/lib/avalon/bib_retriever/sru.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/bib_retriever/zoom.rb b/lib/avalon/bib_retriever/zoom.rb
index 37d274e52e..ca671f2c71 100644
--- a/lib/avalon/bib_retriever/zoom.rb
+++ b/lib/avalon/bib_retriever/zoom.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/configuration.rb b/lib/avalon/configuration.rb
index 69a534d195..51ac5358de 100644
--- a/lib/avalon/configuration.rb
+++ b/lib/avalon/configuration.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/controlled_vocabulary.rb b/lib/avalon/controlled_vocabulary.rb
index a9e85b7102..456e948ce1 100644
--- a/lib/avalon/controlled_vocabulary.rb
+++ b/lib/avalon/controlled_vocabulary.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/controller/controller_behavior.rb b/lib/avalon/controller/controller_behavior.rb
index 40b1eb53bb..b4c85bf0e4 100644
--- a/lib/avalon/controller/controller_behavior.rb
+++ b/lib/avalon/controller/controller_behavior.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/dropbox.rb b/lib/avalon/dropbox.rb
index f6a15e0c6f..49acf490b0 100644
--- a/lib/avalon/dropbox.rb
+++ b/lib/avalon/dropbox.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/elastic_transcoder.rb b/lib/avalon/elastic_transcoder.rb
index f5b8012292..863e14b28d 100644
--- a/lib/avalon/elastic_transcoder.rb
+++ b/lib/avalon/elastic_transcoder.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2020, 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  ---
+
 # frozen_string_literal: true
 require 'singleton'
 
diff --git a/lib/avalon/file_resolver.rb b/lib/avalon/file_resolver.rb
index e63f7cd265..0361a5be4e 100644
--- a/lib/avalon/file_resolver.rb
+++ b/lib/avalon/file_resolver.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/intercom.rb b/lib/avalon/intercom.rb
index a0487515f0..55fb86fef7 100644
--- a/lib/avalon/intercom.rb
+++ b/lib/avalon/intercom.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/m3u8_reader.rb b/lib/avalon/m3u8_reader.rb
index e3cb34749a..f944cc1667 100644
--- a/lib/avalon/m3u8_reader.rb
+++ b/lib/avalon/m3u8_reader.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/role_controls.rb b/lib/avalon/role_controls.rb
index c26d2173eb..80e4f635c3 100644
--- a/lib/avalon/role_controls.rb
+++ b/lib/avalon/role_controls.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/routing/can_constraint.rb b/lib/avalon/routing/can_constraint.rb
index 9368fe6695..d92bdc945b 100644
--- a/lib/avalon/routing/can_constraint.rb
+++ b/lib/avalon/routing/can_constraint.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/sanitizer.rb b/lib/avalon/sanitizer.rb
index 02bb338a3c..bdcef2f325 100644
--- a/lib/avalon/sanitizer.rb
+++ b/lib/avalon/sanitizer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/solr_config_uploader.rb b/lib/avalon/solr_config_uploader.rb
index 00843c9b39..9f8cfc5069 100644
--- a/lib/avalon/solr_config_uploader.rb
+++ b/lib/avalon/solr_config_uploader.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2020, 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  ---
+
 # Upload solr configuration from the local filesystem into the zookeeper configs path for solr
 # Taken from https://github.com/projecthydra-labs/hyku/blob/master/app/services/solr_config_uploader.rb
 require 'zk'
diff --git a/lib/avalon/stream_mapper.rb b/lib/avalon/stream_mapper.rb
index cad4471785..33a25dc0d9 100644
--- a/lib/avalon/stream_mapper.rb
+++ b/lib/avalon/stream_mapper.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/variations_mapping_service.rb b/lib/avalon/variations_mapping_service.rb
index 4c17cb97c2..5982bad047 100644
--- a/lib/avalon/variations_mapping_service.rb
+++ b/lib/avalon/variations_mapping_service.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/variations_playlist_importer.rb b/lib/avalon/variations_playlist_importer.rb
index c583dd3dad..29f443b95f 100644
--- a/lib/avalon/variations_playlist_importer.rb
+++ b/lib/avalon/variations_playlist_importer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/avalon/variations_timeline_importer.rb b/lib/avalon/variations_timeline_importer.rb
index e064f300d6..2fd758de3d 100644
--- a/lib/avalon/variations_timeline_importer.rb
+++ b/lib/avalon/variations_timeline_importer.rb
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/capistrano/tasks/glob.rake b/lib/capistrano/tasks/glob.rake
index ec9b1e2bd0..8171833c8e 100644
--- a/lib/capistrano/tasks/glob.rake
+++ b/lib/capistrano/tasks/glob.rake
@@ -1,3 +1,17 @@
+# Copyright 2011-2020, 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  ---
+
 namespace :deploy do  
   namespace :symlink do
     desc "Resolve globs in linked_files"
diff --git a/lib/capistrano/tasks/hls.rake b/lib/capistrano/tasks/hls.rake
index e050eedcfe..4e6b6d5b63 100644
--- a/lib/capistrano/tasks/hls.rake
+++ b/lib/capistrano/tasks/hls.rake
@@ -1,3 +1,17 @@
+# Copyright 2011-2020, 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  ---
+
 namespace :avalon do
   desc "Link hls dir to public/streams"
   task :link_hls_dir do
diff --git a/lib/hydra/multiple_policy_aware_ability.rb b/lib/hydra/multiple_policy_aware_ability.rb
index 8cb5c67da9..2602f05a4e 100644
--- a/lib/hydra/multiple_policy_aware_ability.rb
+++ b/lib/hydra/multiple_policy_aware_ability.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2020, 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  ---
+
 # Repeats access controls evaluation methods, but checks against a governing "Policy" object (or "Collection" object) that provides inherited access controls.
 module Hydra::MultiplePolicyAwareAbility
   extend ActiveSupport::Concern
diff --git a/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb b/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb
index c80f74c301..d3e941c39c 100644
--- a/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb
+++ b/lib/hydra/multiple_policy_aware_access_controls_enforcement.rb
@@ -1,3 +1,17 @@
+# Copyright 2011-2020, 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  ---
+
 # Repeats access controls evaluation methods, but checks against a governing "Policy" object (or "Collection" object) that provides inherited access controls.
 module Hydra::MultiplePolicyAwareAccessControlsEnforcement
 
diff --git a/lib/tasks/avalon.rake b/lib/tasks/avalon.rake
index f4357e4f26..6d3578bc80 100644
--- a/lib/tasks/avalon.rake
+++ b/lib/tasks/avalon.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/tasks/avalon_api.rake b/lib/tasks/avalon_api.rake
index dc5ad2288b..9e9ed4c7d2 100644
--- a/lib/tasks/avalon_api.rake
+++ b/lib/tasks/avalon_api.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/tasks/aws.rake b/lib/tasks/aws.rake
index d4f834561a..b22bd35749 100644
--- a/lib/tasks/aws.rake
+++ b/lib/tasks/aws.rake
@@ -1,3 +1,17 @@
+# Copyright 2011-2020, 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  ---
+
 # frozen_string_literal: true
 
 namespace :avalon do
diff --git a/lib/tasks/wipeout.rake b/lib/tasks/wipeout.rake
index a72ecfd312..97fa8ce13d 100644
--- a/lib/tasks/wipeout.rake
+++ b/lib/tasks/wipeout.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #
diff --git a/lib/tasks/zookeeper.rake b/lib/tasks/zookeeper.rake
index 728d62442b..d498846007 100644
--- a/lib/tasks/zookeeper.rake
+++ b/lib/tasks/zookeeper.rake
@@ -1,4 +1,4 @@
-# Copyright 2011-2019, The Trustees of Indiana University and Northwestern
+# Copyright 2011-2020, 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.
 #