Merge branch 'adventist_dev' into hyrax-5-upgrade

.env

@@ -1,5 +1,6 @@
 CHROME_HOSTNAME=chrome
 COMPOSE_DOCKER_CLI_BUILD=1
+DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DB_ADAPTER=postgresql
 DB_HOST=db
 DB_HOST=db
@@ -13,25 +14,28 @@ FCREPO_BASE_PATH=/hykudemo
 FCREPO_HOST=fcrepo
 FCREPO_PORT=8080
 FCREPO_REST_PATH=rest
+HYRAX_ACTIVE_JOB_QUEUE=good_job
+HYRAX_FITS_PATH=/app/fits/fits.sh
 INITIAL_ADMIN_EMAIL=[email protected]
 INITIAL_ADMIN_PASSWORD=testing123
-JAVA_OPTS=-Xmx4g -Xms1g
 IN_DOCKER=true
+JAVA_OPTS=
+JAVA_OPTS=-Xmx4g -Xms1g
 LD_LIBRARY_PATH=/opt/fits/tools/mediainfo/linux
+NEGATIVE_CAPTCHA_SECRET=default-value-change-me
 PASSENGER_APP_ENV=development
 RAILS_LOG_TO_STDOUT=true
 REDIS_HOST=redis
 SECRET_KEY_BASE=asdf
-HYRAX_ACTIVE_JOB_QUEUE=sidekiq
-HYRAX_FITS_PATH=/app/fits/fits.sh
-NEGATIVE_CAPTCHA_SECRET=default-value-change-me
 SOLR_ADMIN_PASSWORD=SolrRocks
 SOLR_ADMIN_USER=solr
 SOLR_COLLECTION_NAME=hydra-development
 SOLR_CONFIGSET_NAME=hyku
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_URL=http://solr:SolrRocks@solr:8983/solr/
+TB_RSPEC_FORMATTER=progress
+TB_RSPEC_OPTIONS="--format RspecJunitFormatter --out rspec.xml"
 
 # Comment out these 5 for single tenancy / Uncomment for multi
 HYKU_ADMIN_HOST=hyku.test

.rubocop.yml

@@ -127,3 +127,7 @@ Metrics/BlockLength:
     - 'spec/**/*.rb'
     - 'lib/tasks/*.rake'
     - 'app/controllers/catalog_controller.rb'
+
+RSpec/FilePath:
+  Exclude:
+    - 'spec/config/application_spec.rb'

Gemfile

@@ -13,11 +13,13 @@ gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postra
 gem 'apartment', github: 'scientist-softserv/apartment', branch: 'development'
 gem 'aws-sdk-sqs', group: %i[aws]
 gem 'blacklight', '~> 7.29'
+gem 'blacklight_advanced_search'
 gem 'blacklight_oai_provider', '~> 7.0'
+gem 'blacklight_range_limit'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap', '~> 4.6'
 gem 'bootstrap-datepicker-rails'
-gem 'bulkrax', '~> 5.3'
+gem 'bulkrax', '~> 5.4'
 gem 'byebug', group: %i[development test]
 gem 'capybara', group: %i[test]
 gem 'capybara-screenshot', '~> 1.0', group: %i[test]
@@ -35,6 +37,7 @@ gem 'easy_translate', group: %i[development]
 gem 'factory_bot_rails', group: %i[test]
 gem 'fcrepo_wrapper', '~> 0.4', group: %i[development test]
 gem 'flutie'
+gem 'good_job', '~> 2.99'
 gem 'googleauth', '= 1.8.1' # 1.9.0 got yanked from rubygems, hard pinning until we can upgrade
 gem 'hyrax', github: 'samvera/hyrax', branch: 'double_combo'
 gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
@@ -57,6 +60,7 @@ gem 'omniauth-multi-provider'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'omniauth-saml', '~> 2.1'
 gem 'omniauth_openid_connect'
+gem 'order_already'
 gem 'parser', '~> 2.5.3'
 gem 'pg'
 gem 'postrank-uri', '>= 1.0.24'

Gemfile.lock

@@ -39,7 +39,7 @@ GIT
 
 GIT
   remote: https://github.com/samvera/hyrax.git
-  revision: 9ef64090a13abdeaabfaabdee851829093d02cc4
+  revision: 0108fed6c83dd4a449b37cc1a6c19787ec54921d
   branch: double_combo
   specs:
     hyrax (5.0.0.rc2)
@@ -231,7 +231,7 @@ GEM
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.864.0)
+    aws-partitions (1.865.0)
     aws-sdk-core (3.190.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -271,7 +271,7 @@ GEM
       smart_properties
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.5)
     bindata (2.4.15)
     bindex (0.8.1)
     blacklight (7.35.0)
@@ -291,6 +291,9 @@ GEM
     blacklight-gallery (4.4.0)
       blacklight (>= 7.17, < 9)
       rails (>= 6.1, < 8)
+    blacklight_advanced_search (7.0.0)
+      blacklight (~> 7.0)
+      parslet
     blacklight_iiif_search (2.0.0)
       blacklight (~> 7.0)
       iiif-presentation
@@ -299,6 +302,10 @@ GEM
       blacklight (~> 7.0)
       oai (~> 1.2)
       rexml
+    blacklight_range_limit (8.4.0)
+      blacklight (>= 7.25.2, < 9)
+      deprecation
+      view_component (>= 2.54, < 4)
     bolognese (1.11.5)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
@@ -510,6 +517,8 @@ GEM
     edtf (3.1.1)
       activesupport (>= 3.0, < 8.0)
     erubi (1.12.0)
+    et-orbi (1.2.7)
+      tzinfo
     ethon (0.16.0)
       ffi (>= 1.15.0)
     excon (0.71.1)
@@ -547,12 +556,24 @@ GEM
     flutie (2.2.0)
     font-awesome-rails (4.7.0.8)
       railties (>= 3.2, < 8.0)
+    fugit (1.9.0)
+      et-orbi (~> 1, >= 1.2.7)
+      raabro (~> 1.4)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     geo_coord (0.2.0)
     geocoder (1.8.2)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    good_job (2.99.0)
+      activejob (>= 5.2.0)
+      activerecord (>= 5.2.0)
+      concurrent-ruby (>= 1.0.2)
+      fugit (>= 1.1)
+      railties (>= 5.2.0)
+      thor (>= 0.14.1)
+      webrick (>= 1.3)
+      zeitwerk (>= 2.0)
     google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
@@ -889,6 +910,8 @@ GEM
     openseadragon (0.6.0)
       rails (> 3.2.0)
     optimist (3.1.0)
+    order_already (0.3.1)
+      rails-html-sanitizer (~> 1.4)
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.6.0)
@@ -923,6 +946,7 @@ GEM
       nokogiri (~> 1.6)
       rails (>= 5.0, < 7.2)
       rdf
+    raabro (1.4.0)
     racc (1.7.3)
     rack (2.2.8)
     rack-oauth2 (2.2.0)
@@ -1333,11 +1357,13 @@ DEPENDENCIES
   apartment!
   aws-sdk-sqs
   blacklight (~> 7.29)
+  blacklight_advanced_search
   blacklight_oai_provider (~> 7.0)
+  blacklight_range_limit
   bolognese (>= 1.9.10)
   bootstrap (~> 4.6)
   bootstrap-datepicker-rails
-  bulkrax (~> 5.3)
+  bulkrax (~> 5.4)
   byebug
   capybara
   capybara-screenshot (~> 1.0)
@@ -1355,6 +1381,7 @@ DEPENDENCIES
   factory_bot_rails
   fcrepo_wrapper (~> 0.4)
   flutie
+  good_job (~> 2.99)
   googleauth (= 1.8.1)
   hyku_knapsack!
   hyrax!
@@ -1377,6 +1404,7 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.1)
   omniauth_openid_connect
+  order_already
   parser (~> 2.5.3)
   pg
   postrank-uri (>= 1.0.24)

app/assets/javascripts/admin_color_select.js

@@ -0,0 +1,20 @@
+$(document).on('turbolinks:load', function() {
+  $('div.defaultable-colors a.restore-default-color').click(function(e) {
+    e.preventDefault()
+
+    var defaultTarget = $(e.target).data('default-target')
+    var input = $("input[name='admin_appearance["+ defaultTarget +"]']")
+
+    input.val(input.data('default-value'))
+  })
+
+  $('.panel-footer a.restore-all-default-colors').click(function(e) {
+    e.preventDefault()
+
+    var allColorInputs = $("input[name*='color']")
+
+    allColorInputs.each(function() {
+      $(this).val($(this).data('default-value'))
+    })
+  })
+});

app/assets/javascripts/application.js

@@ -28,6 +28,8 @@
 // Required by Blacklight
 //= require blacklight/blacklight
 //= require blacklight_gallery
+//= require admin_color_select
+//= require blacklight_advanced_search
 
 // Moved the Hyku JS *above* the Hyrax JS to resolve #1187 (following
 // a pattern found in ScholarSphere)
@@ -51,3 +53,12 @@
 //= require flot_graph
 //= require statistics_tab_manager
 //= require blacklight_gallery/default
+
+// Required for blacklight range limit
+//= require blacklight_range_limit/range_limit_distro_facets
+//= require blacklight_range_limit/range_limit_shared
+//= require blacklight_range_limit/range_limit_slider
+//= require bootstrap-slider
+//= require jquery.flot.js
+
+//= require tinymce