Merge pull request #5005 from avalonmediasystem/staging

Release 7.5
avalonmediasystem · Dec 7, 2022 · 53a7735 · 53a7735
2 parents 9083229 + 23889bb
commit 53a7735
Show file tree

Hide file tree

Showing 162 changed files with 4,602 additions and 1,385 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -50,7 +50,7 @@ RUN         echo "deb     http://ftp.us.debian.org/debian/    bullseye main cont
          && echo "deb-src http://ftp.us.debian.org/debian/    bullseye main contrib non-free"  >> /etc/apt/sources.list.d/bullseye.list \
          && cat /etc/apt/sources.list.d/bullseye.list \
          && apt-get update && apt-get install -y --no-install-recommends curl gnupg2 ffmpeg \
-         && curl -sL http://deb.nodesource.com/setup_12.x | bash - \
+         && curl -sL http://deb.nodesource.com/setup_14.x | bash - \
          && 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 \
          && cat /etc/apt/sources.list.d/nodesource.list \

diff --git a/Gemfile b/Gemfile
@@ -37,7 +37,7 @@ gem 'rdf-vocab', '< 3.1.5'
 gem 'blacklight', '~> 7.25'
 gem 'blacklight-access_controls', '>= 6.0.1' # ensure rails 6 support
 gem 'rdf', '~> 3.1'
-gem 'rsolr', '~> 1.0'
+gem 'rsolr', '~> 2.0'
 
 # Rails & Samvera Plugins
 gem 'about_page', git: 'https://github.com/avalonmediasystem/about_page.git', tag: 'avalon-r6.5'
@@ -54,7 +54,7 @@ gem 'rack-cors', require: 'rack/cors'
 gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'
 gem 'samvera-persona', '~> 0.3'
-gem 'speedy-af', '~> 0.2'
+gem 'speedy-af', '~> 0.3'
 
 # Avalon Components
 gem 'avalon-workflow', git: "https://github.com/avalonmediasystem/avalon-workflow.git", tag: 'avalon-r6.5'
@@ -70,7 +70,7 @@ gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git"
 gem "omniauth-saml", "~> 2.0"
 
 # Media Access & Transcoding
-gem 'active_encode', '~> 0.8.2'
+gem 'active_encode', '~> 1.0'
 gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
 gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
 gem 'fastimage'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -110,7 +110,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active-fedora (13.2.7)
+    active-fedora (13.3.0)
       active-triples (>= 0.11.0, < 2.0.0)
       activemodel (>= 5.1)
       activesupport (>= 5.1)
@@ -132,9 +132,9 @@ GEM
     active_elastic_job (3.2.0)
       aws-sdk-sqs (~> 1)
       rails (>= 5.2.6, < 7.1)
-    active_encode (0.8.2)
+    active_encode (1.1.1)
+      addressable (~> 2.8)
       rails
-      sprockets (< 4)
     active_fedora-datastreams (0.4.0)
       active-fedora (>= 11.0.0.pre, < 14)
       activemodel (< 6.1)
@@ -176,8 +176,8 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
     amazing_print (1.4.0)
@@ -398,7 +398,7 @@ GEM
       mail (~> 2.7)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.10.0)
+    erubi (1.11.0)
     et-orbi (1.2.6)
       tzinfo
     ethon (0.15.0)
@@ -483,7 +483,7 @@ GEM
       hydra-access-controls (= 12.0.1)
       hydra-core (= 12.0.1)
       rails (>= 5.2, < 7)
-    i18n (1.11.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     iconv (1.0.8)
     iiif_manifest (0.6.0)
@@ -548,7 +548,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -566,7 +566,7 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     msgpack (1.4.5)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -582,7 +582,7 @@ GEM
     noid-rails (3.0.3)
       actionpack (>= 5.0.0, < 7)
       noid (~> 0.9)
-    nokogiri (1.13.7)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nom-xml (1.2.0)
@@ -631,7 +631,7 @@ GEM
       pry (~> 0.13.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     puma (5.6.4)
       nio4r (~> 2.0)
     raabro (1.4.0)
@@ -757,8 +757,9 @@ GEM
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
-    rsolr (1.1.2)
+    rsolr (2.5.0)
       builder (>= 2.1.2)
+      faraday (>= 0.9, < 3, != 2.0.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
@@ -850,7 +851,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    slop (4.9.1)
+    slop (4.9.3)
     solr_wrapper (3.1.2)
       http
       retriable
@@ -862,9 +863,9 @@ GEM
       nokogiri
       stomp
       xml-simple
-    speedy-af (0.2.0)
+    speedy-af (0.3.0)
       active-fedora (>= 11.0.0)
-      activesupport (> 5.2, < 6.1)
+      activesupport (> 5.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -898,7 +899,7 @@ GEM
       railties (>= 3.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uber (0.0.15)
     uglifier (4.2.0)
@@ -907,7 +908,7 @@ GEM
       unf_ext
     unf_ext (0.0.8)
     unicode-display_width (1.8.0)
-    unicode-types (1.7.0)
+    unicode-types (1.8.0)
     user_agent_parser (2.9.0)
     view_component (2.58.0)
       activesupport (>= 5.0.0, < 8.0)
@@ -944,7 +945,7 @@ GEM
       nokogiri (~> 1.8)
     xray-rails (0.3.2)
       rails (>= 3.1.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
     zk (1.10.0)
       zookeeper (~> 1.5.0)
     zookeeper (1.5.1)
@@ -958,7 +959,7 @@ DEPENDENCIES
   active-fedora (~> 13.2, >= 13.2.5)
   active_annotations (~> 0.4)
   active_elastic_job
-  active_encode (~> 0.8.2)
+  active_encode (~> 1.0)
   active_fedora-datastreams (~> 0.4)
   activejob-traffic_control
   activejob-uniqueness
@@ -1052,7 +1053,7 @@ DEPENDENCIES
   redis-rails
   rest-client (~> 2.0)
   roo
-  rsolr (~> 1.0)
+  rsolr (~> 2.0)
   rspec-its
   rspec-rails
   rspec-retry
@@ -1065,7 +1066,7 @@ DEPENDENCIES
   sidekiq-cron (~> 1.2)!
   simplecov
   solr_wrapper (>= 0.16)
-  speedy-af (~> 0.2)
+  speedy-af (~> 0.3)
   sprockets (~> 3.7.2)
   sprockets-es6
   sqlite3

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -41,6 +41,7 @@
 //= require cropperjs/dist/cropper.min
 //= require url-search-params-polyfill/index.js
 
+//= require moment/min/moment-with-locales.min.js
 //= require hls.js/dist/hls.min.js
 
 // include all of our vendored js

diff --git a/app/assets/javascripts/avalon_playlists/playlists.js.coffee b/app/assets/javascripts/avalon_playlists/playlists.js.coffee
@@ -57,7 +57,8 @@ $('#playlist_title').on('keyup',
 )
 
 $('#copy-playlist-form').bind('ajax:success',
-  (event, data, status, xhr) ->
+  (event) ->
+    [data, status, xhr] = event.detail
     if (data.errors)
       console.log(data.errors.title[0])
     else
@@ -67,7 +68,8 @@ $('#copy-playlist-form').bind('ajax:success',
         if ( $('#with_refresh').val() )
           location.reload()
 ).bind('ajax:error',
-  (e, xhr, status, error) ->
+  (event) ->
+    [data, status, xhr] = event.detail
     console.log(xhr.responseJSON.errors)
 )
 

diff --git a/app/assets/javascripts/button_confirmation.js.coffee b/app/assets/javascripts/button_confirmation.js.coffee
@@ -1,11 +1,11 @@
 # Copyright 2011-2022, 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
@@ -20,11 +20,6 @@ $ ->
   apply_button_confirmation()
 
 @apply_button_confirmation = () ->
-  # Remove popover when clicked outside. Reference: https://jsfiddle.net/guya/fjZja/
-  $('html').on 'click', (e) ->
-    if typeof $(e.target).data('original-title') == 'undefined' and !$(e.target).parents().is('.popover.in')
-      $('[data-original-title]').popover 'hide'
-
   $(document).on 'click', '#special_button_color', ->
     $('.btn-confirmation').popover 'hide'
     true
@@ -37,7 +32,7 @@ $ ->
       if typeof $(this).attr('form') == "undefined"
         button = '<a href="' + $(this).attr('href') + '" class="btn btn-sm btn-danger btn-confirm" data-method="delete" rel="nofollow">Yes, Delete</a>'
       else
-        button = '<input class="btn btn-sm btn-danger btn-confirm" form="' + $(this).attr('form') + '" type="submit">'
+        button = '<input class="btn btn-sm btn-danger btn-confirm" form="' + $(this).attr('form') + '" type="submit" value="Yes, Delete">'
         $('#' + $(this).attr('form')).find('[name=\'_method\']').val 'delete'
       '<p>Are you sure?</p> ' + button + ' <a href="#" class="btn btn-sm btn-primary" id="special_button_color">No, Cancel</a>'
   ).click ->

diff --git a/app/assets/javascripts/direct_upload.js.coffee b/app/assets/javascripts/direct_upload.js.coffee
@@ -18,6 +18,7 @@ $ ->
     form = $(file_input.parents('form:first'))
     submit_button = form.find('input[type="submit"], *[data-trigger="submit"]')
     submit_button.on 'click', ->
+      form.addClass('form-disabled')
       $('.directupload input:file').fileupload 'send',
         files: $('.directupload input:file').prop('files')
       return false
@@ -37,15 +38,14 @@ $ ->
         progress = parseInt(data.loaded / data.total * 100, 10)
         progress_bar.css('width', "#{progress}%")
       start: (e)->
-        submit_button.prop('disabled', true)
         progress_bar.
           css('background', 'green').
           css('display', 'block').
           css('width', '0%').
           css('padding', '7px').
           text("Loading...")
       done: (e, data)->
-        submit_button.prop('disabled', false)
+        form.removeClass('form-disabled')
         progress_bar.text("Uploading done")
 
         # extract key and generate URL from response
@@ -61,7 +61,7 @@ $ ->
         file_input.replaceWith(input)
         form.submit()
       fail: (e, data)->
-        submit_button.prop('disabled', false)
+        form.removeClass('form-disabled')
         progress_bar.
           css("background", "red").
           text("Failed")
diff --git a/app/assets/javascripts/display_returned_items.js b/app/assets/javascripts/display_returned_items.js
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011-2022, 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  ---
+*/
+
+// Toggle display of returned items on checkouts page
+$('#inactive_checkouts').on('change', function() {
+  var table = $('#checkouts-table').DataTable();
+  if (this.checked) {
+    table.ajax.url('/checkouts.json?display_returned=true').load();
+  } else {
+    table.ajax.url('/checkouts.json').load();
+  }
+});
diff --git a/app/assets/javascripts/dynamic_fields.js.coffee b/app/assets/javascripts/dynamic_fields.js.coffee
@@ -68,10 +68,10 @@ $ ->
     else
       current_input_group.after(new_input_group)
 
-    $(document).on 'click', '.remove-dynamic-field', (e) ->
-      e.preventDefault()
-      current_input_group = $(this).closest('.input-group')
-      textarea = current_input_group.data('textarea')
-      if typeof(textarea)!="undefined"
-        $(document.getElementById(textarea)).remove()
-      current_input_group.remove()
+  $(document).on 'click', '.remove-dynamic-field', (e) ->
+    e.preventDefault()
+    current_input_group = $(this).closest('.input-group')
+    textarea = current_input_group.data('textarea')
+    if typeof(textarea)!="undefined"
+      $(document.getElementById(textarea)).remove()
+    current_input_group.remove()
diff --git a/app/assets/javascripts/localize_times.js b/app/assets/javascripts/localize_times.js
@@ -0,0 +1,9 @@
+// Requires moment.js
+function localize_times() {
+  $('*[data-utc-time]').each(function() {
+    $(this).text(moment($(this).data('utc-time')).format('LLL'))
+  });
+}
+
+$(document).ready(localize_times);
+$(document).on('draw.dt', localize_times);
diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_helper_markers.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_helper_markers.es6
@@ -92,11 +92,12 @@ class MEJSMarkersHelper {
 
       // Show popover confirmation
       $button.popover({
-        container: '#popover-container-' + $button[0].dataset.markerId,
+        container: '#popover-container-' + markerId,
         content: content,
         sanitize: false,
         html: true,
-        placement: 'top'
+        placement: 'top',
+        trigger: 'focus'
       });
       $button.popover('show');
 

diff --git a/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_marker_to_playlist.es6 b/app/assets/javascripts/media_player_wrapper/mejs4_plugin_add_marker_to_playlist.es6
@@ -283,7 +283,7 @@ Object.assign(MediaElementPlayer.prototype, {
     handleControlClick: function(e) {
       const t = this;
       let addMarkerObj = t.addMarkerObj;
-      
+
       // Exit full screen
       if(addMarkerObj.player.isFullScreen) {
         addMarkerObj.player.exitFullScreen();

diff --git a/app/assets/javascripts/move_section.js b/app/assets/javascripts/move_section.js
@@ -14,7 +14,7 @@
  * ---  END LICENSE_HEADER BLOCK  ---
 */
 
-$('#show_move_modal').on('click', function(){
+$('.show_move_modal').on('click', function(){
   $('#move_modal').show();
   var id = $(this).data('id');
   // Set the URL for form POST action