From 649ce6ffd861af3bd0b2a9e28ffb48819d50bf86 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Wed, 20 Sep 2023 23:59:46 -0700
Subject: [PATCH 001/126] add blacklight advances search, blacklight date
 ranges and order already to the gem file and configure them

---
 Gemfile                                       |   3 +
 app/assets/javascripts/admin_font_select.js   |  32 +-
 app/assets/javascripts/application.js         |  11 +
 .../range_limit_distro_facets.js              | 300 ++++++++++++++++++
 .../range_limit_shared.js                     |  24 ++
 .../range_limit_slider.js                     | 130 ++++++++
 app/assets/stylesheets/application.css        |   3 +
 app/controllers/catalog_controller.rb         |  86 ++++-
 app/controllers/saved_searches_controller.rb  |   7 +
 app/controllers/search_history_controller.rb  |   8 +
 app/models/collection.rb                      |   1 +
 app/models/generic_work.rb                    |   3 +
 app/models/image.rb                           |   2 +
 app/models/search_builder.rb                  |   4 +
 .../advanced/_advanced_search_help.html.erb   |  26 ++
 .../_range_limit_panel.html.erb               | 125 ++++++++
 config/routes.rb                              |   4 +-
 17 files changed, 757 insertions(+), 12 deletions(-)
 create mode 100644 app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
 create mode 100644 app/assets/javascripts/blacklight_range_limit/range_limit_shared.js
 create mode 100644 app/assets/javascripts/blacklight_range_limit/range_limit_slider.js
 create mode 100644 app/controllers/saved_searches_controller.rb
 create mode 100644 app/controllers/search_history_controller.rb
 create mode 100644 app/views/advanced/_advanced_search_help.html.erb
 create mode 100644 app/views/blacklight_range_limit/_range_limit_panel.html.erb

diff --git a/Gemfile b/Gemfile
index 868c97ba3..8cda67972 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,9 @@ gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postra
 gem 'apartment'
 gem 'aws-sdk-sqs', group: %i[aws]
 gem 'blacklight', '~> 6.7'
+gem 'blacklight_advanced_search'
 gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1'
+gem 'blacklight_range_limit', '6.5.0'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap-datepicker-rails'
 gem 'bulkrax', '~> 5.3'
@@ -54,6 +56,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'
diff --git a/app/assets/javascripts/admin_font_select.js b/app/assets/javascripts/admin_font_select.js
index 7fa065108..e2c3e89cb 100644
--- a/app/assets/javascripts/admin_font_select.js
+++ b/app/assets/javascripts/admin_font_select.js
@@ -1,6 +1,34 @@
 Blacklight.onLoad(function() {
   if($("#admin_appearance_body_font").length > 0){
-    $("#admin_appearance_body_font").fontselect({lookahead: 20});
-    $("#admin_appearance_headline_font").fontselect({lookahead: 20});
+    $("#admin_appearance_body_font").fontselect({lookahead: 20})
+    $("#admin_appearance_headline_font").fontselect({lookahead: 20})
   }
 });
+
+$('div.defaultable-fonts a.restore-default-font').click(function(e) {
+  e.preventDefault()
+  var defaultTarget = $(e.target).data('default-target')
+  var input         = $("input[name='admin_appearance["+ defaultTarget +"]']")
+  var defaultValue  = input.data('default-value').replace(';', '')
+  var inputDisplay  = $("div[class$='"+ defaultTarget +"']").find('div.font-select span')
+
+  input.val(defaultValue)
+  inputDisplay.css("font-family", defaultValue)
+  inputDisplay.text(defaultValue)
+})
+
+$('.panel-footer a.restore-all-default-fonts').click(function(e) {
+  e.preventDefault()
+
+  var allFontInputs = $("input[name*='font']")
+
+  allFontInputs.each(function() {
+    var thisTarget   = $(this).attr('id').replace('admin_appearance_', '')
+    var defaultValue = $(this).data('default-value').replace(';', '')
+    var inputDisplay = $("div[class$='"+ thisTarget +"']").find('div.font-select span')
+
+    $(this).val(defaultValue)
+    inputDisplay.css("font-family", defaultValue)
+    inputDisplay.text(defaultValue)
+  })
+});
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index fe1ce9b26..c2e416d37 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -26,6 +26,8 @@
 // Required by Blacklight
 //= require blacklight/blacklight
 //= require admin_font_select
+//= 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)
@@ -49,3 +51,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
diff --git a/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js b/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
new file mode 100644
index 000000000..4b2807651
--- /dev/null
+++ b/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
@@ -0,0 +1,300 @@
+// for Blacklight.onLoad:
+
+/* A custom event "plotDrawn.blacklight.rangeLimit" will be sent when flot plot
+   is (re-)drawn on screen possibly with a new size. target of event will be the DOM element
+   containing the plot.  Used to resize slider to match. */
+
+   Blacklight.onLoad(function() {
+    // ratio of width to height for desired display, multiply width by this ratio
+    // to get height. hard-coded in for now.
+    var display_ratio = 1/(1.618 * 2); // half a golden rectangle, why not
+    var redrawnEvent = "plotDrawn.blacklight.rangeLimit";
+  
+  
+  
+    // Facets already on the page? Turn em into a chart.
+    $(".range_limit .profile .distribution.chart_js ul").each(function() {
+        turnIntoPlot($(this).parent());
+    });
+  
+  
+    // Add AJAX fetched range facets if needed, and add a chart to em
+    $(".range_limit .profile .distribution a.load_distribution").each(function() {
+        var container = $(this).parent('div.distribution');
+  
+        $(container).load($(this).attr('href'), function(response, status) {
+            if ($(container).hasClass("chart_js") && status == "success" ) {
+              turnIntoPlot(container);
+            }
+        });
+    });
+  
+    // Listen for twitter bootstrap collapsible open events, to render flot
+    // in previously hidden divs on open, if needed.
+    $("body").on("show.bs.collapse", function(event) {
+      // Was the target a .facet-content including a .chart-js?
+      var container =  $(event.target).filter(".facet-content").find(".chart_js");
+  
+      // only if it doesn't already have a canvas, it isn't already drawn
+      if (container && container.find("canvas").length == 0) {
+        // be willing to wait up to 1100ms for container to
+        // have width -- right away on show.bs is too soon, but
+        // shown.bs is later than we want, we want to start rendering
+        // while animation is still in progress.
+        turnIntoPlot(container, 1100);
+      }
+    });
+  
+  
+  
+    // after a collapsible facet contents is fully shown,
+    // resize the flot chart to current conditions. This way, if you change
+    // browser window size, you can get chart resized to fit by closing and opening
+    // again, if needed.
+  
+    function redrawPlot(container) {
+      if (container && container.width() > 0) {
+        // resize the container's height, since width may have changed.
+        container.height( container.width() * display_ratio  );
+  
+        // redraw the chart.
+        var plot = container.data("plot");
+        if (plot) {
+          // how to redraw after possible resize?
+          // Cribbed from https://github.com/flot/flot/blob/master/jquery.flot.resize.js
+          plot.resize();
+          plot.setupGrid();
+          plot.draw();
+          // plus trigger redraw of the selection, which otherwise ain't always right
+          // we'll trigger a fake event on one of the boxes
+          var form = $(container).closest(".limit_content").find("form.range_limit");
+          form.find("input.range_begin").trigger("change");
+  
+          // send our custom event to trigger redraw of slider
+          $(container).trigger(redrawnEvent);
+        }
+      }
+    }
+  
+    $("body").on("shown.bs.collapse", function(event) {
+      var container =  $(event.target).filter(".facet-content").find(".chart_js");
+      redrawPlot(container);
+    });
+  
+    // debouce borrowed from underscore
+    // Returns a function, that, as long as it continues to be invoked, will not
+    // be triggered. The function will be called after it stops being called for
+    // N milliseconds. If `immediate` is passed, trigger the function on the
+    // leading edge, instead of the trailing.
+    debounce = function(func, wait, immediate) {
+      var timeout;
+      return function() {
+        var context = this, args = arguments;
+        var later = function() {
+          timeout = null;
+          if (!immediate) func.apply(context, args);
+        };
+        var callNow = immediate && !timeout;
+        clearTimeout(timeout);
+        timeout = setTimeout(later, wait);
+        if (callNow) func.apply(context, args);
+      };
+    };
+  
+    $(window).on("resize", debounce(function() {
+      $(".chart_js").each(function(i, container) {
+        redrawPlot($(container));
+      });
+    }, 350));
+  
+    // second arg, if provided, is a number of ms we're willing to
+    // wait for the container to have width before giving up -- we'll
+    // set 50ms timers to check back until timeout is expired or the
+    // container is finally visible. The timeout is used when we catch
+    // bootstrap show event, but the animation hasn't barely begun yet -- but
+    // we don't want to wait until it's finished, we want to start rendering
+    // as soon as we can.
+    //
+    // We also will
+    function turnIntoPlot(container, wait_for_visible) {
+      // flot can only render in a a div with a defined width.
+      // for instance, a hidden div can't generally be rendered in (although if you set
+      // an explicit width on it, it might work)
+      //
+      // We'll count on later code that catch bootstrap collapse open to render
+      // on show, for currently hidden divs.
+  
+      // for some reason width sometimes return negative, not sure
+      // why but it's some kind of hidden.
+      if (container.width() > 0) {
+        var height = container.width() * display_ratio;
+  
+        // Need an explicit height to make flot happy.
+        container.height( height )
+  
+        areaChart($(container));
+  
+        $(container).trigger(redrawnEvent);
+      }
+      else if (wait_for_visible > 0) {
+        setTimeout(function() {
+          turnIntoPlot(container, wait_for_visible - 50);
+        }, 50);
+      }
+    }
+  
+       // Takes a div holding a ul of distribution segments produced by
+      // blacklight_range_limit/_range_facets and makes it into
+      // a flot area chart.
+      function areaChart(container) {
+        //flot loaded? And canvas element supported.
+        if (  domDependenciesMet()  ) {
+  
+          // Grab the data from the ul div
+          var series_data = new Array();
+          var pointer_lookup = new Array();
+          var x_ticks = new Array();
+          var min = BlacklightRangeLimit.parseNum($(container).find("ul li:first-child span.from").text());
+          var max = BlacklightRangeLimit.parseNum($(container).find("ul li:last-child span.to").text());
+  
+          $(container).find("ul li").each(function() {
+              var from = BlacklightRangeLimit.parseNum($(this).find("span.from").text());
+              var to = BlacklightRangeLimit.parseNum($(this).find("span.to").text());
+              var count = BlacklightRangeLimit.parseNum($(this).find("span.count").text());
+              var avg = (count / (to - from + 1));
+  
+  
+              //We use the avg as the y-coord, to make the area of each
+              //segment proportional to how many documents it holds.
+              series_data.push( [from, avg ] );
+              series_data.push( [to+1, avg] );
+  
+              x_ticks.push(from);
+  
+              pointer_lookup.push({'from': from, 'to': to, 'count': count, 'label': $(this).find(".facet_select").text() });
+          });
+          var max_plus_one = BlacklightRangeLimit.parseNum($(container).find("ul li:last-child span.to").text())+1;
+          x_ticks.push( max_plus_one );
+  
+  
+  
+          var plot;
+          var config = $(container).closest('.facet_limit').data('plot-config') || {};
+  
+          try {
+            plot = $.plot($(container), [series_data],
+                $.extend(true, config, {
+                yaxis: {  ticks: [], min: 0, autoscaleMargin: 0.1},
+              //xaxis: { ticks: x_ticks },
+              xaxis: { tickDecimals: 0 }, // force integer ticks
+              series: { lines: { fill: true, steps: true }},
+              grid: {clickable: true, hoverable: true, autoHighlight: false},
+              selection: {mode: "x"}
+            }));
+          }
+          catch(err) {
+            alert(err);
+          }
+  
+          find_segment_for = function_for_find_segment(pointer_lookup);
+          var last_segment = null;
+          $(container).tooltip({'placement': 'bottom', 'trigger': 'manual', 'delay': { show: 0, hide: 100}});
+  
+          $(container).bind("plothover", function (event, pos, item) {
+            segment = find_segment_for(pos.x);
+  
+            if(segment != last_segment) {
+              var title = find_segment_for(pos.x).label  + ' (' + BlacklightRangeLimit.parseNum(segment.count) + ')';
+              $(container).attr("title", title).tooltip("_fixTitle").tooltip("show");
+  
+              last_segment  = segment;
+             }
+          });
+  
+          $(container).bind("mouseout", function() {
+            last_segment = null;
+            $(container).tooltip('hide');
+          });
+          $(container).bind("plotclick", function (event, pos, item) {
+              if ( plot.getSelection() == null) {
+                segment = find_segment_for(pos.x);
+                plot.setSelection( normalized_selection(segment.from, segment.to));
+              }
+          });
+          $(container).bind("plotselected plotselecting", function(event, ranges) {
+              if (ranges != null ) {
+                var from = Math.floor(ranges.xaxis.from);
+                var to = Math.floor(ranges.xaxis.to);
+  
+                var form = $(container).closest(".limit_content").find("form.range_limit");
+                form.find("input.range_begin").val(from);
+                form.find("input.range_end").val(to);
+  
+                var slider_placeholder = $(container).closest(".limit_content").find("[data-slider-placeholder]");
+                if (slider_placeholder) {
+                  slider_placeholder.slider("setValue", [from, to+1]);
+                }
+              }
+          });
+  
+          var form = $(container).closest(".limit_content").find("form.range_limit");
+          form.find("input.range_begin, input.range_end").change(function () {
+             plot.setSelection( form_selection(form, min, max) , true );
+          });
+          $(container).closest(".limit_content").find(".profile .range").on("slide", function(event, ui) {
+            var values = $(event.target).data("slider").getValue();
+            form.find("input.range_begin").val(values[0]);
+            form.find("input.range_end").val(values[1]);
+            plot.setSelection( normalized_selection(values[0], Math.max(values[0], values[1]-1)), true);
+          });
+  
+          // initially entirely selected, to match slider
+          plot.setSelection( {xaxis: { from:min, to:max+0.9999}}  );
+        }
+      }
+  
+  
+      // Send endpoint to endpoint+0.99999 to have display
+      // more closely approximate limiting behavior esp
+      // at small resolutions. (Since we search on whole numbers,
+      // inclusive, but flot chart is decimal.)
+      function normalized_selection(min, max) {
+        max += 0.99999;
+  
+        return {xaxis: { 'from':min, 'to':max}}
+      }
+  
+      function form_selection(form, min, max) {
+        var begin_val = BlacklightRangeLimit.parseNum($(form).find("input.range_begin").val());
+        if (isNaN(begin_val) || begin_val < min) {
+          begin_val = min;
+        }
+        var end_val = BlacklightRangeLimit.parseNum($(form).find("input.range_end").val());
+        if (isNaN(end_val) || end_val > max) {
+          end_val = max;
+        }
+  
+        return normalized_selection(begin_val, end_val);
+      }
+  
+      function function_for_find_segment(pointer_lookup_arr) {
+        return function(x_coord) {
+          for (var i = pointer_lookup_arr.length-1 ; i >= 0 ; i--) {
+            var hash = pointer_lookup_arr[i];
+            if (x_coord >= hash.from)
+              return hash;
+          }
+          return pointer_lookup_arr[0];
+        };
+      }
+  
+      // Check if Flot is loaded, and if browser has support for
+      // canvas object, either natively or via IE excanvas.
+      function domDependenciesMet() {
+        var flotLoaded = (typeof $.plot != "undefined");
+        var canvasAvailable = ((typeof(document.createElement('canvas').getContext) != "undefined") || (typeof  window.CanvasRenderingContext2D != 'undefined' || typeof G_vmlCanvasManager != 'undefined'));
+  
+        return (flotLoaded && canvasAvailable);
+      }
+  });
+  
\ No newline at end of file
diff --git a/app/assets/javascripts/blacklight_range_limit/range_limit_shared.js b/app/assets/javascripts/blacklight_range_limit/range_limit_shared.js
new file mode 100644
index 000000000..74aef9e9e
--- /dev/null
+++ b/app/assets/javascripts/blacklight_range_limit/range_limit_shared.js
@@ -0,0 +1,24 @@
+
+// takes a string and parses into an integer, but throws away commas first, to avoid truncation when there is a comma
+// use in place of javascript's native parseInt
+!function(global) {
+  'use strict';
+
+  var previousBlacklightRangeLimit = global.BlacklightRangeLimit;
+
+  function BlacklightRangeLimit(options) {
+    this.options = options || {};
+  }
+
+  BlacklightRangeLimit.parseNum = function parseNum(str) {
+    str = String(str).replace(/[^0-9]/g, '');
+    return parseInt(str, 10);
+  };
+
+  BlacklightRangeLimit.noConflict = function noConflict() {
+    global.BlacklightRangeLimit = previousBlacklightRangeLimit;
+    return BlacklightRangeLimit;
+  };
+
+  global.BlacklightRangeLimit = BlacklightRangeLimit;
+}(this);
diff --git a/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js b/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js
new file mode 100644
index 000000000..e29464229
--- /dev/null
+++ b/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js
@@ -0,0 +1,130 @@
+// for Blacklight.onLoad:
+
+Blacklight.onLoad(function() {
+        
+  $(".range_limit .profile .range.slider_js").each(function() {
+     var range_element = $(this);
+      
+     var boundaries = min_max(this);
+     var min = boundaries[0];
+     var max = boundaries[1];
+  
+     if (isInt(min) && isInt(max)) {
+       $(this).contents().wrapAll('<div style="display:none" />');
+       
+       var range_element = $(this);
+       var form = $(range_element).closest(".range_limit").find("form.range_limit");
+       var begin_el = form.find("input.range_begin");
+       var end_el = form.find("input.range_end");
+  
+       var placeholder_input = $('<input type="text" data-slider-placeholder="true" style="width:100%;">').appendTo(range_element);
+       
+       // make sure slider is loaded
+       if (placeholder_input.slider !== undefined) {
+        placeholder_input.slider({
+          min: min,
+          max: max+1,
+          value: [min, max+1],
+          tooltip: "hide"
+        });
+  
+        // try to make slider width/orientation match chart's
+        var container      = range_element.closest(".range_limit");
+        var plot           = container.find(".chart_js").data("plot");
+        var slider_el      = container.find(".slider");
+         
+        if (plot && slider_el) { 
+          slider_el.width(plot.width());
+          slider_el.css("display", "block")
+          slider_el.css('margin-right', 'auto');
+          slider_el.css('margin-left', 'auto'); 
+        }
+        else if (slider_el) {
+          slider_el.css("width", "100%");
+        }
+       }
+      
+       // Slider change should update text input values.
+       var parent = $(this).parent();
+       var form = $(parent).closest(".limit_content").find("form.range_limit");
+       $(parent).closest(".limit_content").find(".profile .range").on("slide", function(event, ui) {
+        var values = $(event.target).data("slider").getValue();
+        form.find("input.range_begin").val(values[0]);
+        form.find("input.range_end").val(values[1]);
+       });
+     }
+  
+    begin_el.val(min);
+    end_el.val(max);
+          
+    begin_el.change( function() {
+      var val = BlacklightRangeLimit.parseNum($(this).val());
+      if ( isNaN(val)  || val < min) {
+        //for weird data, set slider at min           
+        val = min;
+      }
+      var values = placeholder_input.data("slider").getValue();
+      values[0] = val;
+      placeholder_input.slider("setValue", values);
+    });
+          
+    end_el.change( function() {
+       var val = BlacklightRangeLimit.parseNum($(this).val());
+       if ( isNaN(val) || val > max ) {
+         //weird entry, set slider to max
+         val = max;
+       }
+      var values = placeholder_input.data("slider").getValue();
+      values[1] = val;
+      placeholder_input.slider("setValue", values);
+    });    
+     
+  });
+  
+  // catch event for redrawing chart, to redraw slider to match width
+  $("body").on("plotDrawn.blacklight.rangeLimit", function(event) {
+    var area       = $(event.target).closest(".limit_content.range_limit");
+    var plot       = area.find(".chart_js").data("plot");
+    var slider_el  = area.find(".slider");
+  
+    if (plot && slider_el) {
+        slider_el.width(plot.width());
+        slider_el.css("display", "block")
+        slider_el.css('margin-right', 'auto');
+        slider_el.css('margin-left', 'auto'); 
+    }
+  });
+  
+  // returns two element array min/max as numbers. If there is a limit applied,
+  // it's boundaries are are limits. Otherwise, min/max in current result
+  // set as sniffed from HTML. Pass in a DOM element for a div.range
+  // Will return NaN as min or max in case of error or other weirdness. 
+  function min_max(range_element) {
+     var current_limit =  $(range_element).closest(".limit_content.range_limit").find(".current")
+     
+     
+     
+     var min = max = BlacklightRangeLimit.parseNum(current_limit.find(".single").text())
+     if ( isNaN(min)) {
+       min = BlacklightRangeLimit.parseNum(current_limit.find(".from").first().text());
+       max = BlacklightRangeLimit.parseNum(current_limit.find(".to").first().text());
+     }
+    
+     if (isNaN(min) || isNaN(max)) {
+        //no current limit, take from results min max included in spans
+        min = BlacklightRangeLimit.parseNum($(range_element).find(".min").first().text());
+        max = BlacklightRangeLimit.parseNum($(range_element).find(".max").first().text());
+     }
+     
+     return [min, max]
+  }
+  
+  
+  // Check to see if a value is an Integer
+  // see: http://stackoverflow.com/questions/3885817/how-to-check-if-a-number-is-float-or-integer
+  function isInt(n) {
+    return n % 1 === 0;
+  }
+  
+  });
+  
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 8b66c7d5d..bb4734825 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -18,5 +18,8 @@
  *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
  *= require bootstrap-datepicker
  *= require single_signon
+ *= require blacklight_advanced_search
+ *= require blacklight_range_limit
+ *= require iiif_print/iiif_print
  *= require_self
  */
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index 72265252c..17eca79a9 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class CatalogController < ApplicationController
+  include BlacklightAdvancedSearch::Controller
+  include BlacklightRangeLimit::ControllerOverride
   include Hydra::Catalog
   include Hydra::Controller::ControllerBehavior
   include BlacklightOaiProvider::Controller
@@ -8,20 +10,33 @@ class CatalogController < ApplicationController
   # These before_action filters apply the hydra access controls
   before_action :enforce_show_permissions, only: :show
 
-  def self.uploaded_field
-    'system_create_dtsi'
+  def self.created_field
+    'date_created_ssim'
+  end
+
+  def self.creator_field
+    'creator_ssim'
   end
 
   def self.modified_field
     'system_modified_dtsi'
   end
 
+  def self.title_field
+    'title_ssim'
+  end
+
+  def self.uploaded_field
+    'system_create_dtsi'
+  end
+
   # CatalogController-scope behavior and configuration for BlacklightIiifSearch
   include BlacklightIiifSearch::Controller
 
   configure_blacklight do |config|
     # IiifPrint index fields
-    config.add_index_field 'all_text_tsimv', highlight: true, helper_method: :render_ocr_snippets
+    config.add_index_field 'all_text_timv'
+    config.add_index_field 'file_set_text_tsimv', label: "Item contents", highlight: true, helper_method: :render_ocr_snippets
 
     # configuration for Blacklight IIIF Content Search
     config.iiif_search = {
@@ -44,18 +59,32 @@ def self.modified_field
     config.advanced_search[:url_key] ||= 'advanced'
     config.advanced_search[:query_parser] ||= 'dismax'
     config.advanced_search[:form_solr_parameters] ||= {}
+    config.advanced_search[:form_facet_partial] ||= "advanced_search_facets_as_select"
 
     config.search_builder_class = IiifPrint::CatalogSearchBuilder
 
+    # Use locally customized AdvSearchBuilder so we can enable blacklight_advanced_search
+    # TODO ROB config.search_builder_class = AdvSearchBuilder
+
     # Show gallery view
     config.view.gallery.partials = %i[index_header index]
     config.view.slideshow.partials = [:index]
 
+    # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
+    # Often, it's because they inadvertently exceeded the character limit of a GET request.
+    config.http_method = :post
+
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
       qt: "search",
       rows: 10,
-      qf: "title_tesim description_tesim creator_tesim keyword_tesim all_text_timv"
+      qf: IiifPrint.config.metadata_fields.keys.map { |attribute| "#{attribute}_tesim" }
+                   .join(' ') << " title_tesim description_tesim all_text_timv file_set_text_tsimv", # the first space character is necessary!
+      "hl": true,
+      "hl.simple.pre": "<span class='highlight'>",
+      "hl.simple.post": "</span>",
+      "hl.snippets": 30,
+      "hl.fragsize": 100
     }
 
     # Specify which field to use in the tag cloud on the homepage.
@@ -81,11 +110,34 @@ def self.modified_field
     config.add_facet_field 'file_format_sim', limit: 5
     config.add_facet_field 'member_of_collections_ssim', limit: 5, label: 'Collections'
 
+
+    # TODO deal with part of facet changes
+    # config.add_facet_field solr_name("part", :facetable), limit: 5, label: 'Part'
+    # config.add_facet_field solr_name("part_of", :facetable), limit: 5
+    # removed # config.add_facet_field solr_name("file_format", :facetable), limit: 5
+    # removed # config.add_facet_field solr_name("contributor", :facetable), label: "Contributor", limit: 5
+    # remvode config.add_facet_field solr_name("refereed", :facetable), limit: 5
+
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
+    # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
+    Rails.root.glob("config/locales/*.yml").each do |path|
+      I18n.load_path << path.to_s
+    end
+    I18n.backend.reload!
+    index_props = DogBiscuits.config.index_properties.collect do |prop|
+      { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
+    end
+    add_index_field config, index_props
+
+    # solr fields to be displayed in the show (single result) view
+    #   The ordering of the field names is the order of the display
+    # show_props = DogBiscuits.config.all_properties
+    # add_show_field config, show_props
+
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
     config.add_index_field 'title_tesim', label: "Title", itemprop: 'name', if: false
@@ -150,6 +202,8 @@ def self.modified_field
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field|
       all_names = config.show_fields.values.map(&:field).join(" ")
+# TODO ROB all_names = (config.show_fields.values.map { |v| v.field.to_s } +
+          #         DogBiscuits.config.all_properties.map { |p| "#{p}_tesim" }).uniq.join(" ")
       title_name = 'title_tesim'
       field.solr_parameters = {
         qf: "#{all_names} file_format_tesim all_text_timv",
@@ -178,6 +232,7 @@ def self.modified_field
     end
 
     config.add_search_field('creator') do |field|
+      # TODO ROB field.label = "Author"
       field.solr_parameters = { "spellcheck.dictionary": "creator" }
       solr_name = 'creator_tesim'
       field.solr_local_parameters = {
@@ -220,6 +275,8 @@ def self.modified_field
       }
     end
 
+    date_fields = ['date_created_tesim', 'sorted_date_isi', 'sorted_month_isi']
+
     config.add_search_field('date_created') do |field|
       field.solr_parameters = {
         "spellcheck.dictionary": "date_created"
@@ -343,16 +400,27 @@ def self.modified_field
       }
     end
 
+    config.add_search_field('source') do |field|
+      solr_name = solr_name("source", :stored_searchable)
+      field.solr_local_parameters = {
+        qf: solr_name,
+        pf: solr_name
+      }
+    end
+
     # "sort results by" select (pulldown)
     # label in pulldown is followed by the name of the SOLR field to sort by and
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
     # label is key, solr field is value
-    config.add_sort_field "score desc, #{uploaded_field} desc", label: "relevance"
-    config.add_sort_field "#{uploaded_field} desc", label: "date uploaded \u25BC"
-    config.add_sort_field "#{uploaded_field} asc", label: "date uploaded \u25B2"
-    config.add_sort_field "#{modified_field} desc", label: "date modified \u25BC"
-    config.add_sort_field "#{modified_field} asc", label: "date modified \u25B2"
+    config.add_sort_field "score desc, #{uploaded_field} desc", label: "Relevance"
+
+    config.add_sort_field "#{title_field} asc", label: "Title"
+    config.add_sort_field "#{creator_field} asc", label: "Author"
+    config.add_sort_field "#{created_field} asc", label: "Published Date (Ascending)"
+    config.add_sort_field "#{created_field} desc", label: "Published Date (Descending)"
+    config.add_sort_field "#{modified_field} asc", label: "Upload Date (Ascending)"
+    config.add_sort_field "#{modified_field} desc", label: "Upload Date (Descending)"
 
     # OAI Config fields
     config.oai = {
diff --git a/app/controllers/saved_searches_controller.rb b/app/controllers/saved_searches_controller.rb
new file mode 100644
index 000000000..f2618be72
--- /dev/null
+++ b/app/controllers/saved_searches_controller.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class SavedSearchesController < ApplicationController
+  include Blacklight::SavedSearches
+
+  helper BlacklightAdvancedSearch::RenderConstraintsOverride
+end
diff --git a/app/controllers/search_history_controller.rb b/app/controllers/search_history_controller.rb
new file mode 100644
index 000000000..a97b2e3ff
--- /dev/null
+++ b/app/controllers/search_history_controller.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class SearchHistoryController < ApplicationController
+  include Blacklight::SearchHistory
+  helper BlacklightAdvancedSearch::RenderConstraintsOverride
+  helper BlacklightRangeLimit::ViewHelperOverride
+  helper RangeLimitHelper
+end
diff --git a/app/models/collection.rb b/app/models/collection.rb
index 39bd58492..2b2298fd8 100644
--- a/app/models/collection.rb
+++ b/app/models/collection.rb
@@ -8,6 +8,7 @@ class Collection < ActiveFedora::Base
   self.indexer = CollectionIndexer
   after_update :remove_featured, if: proc { |collection| collection.private? }
   after_destroy :remove_featured
+  prepend OrderAlready.for(:creator)
 
   def remove_featured
     FeaturedCollection.where(collection_id: id).destroy_all
diff --git a/app/models/generic_work.rb b/app/models/generic_work.rb
index b8b740217..5ee8e9c01 100644
--- a/app/models/generic_work.rb
+++ b/app/models/generic_work.rb
@@ -10,4 +10,7 @@ class GenericWork < ActiveFedora::Base
   validates :title, presence: { message: 'Your work must have a title.' }
 
   self.indexer = GenericWorkIndexer
+
+  prepend OrderAlready.for(:creator)
+
 end
diff --git a/app/models/image.rb b/app/models/image.rb
index e0218ec94..83adf2208 100644
--- a/app/models/image.rb
+++ b/app/models/image.rb
@@ -17,6 +17,8 @@ class Image < ActiveFedora::Base
   include ::Hyrax::BasicMetadata
 
   self.indexer = ImageIndexer
+  prepend OrderAlready.for(:creator)
+
   # Change this to restrict which works can be added as a child.
   # self.valid_child_concerns = []
   validates :title, presence: { message: 'Your work must have a title.' }
diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb
index ad50b6e1e..4410a5bc8 100644
--- a/app/models/search_builder.rb
+++ b/app/models/search_builder.rb
@@ -2,6 +2,10 @@
 
 class SearchBuilder < Blacklight::SearchBuilder
   include Blacklight::Solr::SearchBuilderBehavior
+  include BlacklightRangeLimit::RangeLimitBuilder
+  include BlacklightAdvancedSearch::AdvancedSearchBuilder
   include Hydra::AccessControlsEnforcement
   include Hyrax::SearchFilters
+
+  self.default_processor_chain += %i[add_advanced_parse_q_to_solr add_advanced_search_to_solr]
 end
diff --git a/app/views/advanced/_advanced_search_help.html.erb b/app/views/advanced/_advanced_search_help.html.erb
new file mode 100644
index 000000000..df18fcbc5
--- /dev/null
+++ b/app/views/advanced/_advanced_search_help.html.erb
@@ -0,0 +1,26 @@
+<div class='card card-default'>
+  <div class="card-body">
+    <h4 class="card-title">Search tips</h4>
+    <ul class="advanced-help">
+     <li>Select "match all" to require all fields.
+     </li>
+
+     <li>Select "match any" to find at least one field.
+     </li>
+
+     <li>Combine keywords and attributes to find specific items.
+     </li>
+
+     <li>Search by date with format: YYYYMMDD, YYYYMM or YYYY. Do not use "-", "/", or any other special characters.</li>
+
+     <li>Use quotation marks to search as a phrase.
+
+     <li>Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
+
+     <li>Use "-" before a word or phrase to exclude.
+
+     <li>Use "OR", "AND", and "NOT" to create complex boolean logic. You can use parentheses in your complex expressions. </li>
+     <li>Truncation and wildcards are not supported - word-stemming is done automatically.</li>
+   </ul>
+  </div>
+</div>
diff --git a/app/views/blacklight_range_limit/_range_limit_panel.html.erb b/app/views/blacklight_range_limit/_range_limit_panel.html.erb
new file mode 100644
index 000000000..738e6e3d7
--- /dev/null
+++ b/app/views/blacklight_range_limit/_range_limit_panel.html.erb
@@ -0,0 +1,125 @@
+<%- # requires solr_config local passed in
+  field_config = range_config(field_name)
+  label = facet_field_label(field_name)
+
+  input_label_range_begin = field_config[:input_label_range_begin] || t("blacklight.range_limit.range_begin", field_label: label)
+  input_label_range_end   = field_config[:input_label_range_end] || t("blacklight.range_limit.range_end", field_label: label)
+  maxlength = field_config[:maxlength]
+-%>
+
+
+<%# NOTE(dewey4iv): leaving the styling here for now so that Christy can test out what she wants this to look like %>
+<style>
+  .year-input {
+    font-size: 1em;
+  }
+
+  .limit_content.range_limit {
+    margin: .5em;
+  }
+  .limit_content.range_limit .range_input_wrapper {
+    margin: 5px 0;
+  }
+
+  .limit_content.range_limit .range_input_wrapper span {
+    display: block;
+    line-height: 1;
+  }
+
+  .limit_content.range_limit .range_input_wrapper:nth-child(2) {
+    margin-bottom: 25px;
+  }
+</style>
+
+<div class="limit_content range_limit">
+  <% if has_selected_range_limit?(field_name) %>
+    <ul class="current list-unstyled facet-values">
+      <li class="selected">
+        <span class="facet-label">
+          <span class="selected"><%= range_display(field_name) %></span>
+          <%= link_to remove_range_param(field_name), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
+            <span class="glyphicon glyphicon-remove"></span>
+            <span class="sr-only">[<%= t('blacklight.range_limit.remove_limit') %>]</span>
+          <% end %>
+        </span>
+        <span class="selected facet-count"><%= number_with_delimiter(@response.total) %></span>
+      </li>
+    </ul>
+
+  <% end %>
+
+  <% unless selected_missing_for_range_limit?(field_name) %>
+    <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{field_name}"].join(' ') do %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:page)) %>
+
+      <!--
+        we need to include a dummy search_field parameter if none exists,
+        to trick blacklight into displaying actual search results instead
+        of home page. Not a great solution, but easiest for now.
+      -->
+      <% unless params.has_key?(:search_field) %>
+        <%= hidden_field_tag("search_field", "dummy_range") %>
+      <% end %>
+
+      <div class="range_input_wrapper">
+        <span class="year-input">Between year:</span>
+        <%= render_range_input(field_name, :begin, input_label_range_begin, maxlength) %>
+      </div>
+      <div class="range_input_wrapper">
+        <span class="year-input">and year:</span>
+        <%= render_range_input(field_name, :end, input_label_range_end, maxlength) %>
+      </div>
+      <%= submit_tag t('blacklight.range_limit.submit_limit'), class: "#{BlacklightRangeLimit.classes[:submit]} btn btn-default btn-block" %>
+    <% end %>
+  <% end %>
+
+  <!-- no results profile if missing is selected -->
+  <% unless selected_missing_for_range_limit?(field_name) %>
+    <!--
+      you can hide this if you want, but it has to be on page if you want
+      JS slider and calculated facets to show up, JS sniffs it.
+    -->
+    <div class="profile">
+        <% if stats_for_field?(field_name) %>
+          <!-- No stats information found for field  in search response -->
+        <% end %>
+
+        <% if (min = range_results_endpoint(field_name, :min)) &&
+              (max = range_results_endpoint(field_name, :max)) %>
+          <p class="range subsection <%= "slider_js" unless field_config[:slider_js] == false  %>">
+            <!-- Current results range from <span class="min"><%= range_results_endpoint(field_name, :min) %></span> to <span class="max"><%= range_results_endpoint(field_name, :max) %></span> -->
+          </p>
+
+          <% if field_config[:segments] != false %>
+            <div class="distribution subsection <%= 'chart_js' unless field_config[:chart_js] == false %>">
+              <!--
+                if we already fetched segments from solr, display them
+                here. Otherwise, display a link to fetch them, which JS
+                will AJAX fetch.
+              -->
+              <% if solr_range_queries_to_a(field_name).length > 0 %>
+
+                <%= render(:partial => "blacklight_range_limit/range_segments", :locals => {:solr_field => field_name}) %>
+
+              <% else %>
+                <%= link_to('View distribution', main_app.url_for(search_state.to_h.merge(action: 'range_limit', range_field: field_name, range_start: min, range_end: max)), :class => "load_distribution") %>
+              <% end %>
+            </div>
+          <% end %>
+        <% end %>
+
+        <% if (stats = stats_for_field(field_name)) %>
+          <ul class="missing list-unstyled facet-values subsection">
+            <li>
+              <span class="facet-label">
+                <%= link_to BlacklightRangeLimit.labels[:missing], add_range_missing(field_name) %>
+              </span>
+              <span class="facet-count">
+                <%= number_with_delimiter(stats["missing"]) %>
+              </span>
+            </li>
+          </ul>
+        <% end %>
+    </div>
+  <% end %>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 73a5d0f50..49f57635c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -70,9 +70,10 @@
   mount Qa::Engine => '/authorities'
 
   mount Blacklight::Engine => '/'
+  mount BlacklightAdvancedSearch::Engine => '/'
   mount Hyrax::Engine, at: '/'
   mount Bulkrax::Engine, at: '/' if ENV.fetch('HYKU_BULKRAX_ENABLED', 'true') == 'true'
-
+  mount HykuKnapsack::Engine, at: '/'
   concern :searchable, Blacklight::Routes::Searchable.new
   concern :exportable, Blacklight::Routes::Exportable.new
 
@@ -82,6 +83,7 @@
     concerns :oai_provider
 
     concerns :searchable
+    concerns :range_searchable
   end
 
   resources :solr_documents, only: [:show], path: '/catalog', controller: 'catalog' do

From 0a6a2667c691c216d000cd8e51d1621dddcab21a Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Thu, 21 Sep 2023 00:01:30 -0700
Subject: [PATCH 002/126] add a few content blocks in from adventist

---
 .../content_blocks_controller_decorator.rb    | 18 ++++++++
 app/views/hyrax/content_blocks/_form.html.erb | 42 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 app/controllers/hyrax/content_blocks_controller_decorator.rb

diff --git a/app/controllers/hyrax/content_blocks_controller_decorator.rb b/app/controllers/hyrax/content_blocks_controller_decorator.rb
new file mode 100644
index 000000000..348ac4f20
--- /dev/null
+++ b/app/controllers/hyrax/content_blocks_controller_decorator.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax v3.4.0 to add home_text to permitted_params - Adding themes
+module Hyrax
+  module ContentBlocksControllerDecorator
+    # override hyrax v2.9.0 added the home_text content block to permitted_params - Adding Themes
+    def permitted_params
+      params.require(:content_block).permit(:marketing,
+        :announcement,
+        :home_text,
+        :homepage_about_section_heading,
+        :homepage_about_section_content,
+        :researcher)
+    end
+  end
+end
+
+Hyrax::ContentBlocksController.prepend Hyrax::ContentBlocksControllerDecorator
diff --git a/app/views/hyrax/content_blocks/_form.html.erb b/app/views/hyrax/content_blocks/_form.html.erb
index ccf22f70f..76d7e0d26 100644
--- a/app/views/hyrax/content_blocks/_form.html.erb
+++ b/app/views/hyrax/content_blocks/_form.html.erb
@@ -15,6 +15,12 @@
     <li>
       <a href="#researcher" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.featured_researcher') %></a>
     </li>
+    <li>
+      <a href="#homepage_about_section_heading" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.homepage_about_section_heading') %></a>
+    </li>
+    <li>
+      <a href="#homepage_about_section_content" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.homepage_about_section_content') %></a>
+    </li>
   </ul>
   <div class="tab-content">
     <div id="announcement_text" class="tab-pane active">
@@ -90,6 +96,42 @@
         <% end %>
       </div>
     </div>
+    <div id="homepage_about_section_heading" class="tab-pane">
+      <div class="panel panel-default labels">
+        <%= simple_form_for ContentBlock.for(:homepage_about_section_heading), url: hyrax.content_block_path(ContentBlock.for(:homepage_about_section_heading)), html: {class: 'nav-safety'} do |f| %>
+          <div class="panel-body">
+            <div class="field form-group">
+                <%= f.label :homepage_about_section_heading %><br />
+                <%# the following line was changed from hyrax to give some context for what this context block does %>
+                <p class="content-block-instructions"><%= t(:'hyrax.content_blocks.instructions.homepage_about_section_heading_instructions') %></p>
+                <%= f.text_area :homepage_about_section_heading, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="panel-footer">
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
+            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div id="homepage_about_section_content" class="tab-pane">
+      <div class="panel panel-default labels">
+        <%= simple_form_for ContentBlock.for(:homepage_about_section_content), url: hyrax.content_block_path(ContentBlock.for(:homepage_about_section_content)), html: {class: 'nav-safety'} do |f| %>
+          <div class="panel-body">
+            <div class="field form-group">
+                <%= f.label :homepage_about_section_content %><br />
+                <%# the following line was changed from hyrax to give some context for what this context block does %>
+                <p class="content-block-instructions"><%= t(:'hyrax.content_blocks.instructions.homepage_about_section_content_instructions') %></p>
+                <%= f.text_area :homepage_about_section_content, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
+            </div>
+          </div>
+          <div class="panel-footer">
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
+            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
   </div>
 </div>
 <%= tinymce :content_block %>

From f78eb75f5aa6e08f3e3c6514affe6649975adfb1 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Thu, 21 Sep 2023 00:02:33 -0700
Subject: [PATCH 003/126] do not need full controller override

---
 .../hyrax/content_blocks_controller.rb        | 44 -------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 app/controllers/hyrax/content_blocks_controller.rb

diff --git a/app/controllers/hyrax/content_blocks_controller.rb b/app/controllers/hyrax/content_blocks_controller.rb
deleted file mode 100644
index 60edc5286..000000000
--- a/app/controllers/hyrax/content_blocks_controller.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE Hyrax v3.4.0 to add home_text to permitted_params - Adding themes
-module Hyrax
-  class ContentBlocksController < ApplicationController
-    load_and_authorize_resource
-    with_themed_layout 'dashboard'
-
-    def edit
-      add_breadcrumb t(:'hyrax.controls.home'), root_path
-      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb t(:'hyrax.admin.sidebar.configuration'), '#'
-      add_breadcrumb t(:'hyrax.admin.sidebar.content_blocks'), hyrax.edit_content_blocks_path
-    end
-
-    def update
-      respond_to do |format|
-        if @content_block.update(value: update_value_from_params)
-          format.html { redirect_to hyrax.edit_content_blocks_path, notice: t(:'hyrax.content_blocks.updated') }
-        else
-          format.html { render :edit }
-        end
-      end
-    end
-
-    private
-
-      # override hyrax v2.9.0 added the home_text content block to permitted_params - Adding Themes
-      def permitted_params
-        params.require(:content_block).permit(:marketing,
-                                              :announcement,
-                                              :home_text,
-                                              :researcher)
-      end
-
-      # When a request comes to the controller, it will be for one and
-      # only one of the content blocks. Params always looks like:
-      #   {'about_page' => 'Here is an awesome about page!'}
-      # So reach into permitted params and pull out the first value.
-      def update_value_from_params
-        permitted_params.values.first
-      end
-  end
-end

From 29873b1a0841f89559263718fc622993e122533d Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Thu, 21 Sep 2023 00:08:38 -0700
Subject: [PATCH 004/126] use the new content blocks

---
 app/controllers/hyrax/homepage_controller.rb  | 131 ------------------
 .../hyrax/homepage_controller_decorator.rb    |  20 +++
 2 files changed, 20 insertions(+), 131 deletions(-)
 delete mode 100644 app/controllers/hyrax/homepage_controller.rb
 create mode 100644 app/controllers/hyrax/homepage_controller_decorator.rb

diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
deleted file mode 100644
index a38eda845..000000000
--- a/app/controllers/hyrax/homepage_controller.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE: Hyrax v2.9.0 to add home_text content block to the index method - Adding themes
-# OVERRIDE: Hyrax v2.9.0 from Hyrax v2.9.0 to add facets to home page - inheriting from
-# CatalogController rather than ApplicationController
-# OVERRIDE: Hyrax v2.9.0 from Hyrax v2.9.0 to add inject_theme_views method for theming
-# OVERRIDE: Hyrax v2.9.0 to add search_action_url method from Blacklight 6.23.0 to make facet links to go to /catalog
-# OVERRIDE: Hyrax v2.9.0 to add .sort_by to return collections in alphabetical order by title on the homepage
-# OVERRIDE: Hyrax v2.9.0 add all_collections page for IR theme
-# OVERRIDE: Hyrax v2.9.0 to add facet counts for resource types for IR theme
-# OVERRIDE: Hyrax v. 2.9.0 to add @featured_collection_list to index method
-
-module Hyrax
-  # Changed to inherit from CatalogController for home page facets
-  class HomepageController < CatalogController
-    # Adds Hydra behaviors into the application controller
-    include Blacklight::SearchContext
-    include Blacklight::SearchHelper
-    include Blacklight::AccessControls::Catalog
-
-    around_action :inject_theme_views
-
-    # The search builder for finding recent documents
-    # Override of Blacklight::RequestBuilders
-    def search_builder_class
-      Hyrax::HomepageSearchBuilder
-    end
-
-    class_attribute :presenter_class
-    self.presenter_class = Hyrax::HomepagePresenter
-    layout 'homepage'
-    helper Hyrax::ContentBlockHelper
-
-    # override hyrax v2.9.0 added @home_text - Adding Themes
-    def index
-      @presenter = presenter_class.new(current_ability, collections)
-      @featured_researcher = ContentBlock.for(:researcher)
-      @marketing_text = ContentBlock.for(:marketing)
-      @home_text = ContentBlock.for(:home_text)
-      @featured_work_list = FeaturedWorkList.new
-      # OVERRIDE here to add featured collection list
-      @featured_collection_list = FeaturedCollectionList.new
-      @announcement_text = ContentBlock.for(:announcement)
-      recent
-      ir_counts if home_page_theme == 'institutional_repository'
-
-      # override hyrax v2.9.0 added for facets on homepage - Adding Themes
-      (@response, @document_list) = search_results(params)
-
-      respond_to do |format|
-        format.html { store_preferred_view }
-        format.rss  { render layout: false }
-        format.atom { render layout: false }
-        format.json do
-          @presenter = Blacklight::JsonPresenter.new(@response,
-                                                     @document_list,
-                                                     facets_from_request,
-                                                     blacklight_config)
-        end
-        additional_response_formats(format)
-        document_export_formats(format)
-      end
-    end
-
-    def browserconfig; end
-
-    def all_collections
-      @presenter = presenter_class.new(current_ability, collections)
-      @marketing_text = ContentBlock.for(:marketing)
-      @announcement_text = ContentBlock.for(:announcement)
-      @collections = collections(rows: 100_000)
-      ir_counts if home_page_theme == 'institutional_repository'
-    end
-
-    # Added from Blacklight 6.23.0 to change url for facets on home page
-    protected
-
-      # Default route to the search action (used e.g. in global partials). Override this method
-      # in a controller or in your ApplicationController to introduce custom logic for choosing
-      # which action the search form should use
-      def search_action_url(options = {})
-        # Rails 4.2 deprecated url helpers accepting string keys for 'controller' or 'action'
-        main_app.search_catalog_path(options)
-      end
-
-    private
-
-      # Return 6 collections
-      def collections(rows: 6)
-        builder = Hyrax::CollectionSearchBuilder.new(self)
-                                                .rows(rows)
-        response = repository.search(builder)
-        # adding .sort_by to return collections in alphabetical order by title on the homepage
-        response.documents.sort_by(&:title)
-      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-        []
-      end
-
-      def recent
-        # grab any recent documents
-        (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 6)
-      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-        @recent_documents = []
-      end
-
-      # OVERRIDE: Hyrax v2.9.0 to add facet counts for resource types for IR theme
-      def ir_counts
-        @ir_counts = get_facet_field_response('resource_type_sim', {}, "f.resource_type_sim.facet.limit" => "-1")
-      end
-
-      def sort_field
-        "date_uploaded_dtsi desc"
-      end
-
-      # Add this method to prepend the theme views into the view_paths
-      def inject_theme_views
-        if home_page_theme && home_page_theme != 'default_home'
-          original_paths = view_paths
-          home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
-          prepend_view_path(home_theme_view_path)
-          yield
-          # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-          # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
-          view_paths=(original_paths)
-          # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-        else
-          yield
-        end
-      end
-  end
-end
diff --git a/app/controllers/hyrax/homepage_controller_decorator.rb b/app/controllers/hyrax/homepage_controller_decorator.rb
new file mode 100644
index 000000000..58712bfd7
--- /dev/null
+++ b/app/controllers/hyrax/homepage_controller_decorator.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax 3.5 to add content blocks
+module Hyrax
+  module HomepageControllerDecorator
+
+    def index
+    @presenter = presenter_class.new(current_ability, collections)
+    @featured_researcher = ContentBlock.for(:researcher)
+    @marketing_text = ContentBlock.for(:marketing)
+    @featured_work_list = FeaturedWorkList.new
+    @announcement_text = ContentBlock.for(:announcement)
+    @homepage_about_section_heading = ContentBlock.for(:homepage_about_section_heading)
+    @homepage_about_section_content = ContentBlock.for(:homepage_about_section_content)
+    recent
+  end
+  end
+end
+
+Hyrax::HomepageController.prepend Hyrax::HomepageControllerDecorator

From 7510b7c67825cda9f468bb761a3e880f823b440c Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Thu, 21 Sep 2023 00:17:46 -0700
Subject: [PATCH 005/126] iiif rodeo includes

---
 config/application.rb | 61 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 850a2b515..acf7c0523 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,35 @@
 Bundler.require(*groups)
 
 module Hyku
+  # Providing a common method to ensure consistent UTF-8 encoding.  Also removing the tricksy Byte
+  # Order Marker character which is an invisible 0 space character.
+  #
+  # @note In testing, we encountered errors with the file's character encoding
+  #       (e.g. `Encoding::UndefinedConversionError`).  The following will force the encoding to
+  #       UTF-8 and replace any invalid or undefined characters from the original encoding with a
+  #       "?".
+  #
+  #       Given that we still have the original, and this is a derivative, the forced encoding
+  #       should be acceptable.
+  #
+  # @param [String]
+  # @return [String]
+  #
+  # @see https://sentry.io/organizations/scientist-inc/issues/3773392603/?project=6745020&query=is%3Aunresolved&referrer=issue-stream
+  # @see https://github.com/samvera-labs/bulkrax/pull/689
+  # @see https://github.com/samvera-labs/bulkrax/issues/688
+  # @see https://github.com/scientist-softserv/adventist-dl/issues/179
+  def self.utf_8_encode(string)
+    string
+      .encode(Encoding.find('UTF-8'), invalid: :replace, undef: :replace, replace: "?")
+      .delete("\xEF\xBB\xBF")
+  end
+
   class Application < Rails::Application
+    # Add this line to load the lib folder first because we need
+    # IiifPrint::SplitPdfs::AdventistPagesToJpgsSplitter
+    config.autoload_paths.unshift("#{Rails.root}/lib")
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -33,22 +61,37 @@ class Application < Rails::Application
     end
 
     config.to_prepare do
-      # Allows us to use decorator files in the app directory
+
+      # By default plain text files are not processed for text extraction.  In adding
+      # Adventist::TextFileTextExtractionService to the beginning of the services array we are
+      # enabling text extraction from plain text files.
+      Hyrax::DerivativeService.services = [
+        Adventist::TextFileTextExtractionService,
+        IiifPrint::PluggableDerivativeService]
+
+      # When you are ready to use the derivative rodeo instead of the pluggable uncomment the
+      # following and comment out the preceding Hyrax::DerivativeService.service
+      #
+      # Hyrax::DerivativeService.services = [
+      #   Adventist::TextFileTextExtractionService,
+      #   IiifPrint::DerivativeRodeoService,
+      #   Hyrax::FileSetDerivativesService]
+
+      DerivativeRodeo::Generators::HocrGenerator.additional_tessearct_options = "-l eng_best"
+
+      # Allows us to use decorator files
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")).sort.each do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-    end
 
-    config.to_prepare do
-      # Allows us to use decorator files in the app directory
       Dir.glob(File.join(File.dirname(__FILE__), "../lib/**/*_decorator*.rb")).sort.each do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-    end
 
-    # OAI additions
-    Dir.glob(File.join(File.dirname(__FILE__), "../lib/oai/**/*.rb")).sort.each do |c|
-      Rails.configuration.cache_classes ? require(c) : load(c)
+      # OAI additions
+      Dir.glob(File.join(File.dirname(__FILE__), "../lib/oai/**/*.rb")).sort.each do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
+      end
     end
 
     # resolve reloading issue in dev mode
@@ -67,6 +110,8 @@ class Application < Rails::Application
       Object.include(AccountSwitch)
     end
 
+    # copies tinymce assets directly into public/assets
+    config.tinymce.install = :copy
     ##
     # Psych Allow YAML Classes
     #

From 3f22a3353508fa9c277b1762372182bd04b4856b Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Thu, 21 Sep 2023 01:06:38 -0700
Subject: [PATCH 006/126] remove dogbiscuit crossover, fix routes

---
 app/controllers/catalog_controller.rb | 19 ++++++++++---------
 config/routes.rb                      |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index 17eca79a9..c50f887b0 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -123,15 +123,16 @@ def self.uploaded_field
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
-    # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
-    Rails.root.glob("config/locales/*.yml").each do |path|
-      I18n.load_path << path.to_s
-    end
-    I18n.backend.reload!
-    index_props = DogBiscuits.config.index_properties.collect do |prop|
-      { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
-    end
-    add_index_field config, index_props
+    # TODO ROB
+#     # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
+#     Rails.root.glob("config/locales/*.yml").each do |path|
+#       I18n.load_path << path.to_s
+#     end
+#     I18n.backend.reload!
+#     index_props = DogBiscuits.config.index_properties.collect do |prop|
+#       { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
+#     end
+#     add_index_field config, index_props
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
diff --git a/config/routes.rb b/config/routes.rb
index 49f57635c..f0a2a3753 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,7 @@
 
 Rails.application.routes.draw do # rubocop:disable Metrics/BlockLength
   resources :identity_providers
+  concern :range_searchable, BlacklightRangeLimit::Routes::RangeSearchable.new
   concern :iiif_search, BlacklightIiifSearch::Routes.new
   concern :oai_provider, BlacklightOaiProvider::Routes.new
 

From 36590bc0fe34569bd56cd3eba5ca6cac70bef5ba Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Thu, 21 Sep 2023 10:12:59 -0700
Subject: [PATCH 007/126] add spec for search history

---
 .../search_history_controller_spec.rb         | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 spec/controllers/search_history_controller_spec.rb

diff --git a/spec/controllers/search_history_controller_spec.rb b/spec/controllers/search_history_controller_spec.rb
new file mode 100644
index 000000000..d9a349279
--- /dev/null
+++ b/spec/controllers/search_history_controller_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec.describe SearchHistoryController do
+  routes { Blacklight::Engine.routes }
+
+  describe 'index' do
+    let(:one) { Search.create }
+    let(:two) { Search.create }
+    let(:three) { Search.create }
+
+    it 'only fetches searches with ids in the session' do
+      session[:history] = [one.id, three.id]
+      get :index
+      searches = assigns(:searches)
+      expect(searches).to include(one)
+      expect(searches).not_to include(two)
+    end
+
+    it 'tolerates bad ids in session' do
+      session[:history] = [one.id, three.id, 'NOT_IN_DB']
+      get :index
+      searches = assigns(:searches)
+      expect(searches).to include(one)
+      expect(searches).to include(three)
+    end
+
+    it 'does not fetch any searches if there is no history' do
+      session[:history] = []
+      get :index
+      searches = assigns(:searches)
+      expect(searches).to be_empty
+    end
+  end
+end

From 326576ecb20fe033d777f7c3276e533744825609 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Thu, 21 Sep 2023 10:25:09 -0700
Subject: [PATCH 008/126] add missing methods to avoid content block errors

---
 .../hyrax/homepage_controller_decorator.rb    | 20 +++++++++++++++++++
 app/models/content_block.rb                   | 20 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/hyrax/homepage_controller_decorator.rb

diff --git a/app/controllers/hyrax/homepage_controller_decorator.rb b/app/controllers/hyrax/homepage_controller_decorator.rb
new file mode 100644
index 000000000..826a8599b
--- /dev/null
+++ b/app/controllers/hyrax/homepage_controller_decorator.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax 3.5 to add content blocks
+module Hyrax
+  module HomepageControllerDecorator
+
+    def index
+    @presenter = presenter_class.new(current_ability, collections)
+    @featured_researcher = ContentBlock.for(:researcher)
+    @marketing_text = ContentBlock.for(:marketing)
+    @featured_work_list = FeaturedWorkList.new
+    @announcement_text = ContentBlock.for(:announcement)
+    @homepage_about_section_heading = ContentBlock.for(:homepage_about_section_heading)
+    @homepage_about_section_content = ContentBlock.for(:homepage_about_section_content)
+    recent
+    end
+  end
+end
+
+Hyrax::HomepageController.prepend Hyrax::HomepageControllerDecorator
diff --git a/app/models/content_block.rb b/app/models/content_block.rb
index c9e72b26e..4c00535b3 100644
--- a/app/models/content_block.rb
+++ b/app/models/content_block.rb
@@ -16,7 +16,9 @@ class ContentBlock < ApplicationRecord
     help: :help_page,
     terms: :terms_page,
     agreement: :agreement_page,
-    home_text: :home_text
+    home_text: :home_text, 
+    homepage_about_section_heading: :homepage_about_section_heading,
+    homepage_about_section_content: :homepage_about_section_content
   }.freeze
 
   # NOTE: method defined outside the metaclass wrapper below because
@@ -90,6 +92,22 @@ def home_text=(value)
       home_text.update(value: value)
     end
 
+    def homepage_about_section_heading
+      find_or_create_by(name: 'homepage_about_section_heading')
+    end
+
+    def homepage_about_section_heading=(value)
+      homepage_about_section_heading.update(value: value)
+    end
+
+    def homepage_about_section_content
+      find_or_create_by(name: 'homepage_about_section_content')
+    end
+
+    def homepage_about_section_content=(value)
+      homepage_about_section_content.update(value: value)
+    end
+
     def about_page
       find_or_create_by(name: 'about_page')
     end

From 189917593629103f6c21031d575fab6fcc404ec2 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Fri, 22 Sep 2023 15:28:48 -0400
Subject: [PATCH 009/126] Update Hyku Gemfile.lock

---
 Gemfile.lock | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4436734e8..f471801a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -210,6 +210,9 @@ GEM
       bootstrap-sass (~> 3.0)
       openseadragon (>= 0.2.0)
       rails
+    blacklight_advanced_search (6.4.1)
+      blacklight (~> 6.0, >= 6.0.1)
+      parslet
     blacklight_iiif_search (1.0.0)
       blacklight (~> 6.0)
       iiif-presentation
@@ -217,6 +220,10 @@ GEM
     blacklight_oai_provider (6.1.1)
       blacklight (~> 6.0)
       oai (~> 1.0)
+    blacklight_range_limit (6.5.0)
+      blacklight (~> 6.10)
+      jquery-rails
+      rails (>= 4.2, < 6)
     bolognese (1.11.0)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
@@ -871,6 +878,8 @@ GEM
     openseadragon (0.6.0)
       rails (> 3.2.0)
     optimist (3.0.1)
+    order_already (0.3.1)
+      rails-html-sanitizer (~> 1.4)
     orm_adapter (0.5.0)
     os (1.1.4)
     parallel (1.23.0)
@@ -1296,7 +1305,9 @@ DEPENDENCIES
   apartment
   aws-sdk-sqs
   blacklight (~> 6.7)
+  blacklight_advanced_search
   blacklight_oai_provider (~> 6.1, >= 6.1.1)
+  blacklight_range_limit (= 6.5.0)
   bolognese (>= 1.9.10)
   bootstrap-datepicker-rails
   bulkrax (~> 5.3)
@@ -1338,6 +1349,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)

From 4dc0dcd362a56c5ed94cacaff8f881305a121175 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Fri, 22 Sep 2023 13:08:16 -0700
Subject: [PATCH 010/126] add option to support good job for background jobs
 instead of sidekiq

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  | 17 +++++++
 bin/worker                                    |  8 +++-
 config/environments/development.rb            |  7 ++-
 config/initializers/good_job.rb               | 44 +++++++++++++++++++
 config/initializers/sidekiq.rb                | 17 ++++---
 config/routes.rb                              | 12 ++++-
 db/migrate/20230406183814_create_good_jobs.rb | 38 ++++++++++++++++
 8 files changed, 133 insertions(+), 11 deletions(-)
 create mode 100644 config/initializers/good_job.rb
 create mode 100644 db/migrate/20230406183814_create_good_jobs.rb

diff --git a/Gemfile b/Gemfile
index 868c97ba3..630f95a0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ gem 'factory_bot_rails', group: %i[test]
 gem 'fcrepo_wrapper', '~> 0.4', group: %i[development test]
 gem 'flipflop', '~> 2.6.0' # waiting for hyrax 4 upgrade
 gem 'flutie'
+gem 'good_job'
 gem 'hyrax', '~> 3.5.0'
 gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'main'
 gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'main'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4436734e8..88b7a3175 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,6 +13,7 @@ GIT
   branch: upstream_main
   specs:
     hyku_knapsack (0.0.1)
+      good_job
       rails (>= 5.2.0)
 
 GIT
@@ -448,6 +449,8 @@ GEM
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubi (1.12.0)
+    et-orbi (1.2.7)
+      tzinfo
     ethon (0.16.0)
       ffi (>= 1.15.0)
     excon (0.71.1)
@@ -473,11 +476,23 @@ GEM
     flutie (2.2.0)
     font-awesome-rails (4.7.0.8)
       railties (>= 3.2, < 8.0)
+    fugit (1.8.1)
+      et-orbi (~> 1, >= 1.2.7)
+      raabro (~> 1.4)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
     geocoder (1.8.1)
     globalid (1.1.0)
       activesupport (>= 5.0)
+    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.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
@@ -904,6 +919,7 @@ GEM
       nokogiri (~> 1.6)
       rails (>= 5.0, < 7.1)
       rdf
+    raabro (1.4.0)
     racc (1.7.1)
     rack (2.2.8)
     rack-oauth2 (1.21.3)
@@ -1318,6 +1334,7 @@ DEPENDENCIES
   fcrepo_wrapper (~> 0.4)
   flipflop (~> 2.6.0)
   flutie
+  good_job
   hyku_knapsack!
   hyrax (~> 3.5.0)
   hyrax-doi!
diff --git a/bin/worker b/bin/worker
index b7605486b..7698b346e 100755
--- a/bin/worker
+++ b/bin/worker
@@ -9,4 +9,10 @@ else
   puts 'DATABASE_URL not set, no pool change needed'
 end
 
-exec "echo $DATABASE_URL && bundle exec sidekiq"
+queue = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
+case queue
+when 'sidekiq'
+  exec "echo $DATABASE_URL && bundle exec sidekiq"
+when 'good_job'
+  exec "echo $DATABASE_URL && bundle exec good_job start"
+end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9bafa102c..500278da4 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -4,7 +4,12 @@
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = !!Sidekiq.server?
+  if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
+    config.cache_classes = !!Sidekiq.server?
+  else
+    config.cache_classes = false
+  end
+
 
   # Do not eager load code on boot.
   config.eager_load = false
diff --git a/config/initializers/good_job.rb b/config/initializers/good_job.rb
new file mode 100644
index 000000000..7929a5d4b
--- /dev/null
+++ b/config/initializers/good_job.rb
@@ -0,0 +1,44 @@
+
+# frozen_string_literal: true
+
+if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'good_job'
+  Rails.application.configure do
+    # Configure options individually...
+    config.good_job.preserve_job_records = true
+    config.good_job.retry_on_unhandled_error = false
+    config.good_job.on_thread_error = ->(exception) { Raven.capture_exception(exception) }
+    config.good_job.execution_mode = :external
+    # config.good_job.queues = '*'
+    config.good_job.shutdown_timeout = 60 # seconds
+    config.good_job.poll_interval = 5
+    # config.good_job.enable_cron = true
+    # config.good_job.cron = { example: { cron: '0 * * * *', class: 'ExampleJob'  } }
+  end
+
+  # Wrapping this in an after_initialize block to ensure that all constants are loaded
+  Rails.application.config.after_initialize do
+    # baseline of 0, higher is sooner
+
+    # Commented out the following two jobs because they were
+    # specfically used for the sdapi ingests.
+    # see sdapi_ingest_script directory and
+    # ref: https://github.com/scientist-softserv/adventist-dl/issues/468
+    # CollectionMembershipJob.priority = 70
+    # UpdateCollectionMembershipJob.priority = 60
+    Bulkrax::ScheduleRelationshipsJob.priority = 50
+    CreateDerivativesJob.priority = 40
+    CharacterizeJob.priority = 30
+    Hyrax::GrantEditToMembersJob.priority = 10
+    ImportUrlJob.priority = 10
+    IngestJob.priority = 10
+    ApplicationJob.priority = 0
+    AttachFilesToWorkJob.priority = -1
+    Bulkrax::ImportWorkJob.priority = -5
+    Bulkrax::ImportFileSetJob.priority = -15
+    Bulkrax::CreateRelationshipsJob.priority = -20
+    Bulkrax::ImporterJob.priority = -20
+    IiifPrint::Jobs::CreateRelationshipsJob.priority = -20
+    ContentDepositEventJob.priority = -50
+    ContentUpdateEventJob.priority = -50
+  end
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 6377db666..dc3a30bae 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,10 +1,13 @@
-config = YAML.load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
-redis_config = config.merge(thread_safe: true)
+if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
 
-Sidekiq.configure_server do |s|
-  s.redis = redis_config
-end
+  config = YAML.load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
+  redis_config = config.merge(thread_safe: true)
+
+  Sidekiq.configure_server do |s|
+    s.redis = redis_config
+  end
 
-Sidekiq.configure_client do |s|
-  s.redis = redis_config
+  Sidekiq.configure_client do |s|
+    s.redis = redis_config
+  end
 end
diff --git a/config/routes.rb b/config/routes.rb
index 73a5d0f50..dd3a92676 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,9 @@
 
 # OVERRIDE Hyrax 2.9.0 to add featured collection routes
 
-require 'sidekiq/web'
+if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
+  require 'sidekiq/web'
+end
 
 Rails.application.routes.draw do # rubocop:disable Metrics/BlockLength
   resources :identity_providers
@@ -13,7 +15,13 @@
   mount Riiif::Engine => 'images', as: :riiif if Hyrax.config.iiif_image_server?
 
   authenticate :user, ->(u) { u.is_superadmin || u.is_admin } do
-    mount Sidekiq::Web => '/jobs'
+    queue = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
+    case queue
+      when 'sideki'
+        mount Sidekiq::Web => '/jobs'
+    when 'good_job'
+      mount GoodJob::Engine => '/jobs'
+    end
   end
 
   if ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_MULTITENANT', false))
diff --git a/db/migrate/20230406183814_create_good_jobs.rb b/db/migrate/20230406183814_create_good_jobs.rb
new file mode 100644
index 000000000..d86ab61ac
--- /dev/null
+++ b/db/migrate/20230406183814_create_good_jobs.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+class CreateGoodJobs < ActiveRecord::Migration[5.2]
+  def change
+    enable_extension 'pgcrypto'
+
+    create_table :good_jobs, id: :uuid do |t|
+      t.text :queue_name
+      t.integer :priority
+      t.jsonb :serialized_params
+      t.timestamp :scheduled_at
+      t.timestamp :performed_at
+      t.timestamp :finished_at
+      t.text :error
+
+      t.timestamps
+
+      t.uuid :active_job_id
+      t.text :concurrency_key
+      t.text :cron_key
+      t.uuid :retried_good_job_id
+      t.timestamp :cron_at
+    end
+
+    create_table :good_job_processes, id: :uuid do |t|
+      t.timestamps
+      t.jsonb :state
+    end
+
+    add_index :good_jobs, :scheduled_at, where: "(finished_at IS NULL)", name: "index_good_jobs_on_scheduled_at"
+    add_index :good_jobs, [:queue_name, :scheduled_at], where: "(finished_at IS NULL)", name: :index_good_jobs_on_queue_name_and_scheduled_at
+    add_index :good_jobs, [:active_job_id, :created_at], name: :index_good_jobs_on_active_job_id_and_created_at
+    add_index :good_jobs, :concurrency_key, where: "(finished_at IS NULL)", name: :index_good_jobs_on_concurrency_key_when_unfinished
+    add_index :good_jobs, [:cron_key, :created_at], name: :index_good_jobs_on_cron_key_and_created_at
+    add_index :good_jobs, [:cron_key, :cron_at], name: :index_good_jobs_on_cron_key_and_cron_at, unique: true
+    add_index :good_jobs, [:active_job_id], name: :index_good_jobs_on_active_job_id
+    add_index :good_jobs, [:finished_at], where: "retried_good_job_id IS NULL AND finished_at IS NOT NULL", name: :index_good_jobs_jobs_on_finished_at
+  end
+end

From c32a948dc1c2fb52286fde5296b2a739075c6cf0 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Fri, 22 Sep 2023 13:10:45 -0700
Subject: [PATCH 011/126] update gemfile lock

---
 Gemfile.lock | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 88b7a3175..bd14970f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,8 +13,8 @@ GIT
   branch: upstream_main
   specs:
     hyku_knapsack (0.0.1)
-      good_job
       rails (>= 5.2.0)
+      sentry-raven
 
 GIT
   remote: https://github.com/samvera-labs/hyrax-doi.git
@@ -211,6 +211,9 @@ GEM
       bootstrap-sass (~> 3.0)
       openseadragon (>= 0.2.0)
       rails
+    blacklight_advanced_search (6.4.1)
+      blacklight (~> 6.0, >= 6.0.1)
+      parslet
     blacklight_iiif_search (1.0.0)
       blacklight (~> 6.0)
       iiif-presentation
@@ -218,6 +221,10 @@ GEM
     blacklight_oai_provider (6.1.1)
       blacklight (~> 6.0)
       oai (~> 1.0)
+    blacklight_range_limit (6.5.0)
+      blacklight (~> 6.10)
+      jquery-rails
+      rails (>= 4.2, < 6)
     bolognese (1.11.0)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
@@ -886,6 +893,8 @@ GEM
     openseadragon (0.6.0)
       rails (> 3.2.0)
     optimist (3.0.1)
+    order_already (0.3.1)
+      rails-html-sanitizer (~> 1.4)
     orm_adapter (0.5.0)
     os (1.1.4)
     parallel (1.23.0)
@@ -1144,6 +1153,8 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    sentry-raven (2.13.0)
+      faraday (>= 0.7.6, < 1.0)
     shacl (0.1.1)
       json-ld (~> 3.1, >= 3.1.7)
       rdf (~> 3.1, >= 3.1.8)
@@ -1312,7 +1323,9 @@ DEPENDENCIES
   apartment
   aws-sdk-sqs
   blacklight (~> 6.7)
+  blacklight_advanced_search
   blacklight_oai_provider (~> 6.1, >= 6.1.1)
+  blacklight_range_limit (= 6.5.0)
   bolognese (>= 1.9.10)
   bootstrap-datepicker-rails
   bulkrax (~> 5.3)
@@ -1355,6 +1368,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)

From 8cf14c488fb4a052ceecca327ef514bdd049f534 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Fri, 22 Sep 2023 13:13:56 -0700
Subject: [PATCH 012/126] Update good_job.rb

---
 config/initializers/good_job.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/config/initializers/good_job.rb b/config/initializers/good_job.rb
index 7929a5d4b..0fe0259a7 100644
--- a/config/initializers/good_job.rb
+++ b/config/initializers/good_job.rb
@@ -18,13 +18,6 @@
   # Wrapping this in an after_initialize block to ensure that all constants are loaded
   Rails.application.config.after_initialize do
     # baseline of 0, higher is sooner
-
-    # Commented out the following two jobs because they were
-    # specfically used for the sdapi ingests.
-    # see sdapi_ingest_script directory and
-    # ref: https://github.com/scientist-softserv/adventist-dl/issues/468
-    # CollectionMembershipJob.priority = 70
-    # UpdateCollectionMembershipJob.priority = 60
     Bulkrax::ScheduleRelationshipsJob.priority = 50
     CreateDerivativesJob.priority = 40
     CharacterizeJob.priority = 30

From 61a9504fbe46041c9fa32285faf97b974ed0969c Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Fri, 22 Sep 2023 15:55:31 -0700
Subject: [PATCH 013/126] merge

---
 .env             |  2 +-
 config/routes.rb |  4 ++--
 db/schema.rb     | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index c8df50c68..c51b5a51e 100644
--- a/.env
+++ b/.env
@@ -23,7 +23,7 @@ PASSENGER_APP_ENV=development
 RAILS_LOG_TO_STDOUT=true
 REDIS_HOST=redis
 SECRET_KEY_BASE=asdf
-HYRAX_ACTIVE_JOB_QUEUE=sidekiq
+HYRAX_ACTIVE_JOB_QUEUE=good_job
 HYRAX_FITS_PATH=/app/fits/fits.sh
 NEGATIVE_CAPTCHA_SECRET=default-value-change-me
 SOLR_ADMIN_PASSWORD=SolrRocks
diff --git a/config/routes.rb b/config/routes.rb
index dd3a92676..93f74b568 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@
 
 # OVERRIDE Hyrax 2.9.0 to add featured collection routes
 
-if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
+if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
   require 'sidekiq/web'
 end
 
@@ -17,7 +17,7 @@
   authenticate :user, ->(u) { u.is_superadmin || u.is_admin } do
     queue = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
     case queue
-      when 'sideki'
+      when 'sidekiq'
         mount Sidekiq::Web => '/jobs'
     when 'good_job'
       mount GoodJob::Engine => '/jobs'
diff --git a/db/schema.rb b/db/schema.rb
index c7e628973..c523cfd22 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,6 +13,7 @@
 ActiveRecord::Schema.define(version: 2023_08_04_073106) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
   create_table "account_cross_searches", force: :cascade do |t|
@@ -312,6 +313,37 @@
     t.index ["user_id"], name: "index_file_view_stats_on_user_id"
   end
 
+  create_table "good_job_processes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.jsonb "state"
+  end
+
+  create_table "good_jobs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.text "queue_name"
+    t.integer "priority"
+    t.jsonb "serialized_params"
+    t.datetime "scheduled_at"
+    t.datetime "performed_at"
+    t.datetime "finished_at"
+    t.text "error"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.uuid "active_job_id"
+    t.text "concurrency_key"
+    t.text "cron_key"
+    t.uuid "retried_good_job_id"
+    t.datetime "cron_at"
+    t.index ["active_job_id", "created_at"], name: "index_good_jobs_on_active_job_id_and_created_at"
+    t.index ["active_job_id"], name: "index_good_jobs_on_active_job_id"
+    t.index ["concurrency_key"], name: "index_good_jobs_on_concurrency_key_when_unfinished", where: "(finished_at IS NULL)"
+    t.index ["cron_key", "created_at"], name: "index_good_jobs_on_cron_key_and_created_at"
+    t.index ["cron_key", "cron_at"], name: "index_good_jobs_on_cron_key_and_cron_at", unique: true
+    t.index ["finished_at"], name: "index_good_jobs_jobs_on_finished_at", where: "((retried_good_job_id IS NULL) AND (finished_at IS NOT NULL))"
+    t.index ["queue_name", "scheduled_at"], name: "index_good_jobs_on_queue_name_and_scheduled_at", where: "(finished_at IS NULL)"
+    t.index ["scheduled_at"], name: "index_good_jobs_on_scheduled_at", where: "(finished_at IS NULL)"
+  end
+
   create_table "group_roles", force: :cascade do |t|
     t.bigint "role_id"
     t.bigint "group_id"

From 363f9ee909e04afa001f80134775a479e42321cd Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Fri, 22 Sep 2023 15:55:51 -0700
Subject: [PATCH 014/126] fix routes file, add missing js file

---
 app/assets/javascripts/admin_color_select.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 app/assets/javascripts/admin_color_select.js

diff --git a/app/assets/javascripts/admin_color_select.js b/app/assets/javascripts/admin_color_select.js
new file mode 100644
index 000000000..919193c96
--- /dev/null
+++ b/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'))
+    })
+  })
+});
\ No newline at end of file

From 03dd69e50cc46f5d6e4b6caf02a8b2464742f542 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 25 Sep 2023 09:58:43 -0700
Subject: [PATCH 015/126] :lipstick: styling fix

---
 .../hyrax/homepage_controller_decorator.rb       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/hyrax/homepage_controller_decorator.rb b/app/controllers/hyrax/homepage_controller_decorator.rb
index 826a8599b..0299f6a63 100644
--- a/app/controllers/hyrax/homepage_controller_decorator.rb
+++ b/app/controllers/hyrax/homepage_controller_decorator.rb
@@ -5,14 +5,14 @@ module Hyrax
   module HomepageControllerDecorator
 
     def index
-    @presenter = presenter_class.new(current_ability, collections)
-    @featured_researcher = ContentBlock.for(:researcher)
-    @marketing_text = ContentBlock.for(:marketing)
-    @featured_work_list = FeaturedWorkList.new
-    @announcement_text = ContentBlock.for(:announcement)
-    @homepage_about_section_heading = ContentBlock.for(:homepage_about_section_heading)
-    @homepage_about_section_content = ContentBlock.for(:homepage_about_section_content)
-    recent
+      @presenter = presenter_class.new(current_ability, collections)
+      @featured_researcher = ContentBlock.for(:researcher)
+      @marketing_text = ContentBlock.for(:marketing)
+      @featured_work_list = FeaturedWorkList.new
+      @announcement_text = ContentBlock.for(:announcement)
+      @homepage_about_section_heading = ContentBlock.for(:homepage_about_section_heading)
+      @homepage_about_section_content = ContentBlock.for(:homepage_about_section_content)
+      recent
     end
   end
 end

From ed161f85c8690c66efdac1a00bd7a87b0cc6a1d9 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 25 Sep 2023 10:33:45 -0700
Subject: [PATCH 016/126] :lipstick: rubocop fixes

---
 app/controllers/catalog_controller.rb         | 31 ++++++++++---------
 .../content_blocks_controller_decorator.rb    | 10 +++---
 .../hyrax/homepage_controller_decorator.rb    |  1 -
 app/models/content_block.rb                   |  2 +-
 app/models/generic_work.rb                    |  1 -
 .../find_ids_by_model_decorator.rb            |  7 ++++-
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index c50f887b0..fbaccce7d 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -110,8 +110,7 @@ def self.uploaded_field
     config.add_facet_field 'file_format_sim', limit: 5
     config.add_facet_field 'member_of_collections_ssim', limit: 5, label: 'Collections'
 
-
-    # TODO deal with part of facet changes
+    # TODO: deal with part of facet changes
     # config.add_facet_field solr_name("part", :facetable), limit: 5, label: 'Part'
     # config.add_facet_field solr_name("part_of", :facetable), limit: 5
     # removed # config.add_facet_field solr_name("file_format", :facetable), limit: 5
@@ -123,16 +122,16 @@ def self.uploaded_field
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
-    # TODO ROB
-#     # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
-#     Rails.root.glob("config/locales/*.yml").each do |path|
-#       I18n.load_path << path.to_s
-#     end
-#     I18n.backend.reload!
-#     index_props = DogBiscuits.config.index_properties.collect do |prop|
-#       { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
-#     end
-#     add_index_field config, index_props
+    # TODO: ROB
+    #     # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
+    #     Rails.root.glob("config/locales/*.yml").each do |path|
+    #       I18n.load_path << path.to_s
+    #     end
+    #     I18n.backend.reload!
+    #     index_props = DogBiscuits.config.index_properties.collect do |prop|
+    #       { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
+    #     end
+    #     add_index_field config, index_props
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
@@ -203,8 +202,8 @@ def self.uploaded_field
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field|
       all_names = config.show_fields.values.map(&:field).join(" ")
-# TODO ROB all_names = (config.show_fields.values.map { |v| v.field.to_s } +
-          #         DogBiscuits.config.all_properties.map { |p| "#{p}_tesim" }).uniq.join(" ")
+      # TODO: ROB all_names = (config.show_fields.values.map { |v| v.field.to_s } +
+      #         DogBiscuits.config.all_properties.map { |p| "#{p}_tesim" }).uniq.join(" ")
       title_name = 'title_tesim'
       field.solr_parameters = {
         qf: "#{all_names} file_format_tesim all_text_timv",
@@ -233,7 +232,7 @@ def self.uploaded_field
     end
 
     config.add_search_field('creator') do |field|
-      # TODO ROB field.label = "Author"
+      # TODO: ROB field.label = "Author"
       field.solr_parameters = { "spellcheck.dictionary": "creator" }
       solr_name = 'creator_tesim'
       field.solr_local_parameters = {
@@ -276,7 +275,9 @@ def self.uploaded_field
       }
     end
 
+    # rubocop:disable Lint/UselessAssignment
     date_fields = ['date_created_tesim', 'sorted_date_isi', 'sorted_month_isi']
+    # rubocop:enable Lint/UselessAssignment
 
     config.add_search_field('date_created') do |field|
       field.solr_parameters = {
diff --git a/app/controllers/hyrax/content_blocks_controller_decorator.rb b/app/controllers/hyrax/content_blocks_controller_decorator.rb
index 348ac4f20..afaa2201f 100644
--- a/app/controllers/hyrax/content_blocks_controller_decorator.rb
+++ b/app/controllers/hyrax/content_blocks_controller_decorator.rb
@@ -6,11 +6,11 @@ module ContentBlocksControllerDecorator
     # override hyrax v2.9.0 added the home_text content block to permitted_params - Adding Themes
     def permitted_params
       params.require(:content_block).permit(:marketing,
-        :announcement,
-        :home_text,
-        :homepage_about_section_heading,
-        :homepage_about_section_content,
-        :researcher)
+                                            :announcement,
+                                            :home_text,
+                                            :homepage_about_section_heading,
+                                            :homepage_about_section_content,
+                                            :researcher)
     end
   end
 end
diff --git a/app/controllers/hyrax/homepage_controller_decorator.rb b/app/controllers/hyrax/homepage_controller_decorator.rb
index 0299f6a63..e4564a9bb 100644
--- a/app/controllers/hyrax/homepage_controller_decorator.rb
+++ b/app/controllers/hyrax/homepage_controller_decorator.rb
@@ -3,7 +3,6 @@
 # OVERRIDE Hyrax 3.5 to add content blocks
 module Hyrax
   module HomepageControllerDecorator
-
     def index
       @presenter = presenter_class.new(current_ability, collections)
       @featured_researcher = ContentBlock.for(:researcher)
diff --git a/app/models/content_block.rb b/app/models/content_block.rb
index 4c00535b3..5b383f192 100644
--- a/app/models/content_block.rb
+++ b/app/models/content_block.rb
@@ -16,7 +16,7 @@ class ContentBlock < ApplicationRecord
     help: :help_page,
     terms: :terms_page,
     agreement: :agreement_page,
-    home_text: :home_text, 
+    home_text: :home_text,
     homepage_about_section_heading: :homepage_about_section_heading,
     homepage_about_section_content: :homepage_about_section_content
   }.freeze
diff --git a/app/models/generic_work.rb b/app/models/generic_work.rb
index 5ee8e9c01..0abd4f9db 100644
--- a/app/models/generic_work.rb
+++ b/app/models/generic_work.rb
@@ -12,5 +12,4 @@ class GenericWork < ActiveFedora::Base
   self.indexer = GenericWorkIndexer
 
   prepend OrderAlready.for(:creator)
-
 end
diff --git a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
index 7cbaaef29..84e3b2c50 100644
--- a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
+++ b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
@@ -29,7 +29,12 @@ def find_ids_by_model(model:, ids: :all)
           response_docs.each { |doc| yield doc['id'] }
 
           break if (solr_response['start'] + solr_response['docs'].count) >= solr_response['numFound']
-          solr_response = ActiveFedora::SolrService.post(solr_query, fl: 'id', rows: @query_rows, start: solr_response['start'] + @query_rows)['response']
+          solr_response = ActiveFedora::SolrService.post(
+            solr_query,
+            fl: 'id',
+            rows: @query_rows,
+            start: solr_response['start'] + @query_rows
+          )['response']
         end
       end
     end

From 00a4b4af7a0dd18f5a3b393d60e9728322f4943e Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 25 Sep 2023 10:49:34 -0700
Subject: [PATCH 017/126] remove iiif_print/iiif_print require

cause of Sprockets::FileNotFound in Splash#index error. Doesn't seem necessary.
---
 app/assets/stylesheets/application.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index bb4734825..61efe4aa9 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -20,6 +20,5 @@
  *= require single_signon
  *= require blacklight_advanced_search
  *= require blacklight_range_limit
- *= require iiif_print/iiif_print
  *= require_self
  */

From 2ac46251a4b01b2fc6a11e628c0e7721757d6b79 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 25 Sep 2023 12:49:21 -0700
Subject: [PATCH 018/126] :gift: :broom: add missing file and format with
 semicolons

The previous build revealed that admin_color_select.js was missing. It also complained about missing semicolons.
---
 app/assets/javascripts/admin_color_select.js | 20 ++++++++
 app/assets/javascripts/admin_font_select.js  | 54 +++++++++++---------
 2 files changed, 49 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/javascripts/admin_color_select.js

diff --git a/app/assets/javascripts/admin_color_select.js b/app/assets/javascripts/admin_color_select.js
new file mode 100644
index 000000000..5bff8eb25
--- /dev/null
+++ b/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"));
+    });
+  });
+});
diff --git a/app/assets/javascripts/admin_font_select.js b/app/assets/javascripts/admin_font_select.js
index e2c3e89cb..26abe89fa 100644
--- a/app/assets/javascripts/admin_font_select.js
+++ b/app/assets/javascripts/admin_font_select.js
@@ -1,34 +1,38 @@
-Blacklight.onLoad(function() {
-  if($("#admin_appearance_body_font").length > 0){
-    $("#admin_appearance_body_font").fontselect({lookahead: 20})
-    $("#admin_appearance_headline_font").fontselect({lookahead: 20})
+Blacklight.onLoad(function () {
+  if ($("#admin_appearance_body_font").length > 0) {
+    $("#admin_appearance_body_font").fontselect({ lookahead: 20 });
+    $("#admin_appearance_headline_font").fontselect({ lookahead: 20 });
   }
 });
 
-$('div.defaultable-fonts a.restore-default-font').click(function(e) {
-  e.preventDefault()
-  var defaultTarget = $(e.target).data('default-target')
-  var input         = $("input[name='admin_appearance["+ defaultTarget +"]']")
-  var defaultValue  = input.data('default-value').replace(';', '')
-  var inputDisplay  = $("div[class$='"+ defaultTarget +"']").find('div.font-select span')
+$("div.defaultable-fonts a.restore-default-font").click(function (e) {
+  e.preventDefault();
+  var defaultTarget = $(e.target).data("default-target");
+  var input = $("input[name='admin_appearance[" + defaultTarget + "]']");
+  var defaultValue = input.data("default-value").replace(";", "");
+  var inputDisplay = $("div[class$='" + defaultTarget + "']").find(
+    "div.font-select span"
+  );
 
-  input.val(defaultValue)
-  inputDisplay.css("font-family", defaultValue)
-  inputDisplay.text(defaultValue)
-})
+  input.val(defaultValue);
+  inputDisplay.css("font-family", defaultValue);
+  inputDisplay.text(defaultValue);
+});
 
-$('.panel-footer a.restore-all-default-fonts').click(function(e) {
-  e.preventDefault()
+$(".panel-footer a.restore-all-default-fonts").click(function (e) {
+  e.preventDefault();
 
-  var allFontInputs = $("input[name*='font']")
+  var allFontInputs = $("input[name*='font']");
 
-  allFontInputs.each(function() {
-    var thisTarget   = $(this).attr('id').replace('admin_appearance_', '')
-    var defaultValue = $(this).data('default-value').replace(';', '')
-    var inputDisplay = $("div[class$='"+ thisTarget +"']").find('div.font-select span')
+  allFontInputs.each(function () {
+    var thisTarget = $(this).attr("id").replace("admin_appearance_", "");
+    var defaultValue = $(this).data("default-value").replace(";", "");
+    var inputDisplay = $("div[class$='" + thisTarget + "']").find(
+      "div.font-select span"
+    );
 
-    $(this).val(defaultValue)
-    inputDisplay.css("font-family", defaultValue)
-    inputDisplay.text(defaultValue)
-  })
+    $(this).val(defaultValue);
+    inputDisplay.css("font-family", defaultValue);
+    inputDisplay.text(defaultValue);
+  });
 });

From 15d313680a84fa2401f7be7b0b94ea1900539a9e Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 25 Sep 2023 12:52:25 -0700
Subject: [PATCH 019/126] :lipstick: correct missing semicolons

appease the hound by formatting js file with semicolons.
---
 .../range_limit_distro_facets.js              | 606 ++++++++++--------
 1 file changed, 327 insertions(+), 279 deletions(-)

diff --git a/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js b/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
index 4b2807651..1133b8dec 100644
--- a/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
+++ b/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
@@ -4,297 +4,345 @@
    is (re-)drawn on screen possibly with a new size. target of event will be the DOM element
    containing the plot.  Used to resize slider to match. */
 
-   Blacklight.onLoad(function() {
-    // ratio of width to height for desired display, multiply width by this ratio
-    // to get height. hard-coded in for now.
-    var display_ratio = 1/(1.618 * 2); // half a golden rectangle, why not
-    var redrawnEvent = "plotDrawn.blacklight.rangeLimit";
-  
-  
-  
-    // Facets already on the page? Turn em into a chart.
-    $(".range_limit .profile .distribution.chart_js ul").each(function() {
-        turnIntoPlot($(this).parent());
-    });
-  
-  
-    // Add AJAX fetched range facets if needed, and add a chart to em
-    $(".range_limit .profile .distribution a.load_distribution").each(function() {
-        var container = $(this).parent('div.distribution');
-  
-        $(container).load($(this).attr('href'), function(response, status) {
-            if ($(container).hasClass("chart_js") && status == "success" ) {
-              turnIntoPlot(container);
-            }
-        });
-    });
-  
-    // Listen for twitter bootstrap collapsible open events, to render flot
-    // in previously hidden divs on open, if needed.
-    $("body").on("show.bs.collapse", function(event) {
-      // Was the target a .facet-content including a .chart-js?
-      var container =  $(event.target).filter(".facet-content").find(".chart_js");
-  
-      // only if it doesn't already have a canvas, it isn't already drawn
-      if (container && container.find("canvas").length == 0) {
-        // be willing to wait up to 1100ms for container to
-        // have width -- right away on show.bs is too soon, but
-        // shown.bs is later than we want, we want to start rendering
-        // while animation is still in progress.
-        turnIntoPlot(container, 1100);
-      }
-    });
-  
-  
-  
-    // after a collapsible facet contents is fully shown,
-    // resize the flot chart to current conditions. This way, if you change
-    // browser window size, you can get chart resized to fit by closing and opening
-    // again, if needed.
-  
-    function redrawPlot(container) {
-      if (container && container.width() > 0) {
-        // resize the container's height, since width may have changed.
-        container.height( container.width() * display_ratio  );
-  
-        // redraw the chart.
-        var plot = container.data("plot");
-        if (plot) {
-          // how to redraw after possible resize?
-          // Cribbed from https://github.com/flot/flot/blob/master/jquery.flot.resize.js
-          plot.resize();
-          plot.setupGrid();
-          plot.draw();
-          // plus trigger redraw of the selection, which otherwise ain't always right
-          // we'll trigger a fake event on one of the boxes
-          var form = $(container).closest(".limit_content").find("form.range_limit");
-          form.find("input.range_begin").trigger("change");
-  
-          // send our custom event to trigger redraw of slider
-          $(container).trigger(redrawnEvent);
+Blacklight.onLoad(function () {
+  // ratio of width to height for desired display, multiply width by this ratio
+  // to get height. hard-coded in for now.
+  var display_ratio = 1 / (1.618 * 2); // half a golden rectangle, why not
+  var redrawnEvent = "plotDrawn.blacklight.rangeLimit";
+
+  // Facets already on the page? Turn em into a chart.
+  $(".range_limit .profile .distribution.chart_js ul").each(function () {
+    turnIntoPlot($(this).parent());
+  });
+
+  // Add AJAX fetched range facets if needed, and add a chart to em
+  $(".range_limit .profile .distribution a.load_distribution").each(
+    function () {
+      var container = $(this).parent("div.distribution");
+
+      $(container).load($(this).attr("href"), function (response, status) {
+        if ($(container).hasClass("chart_js") && status == "success") {
+          turnIntoPlot(container);
         }
+      });
+    }
+  );
+
+  // Listen for twitter bootstrap collapsible open events, to render flot
+  // in previously hidden divs on open, if needed.
+  $("body").on("show.bs.collapse", function (event) {
+    // Was the target a .facet-content including a .chart-js?
+    var container = $(event.target).filter(".facet-content").find(".chart_js");
+
+    // only if it doesn't already have a canvas, it isn't already drawn
+    if (container && container.find("canvas").length == 0) {
+      // be willing to wait up to 1100ms for container to
+      // have width -- right away on show.bs is too soon, but
+      // shown.bs is later than we want, we want to start rendering
+      // while animation is still in progress.
+      turnIntoPlot(container, 1100);
+    }
+  });
+
+  // after a collapsible facet contents is fully shown,
+  // resize the flot chart to current conditions. This way, if you change
+  // browser window size, you can get chart resized to fit by closing and opening
+  // again, if needed.
+
+  function redrawPlot(container) {
+    if (container && container.width() > 0) {
+      // resize the container's height, since width may have changed.
+      container.height(container.width() * display_ratio);
+
+      // redraw the chart.
+      var plot = container.data("plot");
+      if (plot) {
+        // how to redraw after possible resize?
+        // Cribbed from https://github.com/flot/flot/blob/master/jquery.flot.resize.js
+        plot.resize();
+        plot.setupGrid();
+        plot.draw();
+        // plus trigger redraw of the selection, which otherwise ain't always right
+        // we'll trigger a fake event on one of the boxes
+        var form = $(container)
+          .closest(".limit_content")
+          .find("form.range_limit");
+        form.find("input.range_begin").trigger("change");
+
+        // send our custom event to trigger redraw of slider
+        $(container).trigger(redrawnEvent);
       }
     }
-  
-    $("body").on("shown.bs.collapse", function(event) {
-      var container =  $(event.target).filter(".facet-content").find(".chart_js");
-      redrawPlot(container);
-    });
-  
-    // debouce borrowed from underscore
-    // Returns a function, that, as long as it continues to be invoked, will not
-    // be triggered. The function will be called after it stops being called for
-    // N milliseconds. If `immediate` is passed, trigger the function on the
-    // leading edge, instead of the trailing.
-    debounce = function(func, wait, immediate) {
-      var timeout;
-      return function() {
-        var context = this, args = arguments;
-        var later = function() {
-          timeout = null;
-          if (!immediate) func.apply(context, args);
-        };
-        var callNow = immediate && !timeout;
-        clearTimeout(timeout);
-        timeout = setTimeout(later, wait);
-        if (callNow) func.apply(context, args);
+  }
+
+  $("body").on("shown.bs.collapse", function (event) {
+    var container = $(event.target).filter(".facet-content").find(".chart_js");
+    redrawPlot(container);
+  });
+
+  // debouce borrowed from underscore
+  // Returns a function, that, as long as it continues to be invoked, will not
+  // be triggered. The function will be called after it stops being called for
+  // N milliseconds. If `immediate` is passed, trigger the function on the
+  // leading edge, instead of the trailing.
+  debounce = function (func, wait, immediate) {
+    var timeout;
+    return function () {
+      var context = this,
+        args = arguments;
+      var later = function () {
+        timeout = null;
+        if (!immediate) func.apply(context, args);
       };
+      var callNow = immediate && !timeout;
+      clearTimeout(timeout);
+      timeout = setTimeout(later, wait);
+      if (callNow) func.apply(context, args);
     };
-  
-    $(window).on("resize", debounce(function() {
-      $(".chart_js").each(function(i, container) {
+  };
+
+  $(window).on(
+    "resize",
+    debounce(function () {
+      $(".chart_js").each(function (i, container) {
         redrawPlot($(container));
       });
-    }, 350));
-  
-    // second arg, if provided, is a number of ms we're willing to
-    // wait for the container to have width before giving up -- we'll
-    // set 50ms timers to check back until timeout is expired or the
-    // container is finally visible. The timeout is used when we catch
-    // bootstrap show event, but the animation hasn't barely begun yet -- but
-    // we don't want to wait until it's finished, we want to start rendering
-    // as soon as we can.
+    }, 350)
+  );
+
+  // second arg, if provided, is a number of ms we're willing to
+  // wait for the container to have width before giving up -- we'll
+  // set 50ms timers to check back until timeout is expired or the
+  // container is finally visible. The timeout is used when we catch
+  // bootstrap show event, but the animation hasn't barely begun yet -- but
+  // we don't want to wait until it's finished, we want to start rendering
+  // as soon as we can.
+  //
+  // We also will
+  function turnIntoPlot(container, wait_for_visible) {
+    // flot can only render in a a div with a defined width.
+    // for instance, a hidden div can't generally be rendered in (although if you set
+    // an explicit width on it, it might work)
     //
-    // We also will
-    function turnIntoPlot(container, wait_for_visible) {
-      // flot can only render in a a div with a defined width.
-      // for instance, a hidden div can't generally be rendered in (although if you set
-      // an explicit width on it, it might work)
-      //
-      // We'll count on later code that catch bootstrap collapse open to render
-      // on show, for currently hidden divs.
-  
-      // for some reason width sometimes return negative, not sure
-      // why but it's some kind of hidden.
-      if (container.width() > 0) {
-        var height = container.width() * display_ratio;
-  
-        // Need an explicit height to make flot happy.
-        container.height( height )
-  
-        areaChart($(container));
-  
-        $(container).trigger(redrawnEvent);
-      }
-      else if (wait_for_visible > 0) {
-        setTimeout(function() {
-          turnIntoPlot(container, wait_for_visible - 50);
-        }, 50);
-      }
+    // We'll count on later code that catch bootstrap collapse open to render
+    // on show, for currently hidden divs.
+
+    // for some reason width sometimes return negative, not sure
+    // why but it's some kind of hidden.
+    if (container.width() > 0) {
+      var height = container.width() * display_ratio;
+
+      // Need an explicit height to make flot happy.
+      container.height(height);
+
+      areaChart($(container));
+
+      $(container).trigger(redrawnEvent);
+    } else if (wait_for_visible > 0) {
+      setTimeout(function () {
+        turnIntoPlot(container, wait_for_visible - 50);
+      }, 50);
     }
-  
-       // Takes a div holding a ul of distribution segments produced by
-      // blacklight_range_limit/_range_facets and makes it into
-      // a flot area chart.
-      function areaChart(container) {
-        //flot loaded? And canvas element supported.
-        if (  domDependenciesMet()  ) {
-  
-          // Grab the data from the ul div
-          var series_data = new Array();
-          var pointer_lookup = new Array();
-          var x_ticks = new Array();
-          var min = BlacklightRangeLimit.parseNum($(container).find("ul li:first-child span.from").text());
-          var max = BlacklightRangeLimit.parseNum($(container).find("ul li:last-child span.to").text());
-  
-          $(container).find("ul li").each(function() {
-              var from = BlacklightRangeLimit.parseNum($(this).find("span.from").text());
-              var to = BlacklightRangeLimit.parseNum($(this).find("span.to").text());
-              var count = BlacklightRangeLimit.parseNum($(this).find("span.count").text());
-              var avg = (count / (to - from + 1));
-  
-  
-              //We use the avg as the y-coord, to make the area of each
-              //segment proportional to how many documents it holds.
-              series_data.push( [from, avg ] );
-              series_data.push( [to+1, avg] );
-  
-              x_ticks.push(from);
-  
-              pointer_lookup.push({'from': from, 'to': to, 'count': count, 'label': $(this).find(".facet_select").text() });
-          });
-          var max_plus_one = BlacklightRangeLimit.parseNum($(container).find("ul li:last-child span.to").text())+1;
-          x_ticks.push( max_plus_one );
-  
-  
-  
-          var plot;
-          var config = $(container).closest('.facet_limit').data('plot-config') || {};
-  
-          try {
-            plot = $.plot($(container), [series_data],
-                $.extend(true, config, {
-                yaxis: {  ticks: [], min: 0, autoscaleMargin: 0.1},
-              //xaxis: { ticks: x_ticks },
-              xaxis: { tickDecimals: 0 }, // force integer ticks
-              series: { lines: { fill: true, steps: true }},
-              grid: {clickable: true, hoverable: true, autoHighlight: false},
-              selection: {mode: "x"}
-            }));
-          }
-          catch(err) {
-            alert(err);
-          }
-  
-          find_segment_for = function_for_find_segment(pointer_lookup);
-          var last_segment = null;
-          $(container).tooltip({'placement': 'bottom', 'trigger': 'manual', 'delay': { show: 0, hide: 100}});
-  
-          $(container).bind("plothover", function (event, pos, item) {
-            segment = find_segment_for(pos.x);
-  
-            if(segment != last_segment) {
-              var title = find_segment_for(pos.x).label  + ' (' + BlacklightRangeLimit.parseNum(segment.count) + ')';
-              $(container).attr("title", title).tooltip("_fixTitle").tooltip("show");
-  
-              last_segment  = segment;
-             }
-          });
-  
-          $(container).bind("mouseout", function() {
-            last_segment = null;
-            $(container).tooltip('hide');
-          });
-          $(container).bind("plotclick", function (event, pos, item) {
-              if ( plot.getSelection() == null) {
-                segment = find_segment_for(pos.x);
-                plot.setSelection( normalized_selection(segment.from, segment.to));
-              }
-          });
-          $(container).bind("plotselected plotselecting", function(event, ranges) {
-              if (ranges != null ) {
-                var from = Math.floor(ranges.xaxis.from);
-                var to = Math.floor(ranges.xaxis.to);
-  
-                var form = $(container).closest(".limit_content").find("form.range_limit");
-                form.find("input.range_begin").val(from);
-                form.find("input.range_end").val(to);
-  
-                var slider_placeholder = $(container).closest(".limit_content").find("[data-slider-placeholder]");
-                if (slider_placeholder) {
-                  slider_placeholder.slider("setValue", [from, to+1]);
-                }
-              }
-          });
-  
-          var form = $(container).closest(".limit_content").find("form.range_limit");
-          form.find("input.range_begin, input.range_end").change(function () {
-             plot.setSelection( form_selection(form, min, max) , true );
-          });
-          $(container).closest(".limit_content").find(".profile .range").on("slide", function(event, ui) {
-            var values = $(event.target).data("slider").getValue();
-            form.find("input.range_begin").val(values[0]);
-            form.find("input.range_end").val(values[1]);
-            plot.setSelection( normalized_selection(values[0], Math.max(values[0], values[1]-1)), true);
+  }
+
+  // Takes a div holding a ul of distribution segments produced by
+  // blacklight_range_limit/_range_facets and makes it into
+  // a flot area chart.
+  function areaChart(container) {
+    //flot loaded? And canvas element supported.
+    if (domDependenciesMet()) {
+      // Grab the data from the ul div
+      var series_data = new Array();
+      var pointer_lookup = new Array();
+      var x_ticks = new Array();
+      var min = BlacklightRangeLimit.parseNum(
+        $(container).find("ul li:first-child span.from").text()
+      );
+      var max = BlacklightRangeLimit.parseNum(
+        $(container).find("ul li:last-child span.to").text()
+      );
+
+      $(container)
+        .find("ul li")
+        .each(function () {
+          var from = BlacklightRangeLimit.parseNum(
+            $(this).find("span.from").text()
+          );
+          var to = BlacklightRangeLimit.parseNum(
+            $(this).find("span.to").text()
+          );
+          var count = BlacklightRangeLimit.parseNum(
+            $(this).find("span.count").text()
+          );
+          var avg = count / (to - from + 1);
+
+          //We use the avg as the y-coord, to make the area of each
+          //segment proportional to how many documents it holds.
+          series_data.push([from, avg]);
+          series_data.push([to + 1, avg]);
+
+          x_ticks.push(from);
+
+          pointer_lookup.push({
+            from: from,
+            to: to,
+            count: count,
+            label: $(this).find(".facet_select").text(),
           });
-  
-          // initially entirely selected, to match slider
-          plot.setSelection( {xaxis: { from:min, to:max+0.9999}}  );
-        }
-      }
-  
-  
-      // Send endpoint to endpoint+0.99999 to have display
-      // more closely approximate limiting behavior esp
-      // at small resolutions. (Since we search on whole numbers,
-      // inclusive, but flot chart is decimal.)
-      function normalized_selection(min, max) {
-        max += 0.99999;
-  
-        return {xaxis: { 'from':min, 'to':max}}
+        });
+      var max_plus_one =
+        BlacklightRangeLimit.parseNum(
+          $(container).find("ul li:last-child span.to").text()
+        ) + 1;
+      x_ticks.push(max_plus_one);
+
+      var plot;
+      var config =
+        $(container).closest(".facet_limit").data("plot-config") || {};
+
+      try {
+        plot = $.plot(
+          $(container),
+          [series_data],
+          $.extend(true, config, {
+            yaxis: { ticks: [], min: 0, autoscaleMargin: 0.1 },
+            //xaxis: { ticks: x_ticks },
+            xaxis: { tickDecimals: 0 }, // force integer ticks
+            series: { lines: { fill: true, steps: true } },
+            grid: { clickable: true, hoverable: true, autoHighlight: false },
+            selection: { mode: "x" },
+          })
+        );
+      } catch (err) {
+        alert(err);
       }
-  
-      function form_selection(form, min, max) {
-        var begin_val = BlacklightRangeLimit.parseNum($(form).find("input.range_begin").val());
-        if (isNaN(begin_val) || begin_val < min) {
-          begin_val = min;
+
+      find_segment_for = function_for_find_segment(pointer_lookup);
+      var last_segment = null;
+      $(container).tooltip({
+        placement: "bottom",
+        trigger: "manual",
+        delay: { show: 0, hide: 100 },
+      });
+
+      $(container).bind("plothover", function (event, pos, item) {
+        segment = find_segment_for(pos.x);
+
+        if (segment != last_segment) {
+          var title =
+            find_segment_for(pos.x).label +
+            " (" +
+            BlacklightRangeLimit.parseNum(segment.count) +
+            ")";
+          $(container)
+            .attr("title", title)
+            .tooltip("_fixTitle")
+            .tooltip("show");
+
+          last_segment = segment;
         }
-        var end_val = BlacklightRangeLimit.parseNum($(form).find("input.range_end").val());
-        if (isNaN(end_val) || end_val > max) {
-          end_val = max;
+      });
+
+      $(container).bind("mouseout", function () {
+        last_segment = null;
+        $(container).tooltip("hide");
+      });
+      $(container).bind("plotclick", function (event, pos, item) {
+        if (plot.getSelection() == null) {
+          segment = find_segment_for(pos.x);
+          plot.setSelection(normalized_selection(segment.from, segment.to));
         }
-  
-        return normalized_selection(begin_val, end_val);
-      }
-  
-      function function_for_find_segment(pointer_lookup_arr) {
-        return function(x_coord) {
-          for (var i = pointer_lookup_arr.length-1 ; i >= 0 ; i--) {
-            var hash = pointer_lookup_arr[i];
-            if (x_coord >= hash.from)
-              return hash;
+      });
+      $(container).bind("plotselected plotselecting", function (event, ranges) {
+        if (ranges != null) {
+          var from = Math.floor(ranges.xaxis.from);
+          var to = Math.floor(ranges.xaxis.to);
+
+          var form = $(container)
+            .closest(".limit_content")
+            .find("form.range_limit");
+          form.find("input.range_begin").val(from);
+          form.find("input.range_end").val(to);
+
+          var slider_placeholder = $(container)
+            .closest(".limit_content")
+            .find("[data-slider-placeholder]");
+          if (slider_placeholder) {
+            slider_placeholder.slider("setValue", [from, to + 1]);
           }
-          return pointer_lookup_arr[0];
-        };
-      }
-  
-      // Check if Flot is loaded, and if browser has support for
-      // canvas object, either natively or via IE excanvas.
-      function domDependenciesMet() {
-        var flotLoaded = (typeof $.plot != "undefined");
-        var canvasAvailable = ((typeof(document.createElement('canvas').getContext) != "undefined") || (typeof  window.CanvasRenderingContext2D != 'undefined' || typeof G_vmlCanvasManager != 'undefined'));
-  
-        return (flotLoaded && canvasAvailable);
+        }
+      });
+
+      var form = $(container)
+        .closest(".limit_content")
+        .find("form.range_limit");
+      form.find("input.range_begin, input.range_end").change(function () {
+        plot.setSelection(form_selection(form, min, max), true);
+      });
+      $(container)
+        .closest(".limit_content")
+        .find(".profile .range")
+        .on("slide", function (event, ui) {
+          var values = $(event.target).data("slider").getValue();
+          form.find("input.range_begin").val(values[0]);
+          form.find("input.range_end").val(values[1]);
+          plot.setSelection(
+            normalized_selection(values[0], Math.max(values[0], values[1] - 1)),
+            true
+          );
+        });
+
+      // initially entirely selected, to match slider
+      plot.setSelection({ xaxis: { from: min, to: max + 0.9999 } });
+    }
+  }
+
+  // Send endpoint to endpoint+0.99999 to have display
+  // more closely approximate limiting behavior esp
+  // at small resolutions. (Since we search on whole numbers,
+  // inclusive, but flot chart is decimal.)
+  function normalized_selection(min, max) {
+    max += 0.99999;
+
+    return { xaxis: { from: min, to: max } };
+  }
+
+  function form_selection(form, min, max) {
+    var begin_val = BlacklightRangeLimit.parseNum(
+      $(form).find("input.range_begin").val()
+    );
+    if (isNaN(begin_val) || begin_val < min) {
+      begin_val = min;
+    }
+    var end_val = BlacklightRangeLimit.parseNum(
+      $(form).find("input.range_end").val()
+    );
+    if (isNaN(end_val) || end_val > max) {
+      end_val = max;
+    }
+
+    return normalized_selection(begin_val, end_val);
+  }
+
+  function function_for_find_segment(pointer_lookup_arr) {
+    return function (x_coord) {
+      for (var i = pointer_lookup_arr.length - 1; i >= 0; i--) {
+        var hash = pointer_lookup_arr[i];
+        if (x_coord >= hash.from) return hash;
       }
-  });
-  
\ No newline at end of file
+      return pointer_lookup_arr[0];
+    };
+  }
+
+  // Check if Flot is loaded, and if browser has support for
+  // canvas object, either natively or via IE excanvas.
+  function domDependenciesMet() {
+    var flotLoaded = typeof $.plot != "undefined";
+    var canvasAvailable =
+      typeof document.createElement("canvas").getContext != "undefined" ||
+      typeof window.CanvasRenderingContext2D != "undefined" ||
+      typeof G_vmlCanvasManager != "undefined";
+
+    return flotLoaded && canvasAvailable;
+  }
+});

From 21133eae712b74e627c7eeef4230577aa3156621 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 25 Sep 2023 13:39:16 -0700
Subject: [PATCH 020/126] :broom: remove call to iiif_print/iiif_print

Cause of build error. It's already being included in sass.
---
 app/assets/stylesheets/application.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index bb4734825..61efe4aa9 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -20,6 +20,5 @@
  *= require single_signon
  *= require blacklight_advanced_search
  *= require blacklight_range_limit
- *= require iiif_print/iiif_print
  *= require_self
  */

From 05304fd3874a01d0f094cc3ce9ca3a51c6ed3084 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 25 Sep 2023 14:15:46 -0700
Subject: [PATCH 021/126] :lipstick: Rubocop fixes

---
 app/controllers/catalog_controller.rb | 31 ++++++++++++---------------
 app/models/generic_work.rb            |  1 -
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index c50f887b0..523788a6b 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -110,8 +110,7 @@ def self.uploaded_field
     config.add_facet_field 'file_format_sim', limit: 5
     config.add_facet_field 'member_of_collections_ssim', limit: 5, label: 'Collections'
 
-
-    # TODO deal with part of facet changes
+    # TODO: deal with part of facet changes
     # config.add_facet_field solr_name("part", :facetable), limit: 5, label: 'Part'
     # config.add_facet_field solr_name("part_of", :facetable), limit: 5
     # removed # config.add_facet_field solr_name("file_format", :facetable), limit: 5
@@ -123,16 +122,16 @@ def self.uploaded_field
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
-    # TODO ROB
-#     # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
-#     Rails.root.glob("config/locales/*.yml").each do |path|
-#       I18n.load_path << path.to_s
-#     end
-#     I18n.backend.reload!
-#     index_props = DogBiscuits.config.index_properties.collect do |prop|
-#       { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
-#     end
-#     add_index_field config, index_props
+    # TODO: ROB
+    #     # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
+    #     Rails.root.glob("config/locales/*.yml").each do |path|
+    #       I18n.load_path << path.to_s
+    #     end
+    #     I18n.backend.reload!
+    #     index_props = DogBiscuits.config.index_properties.collect do |prop|
+    #       { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
+    #     end
+    #     add_index_field config, index_props
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
@@ -203,8 +202,8 @@ def self.uploaded_field
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field|
       all_names = config.show_fields.values.map(&:field).join(" ")
-# TODO ROB all_names = (config.show_fields.values.map { |v| v.field.to_s } +
-          #         DogBiscuits.config.all_properties.map { |p| "#{p}_tesim" }).uniq.join(" ")
+      # TODO: ROB all_names = (config.show_fields.values.map { |v| v.field.to_s } +
+      #         DogBiscuits.config.all_properties.map { |p| "#{p}_tesim" }).uniq.join(" ")
       title_name = 'title_tesim'
       field.solr_parameters = {
         qf: "#{all_names} file_format_tesim all_text_timv",
@@ -233,7 +232,7 @@ def self.uploaded_field
     end
 
     config.add_search_field('creator') do |field|
-      # TODO ROB field.label = "Author"
+      # TODO: ROB field.label = "Author"
       field.solr_parameters = { "spellcheck.dictionary": "creator" }
       solr_name = 'creator_tesim'
       field.solr_local_parameters = {
@@ -276,8 +275,6 @@ def self.uploaded_field
       }
     end
 
-    date_fields = ['date_created_tesim', 'sorted_date_isi', 'sorted_month_isi']
-
     config.add_search_field('date_created') do |field|
       field.solr_parameters = {
         "spellcheck.dictionary": "date_created"
diff --git a/app/models/generic_work.rb b/app/models/generic_work.rb
index 5ee8e9c01..0abd4f9db 100644
--- a/app/models/generic_work.rb
+++ b/app/models/generic_work.rb
@@ -12,5 +12,4 @@ class GenericWork < ActiveFedora::Base
   self.indexer = GenericWorkIndexer
 
   prepend OrderAlready.for(:creator)
-
 end

From 8d81514d37435ec6d1c7b60ae3f6a87785332a62 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Mon, 25 Sep 2023 16:32:55 -0700
Subject: [PATCH 022/126] =?UTF-8?q?=E2=9C=85=20Fix=20test=20setup=20for=20?=
 =?UTF-8?q?catalog=5Fcontroller=5Fspec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will add additional setup to the catalog_controller_spec.
---
 spec/requests/catalog_controller_spec.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/spec/requests/catalog_controller_spec.rb b/spec/requests/catalog_controller_spec.rb
index 818b80bd3..c36a9c43d 100644
--- a/spec/requests/catalog_controller_spec.rb
+++ b/spec/requests/catalog_controller_spec.rb
@@ -56,6 +56,18 @@
 
     before do
       host! "http://#{cross_search_tenant_account.cname}/"
+      black_light_config.add_search_field('title') do |field|
+        field.solr_parameters = {
+          "spellcheck.dictionary": "title"
+        }
+        solr_name = 'title_tesim'
+        field.solr_local_parameters = {
+          qf: solr_name,
+          pf: solr_name
+        }
+      end
+      black_light_config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
+      black_light_config.advanced_search[:query_parser] ||= 'dismax'
     end
 
     context 'can fetch data from other tenants' do
@@ -66,7 +78,7 @@
 
         # get '/catalog', params: { q: '*' }
         # get search_catalog_url, params: { locale: 'en', q: 'test' }
-        get "http://#{cross_search_tenant_account.cname}/catalog?q=test" # , params: { q: 'test' }
+        get "http://#{cross_search_tenant_account.cname}/catalog?q=test", params: { q: 'title' }
         expect(response.status).to eq(200)
       end
     end

From aa7f8c636094598c2e43dc7262b64c0715d15233 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Tue, 26 Sep 2023 12:26:55 -0700
Subject: [PATCH 023/126] Add knapsack helper

---
 app/helpers/application_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e27eee4ae..44531726b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -5,6 +5,7 @@ module ApplicationHelper
   include Hyrax::OverrideHelperBehavior
   include GroupNavigationHelper
   include SharedSearchHelper
+  include HykuKnapsack::ApplicationHelper
 
   def hint_for(term:, record_class: nil)
     hint = locale_for(type: 'hints', term: term, record_class: record_class)

From 7740cfd6a07ee2a54de6af277b81ef56f492fb87 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Tue, 26 Sep 2023 14:43:26 -0700
Subject: [PATCH 024/126] remove Adventist from application.rb

---
 config/application.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index acf7c0523..9244f821c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -66,8 +66,8 @@ class Application < Rails::Application
       # Adventist::TextFileTextExtractionService to the beginning of the services array we are
       # enabling text extraction from plain text files.
       Hyrax::DerivativeService.services = [
-        Adventist::TextFileTextExtractionService,
-        IiifPrint::PluggableDerivativeService]
+        IiifPrint::PluggableDerivativeService
+      ]
 
       # When you are ready to use the derivative rodeo instead of the pluggable uncomment the
       # following and comment out the preceding Hyrax::DerivativeService.service

From 5108af162eb56ad6947e1486b1b1e132c2896e4b Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Thu, 28 Sep 2023 11:31:35 -0700
Subject: [PATCH 025/126] =?UTF-8?q?=F0=9F=8E=81=20Add=20conditional=20to?=
 =?UTF-8?q?=20run=20correct=20command=20for=20worker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit adds a conditional to run the correct command for sidekiq or good_job, when running docker compose up.
---
 docker-compose.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0d349e7e3..dafc2446b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,7 +176,15 @@ services:
         - ghcr.io/samvera/hyku/base:latest
         - ghcr.io/samvera/hyku:latest
         - ghcr.io/samvera/hyku/worker:latest
-    command: bundle exec sidekiq
+    command: 
+      - /bin/sh
+      - -c
+      - >
+        if [ "$$HYRAX_ACTIVE_JOB_QUEUE" == "good_job" ]; then
+          exec bundle exec good_job start
+        else
+          exec bundle exec sidekiq
+        fi
     depends_on:
       check_volumes:
         condition: service_completed_successfully

From b8af51e6b45486855bb6d7ba055b8c50b2b3dca2 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Fri, 29 Sep 2023 12:56:24 -0400
Subject: [PATCH 026/126] Make appearance constants overrideable

This allows for the knapsack to override the constants by defining and
using a method rather than a constant in the look-ups.
---
 app/forms/hyrax/forms/admin/appearance.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index 7f20affae..ec64d6bb3 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -42,8 +42,6 @@ class Appearance
           'facet_panel_text_color'             => '#333333'
         }.freeze
 
-        DEFAULT_VALUES = DEFAULT_FONTS.merge(DEFAULT_COLORS).freeze
-
         # @param [Hash] attributes the list of parameters from the form
         def initialize(attributes = {})
           @attributes = attributes
@@ -430,8 +428,12 @@ def convert_to_rgba(hex_color, alpha = 0.5)
             "rgba(#{rgb[0]}, #{rgb[1]}, #{rgb[2]}, #{alpha})"
           end
 
+          def default_values
+            @default_values ||= DEFAULT_FONTS.merge(DEFAULT_COLORS)
+          end
+
           def block_for(name, dynamic_default = nil)
-            ContentBlock.block_for(name: name, fallback_value: DEFAULT_VALUES[name] || dynamic_default)
+            ContentBlock.block_for(name: name, fallback_value: default_values[name] || dynamic_default)
           end
 
           # Persist a key/value tuple as a ContentBlock

From 6126bf6b5bc9eb8556775436b174e252afad5a0e Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Sat, 30 Sep 2023 23:31:01 -0400
Subject: [PATCH 027/126] add reporting fix to hyku ci

---
 .env | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index c51b5a51e..b4e6bf781 100644
--- a/.env
+++ b/.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,19 +14,19 @@ 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=admin@example.com
 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=good_job
-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
@@ -33,6 +34,8 @@ 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

From 2a80187c8e54db4c80812cb2ae56762767b3dcc0 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Sun, 1 Oct 2023 15:44:24 -0400
Subject: [PATCH 028/126] spec loading fixes

---
 Gemfile.lock                                       | 8 ++++----
 spec/controllers/search_history_controller_spec.rb | 2 +-
 spec/tasks/rake_spec.rb                            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4436734e8..23b91297a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -786,7 +786,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
-    minitest (5.18.1)
+    minitest (5.20.0)
     mods (2.4.1)
       edtf
       iso-639
@@ -933,7 +933,7 @@ GEM
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -1067,7 +1067,7 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (5.1.2)
@@ -1080,7 +1080,7 @@ GEM
       rspec-support (~> 3.10)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.52.1)
diff --git a/spec/controllers/search_history_controller_spec.rb b/spec/controllers/search_history_controller_spec.rb
index d9a349279..379e29e59 100644
--- a/spec/controllers/search_history_controller_spec.rb
+++ b/spec/controllers/search_history_controller_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe SearchHistoryController do
+RSpec.describe SearchHistoryController, type: :controller do
   routes { Blacklight::Engine.routes }
 
   describe 'index' do
diff --git a/spec/tasks/rake_spec.rb b/spec/tasks/rake_spec.rb
index 3543bf304..0011bf4a3 100644
--- a/spec/tasks/rake_spec.rb
+++ b/spec/tasks/rake_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rake'
-load 'app/models/site.rb'
+load Rails.root.join('app/models/site.rb')
 
 RSpec.describe "Rake tasks" do
   before(:all) do

From 691dda747dae1611b8520e377caccdb4aea96bf9 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Sun, 1 Oct 2023 15:55:20 -0400
Subject: [PATCH 029/126] rubocop

---
 spec/tasks/rake_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/tasks/rake_spec.rb b/spec/tasks/rake_spec.rb
index 0011bf4a3..c4734c2cf 100644
--- a/spec/tasks/rake_spec.rb
+++ b/spec/tasks/rake_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rake'
-load Rails.root.join('app/models/site.rb')
+load Rails.root.join('app', 'models', 'site.rb')
 
 RSpec.describe "Rake tasks" do
   before(:all) do

From deec7e2f6c5501eb99a95dddeef97617657af2df Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Mon, 2 Oct 2023 14:31:28 -0400
Subject: [PATCH 030/126] =?UTF-8?q?=F0=9F=A7=B9Make=20appearance=20default?=
 =?UTF-8?q?s=20overrideable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/hyrax/forms/admin/appearance.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index 7f20affae..ec64d6bb3 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -42,8 +42,6 @@ class Appearance
           'facet_panel_text_color'             => '#333333'
         }.freeze
 
-        DEFAULT_VALUES = DEFAULT_FONTS.merge(DEFAULT_COLORS).freeze
-
         # @param [Hash] attributes the list of parameters from the form
         def initialize(attributes = {})
           @attributes = attributes
@@ -430,8 +428,12 @@ def convert_to_rgba(hex_color, alpha = 0.5)
             "rgba(#{rgb[0]}, #{rgb[1]}, #{rgb[2]}, #{alpha})"
           end
 
+          def default_values
+            @default_values ||= DEFAULT_FONTS.merge(DEFAULT_COLORS)
+          end
+
           def block_for(name, dynamic_default = nil)
-            ContentBlock.block_for(name: name, fallback_value: DEFAULT_VALUES[name] || dynamic_default)
+            ContentBlock.block_for(name: name, fallback_value: default_values[name] || dynamic_default)
           end
 
           # Persist a key/value tuple as a ContentBlock

From cb2e3bfc09928830ed2e3d4f2593f8fa1aba725a Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Mon, 2 Oct 2023 15:01:09 -0700
Subject: [PATCH 031/126] bump bulkrax to 5.4.0

This commit pulls in a small collection of bug fixes.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 21850c73c..976ad7d3a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,7 +266,7 @@ GEM
       signet (~> 0.8)
       typhoeus
     builder (3.2.4)
-    bulkrax (5.3.0)
+    bulkrax (5.4.0)
       bagit (~> 0.4)
       coderay
       dry-monads (~> 1.4.0)

From c700d41d457cbe33ea58ea23f766a1fc19f510f3 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Mon, 2 Oct 2023 23:02:04 -0400
Subject: [PATCH 032/126] =?UTF-8?q?=F0=9F=A7=B9=20Include=20knapsack=20css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/application.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 61efe4aa9..f468cc6c3 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -21,4 +21,5 @@
  *= require blacklight_advanced_search
  *= require blacklight_range_limit
  *= require_self
+ *= require hyku_knapsack/application
  */

From 35526646c157b5f2ea489f78ddb825c0e25cc245 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Tue, 3 Oct 2023 11:26:46 -0400
Subject: [PATCH 033/126] fix job loading when selecting good job

---
 config/initializers/apartment.rb                 |  2 +-
 .../20230406183810_setup_good_jobs_schema.rb     | 16 ++++++++++++++++
 db/schema.rb                                     |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230406183810_setup_good_jobs_schema.rb

diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index a2647571d..53934a77b 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -12,7 +12,7 @@
 
     # Add any models that you do not want to be multi-tenanted, but remain in the global (public) namespace.
     # A typical example would be a Customer or Tenant model that stores each Tenant's information.
-    config.excluded_models = %w{ Account AccountCrossSearch DomainName Endpoint User UserStat SolrEndpoint FcrepoEndpoint RedisEndpoint }
+    config.excluded_models = %w{ Account AccountCrossSearch DomainName Endpoint User UserStat SolrEndpoint FcrepoEndpoint RedisEndpoint GoodJob::Execution GoodJob::Job GoodJob::Process }
 
     # In order to migrate all of your Tenants you need to provide a list of Tenant names to Apartment.
     # You can make this dynamic by providing a Proc object to be called on migrations.
diff --git a/db/migrate/20230406183810_setup_good_jobs_schema.rb b/db/migrate/20230406183810_setup_good_jobs_schema.rb
new file mode 100644
index 000000000..5ffdffee0
--- /dev/null
+++ b/db/migrate/20230406183810_setup_good_jobs_schema.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# This migration pre-sets the shared_extensions schema for in prep for good_jobs
+class SetupGoodJobsSchema < ActiveRecord::Migration[5.2]
+  def change
+    # Create Schema
+    ActiveRecord::Base.connection.execute 'CREATE SCHEMA IF NOT EXISTS shared_extensions;'
+    # Enable Hstore
+    ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS HSTORE SCHEMA shared_extensions;'
+    # Enable UUID-OSSP
+    ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp" SCHEMA shared_extensions;'
+    ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS "pgcrypto" SCHEMA shared_extensions;'
+    # Grant usage to public
+    ActiveRecord::Base.connection.execute 'GRANT usage ON SCHEMA shared_extensions to public;'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c523cfd22..c2b964beb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,8 +13,10 @@
 ActiveRecord::Schema.define(version: 2023_08_04_073106) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "hstore"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
+  enable_extension "uuid-ossp"
 
   create_table "account_cross_searches", force: :cascade do |t|
     t.bigint "search_account_id"

From 64d9281acf8362d4eb8e99c4ae64e5c1e9128684 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Tue, 3 Oct 2023 11:29:05 -0400
Subject: [PATCH 034/126] adjust docker compose to use the startup script

---
 docker-compose.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index dafc2446b..512e9bf4b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -135,7 +135,7 @@ services:
 
   web:
     <<: *app
-    # Uncomment command to access container with out starting Rails. Useful for debugging
+    # Uncomment command to access container with out starting bin/web. Useful for debugging
     # command: sleep infinity
     environment:
       - VIRTUAL_PORT=3000
@@ -167,6 +167,8 @@ services:
   worker:
     <<: *app
     image: ghcr.io/samvera/hyku/worker:${TAG:-latest}
+    # Uncomment command to access container with out starting bin/worker. Useful for debugging
+    # command: sleep infinity
     build:
       context: .
       target: hyku-worker
@@ -176,15 +178,6 @@ services:
         - ghcr.io/samvera/hyku/base:latest
         - ghcr.io/samvera/hyku:latest
         - ghcr.io/samvera/hyku/worker:latest
-    command: 
-      - /bin/sh
-      - -c
-      - >
-        if [ "$$HYRAX_ACTIVE_JOB_QUEUE" == "good_job" ]; then
-          exec bundle exec good_job start
-        else
-          exec bundle exec sidekiq
-        fi
     depends_on:
       check_volumes:
         condition: service_completed_successfully

From 5feb7f429b8ba9d90d40ae40d5b0b3e4910c2b1d Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Tue, 3 Oct 2023 10:54:27 -0700
Subject: [PATCH 035/126] :gift: install tesseract eng_best

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

diff --git a/Dockerfile b/Dockerfile
index d13b8e942..c9d3ecdd9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,11 @@ RUN wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-57.t
     && rm -rf ImageMagick* \
     && rm -rf /var/cache/apk/*
 
+# Install "best" training data for Tesseract
+RUN echo "📚 Installing Tesseract Best (training data)!" && \
+    cd /usr/share/tessdata/ && \
+    wget https://github.com/tesseract-ocr/tessdata_best/blob/main/eng.traineddata?raw=true -O eng_best.traineddata
+
 ARG VIPS_VERSION=8.11.3
 
 RUN set -x -o pipefail \

From e568fbd8372f920954e261b76ac5793dfbc5e1fc Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Tue, 3 Oct 2023 15:16:06 -0700
Subject: [PATCH 036/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20revert=20tesseract?=
 =?UTF-8?q?=20best=20changes=20to=20dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this change belongs in the knapsack directory instead
---
 Dockerfile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9d3ecdd9..d13b8e942 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,11 +47,6 @@ RUN wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-57.t
     && rm -rf ImageMagick* \
     && rm -rf /var/cache/apk/*
 
-# Install "best" training data for Tesseract
-RUN echo "📚 Installing Tesseract Best (training data)!" && \
-    cd /usr/share/tessdata/ && \
-    wget https://github.com/tesseract-ocr/tessdata_best/blob/main/eng.traineddata?raw=true -O eng_best.traineddata
-
 ARG VIPS_VERSION=8.11.3
 
 RUN set -x -o pipefail \

From 0f9169517d5a8651ee245d083b7a75f31383d7f0 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Tue, 3 Oct 2023 15:16:06 -0700
Subject: [PATCH 037/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20revert=20tesseract?=
 =?UTF-8?q?=20best=20changes=20to=20dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this change belongs in the knapsack directory instead
---
 Dockerfile            | 5 -----
 config/application.rb | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9d3ecdd9..d13b8e942 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,11 +47,6 @@ RUN wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-57.t
     && rm -rf ImageMagick* \
     && rm -rf /var/cache/apk/*
 
-# Install "best" training data for Tesseract
-RUN echo "📚 Installing Tesseract Best (training data)!" && \
-    cd /usr/share/tessdata/ && \
-    wget https://github.com/tesseract-ocr/tessdata_best/blob/main/eng.traineddata?raw=true -O eng_best.traineddata
-
 ARG VIPS_VERSION=8.11.3
 
 RUN set -x -o pipefail \
diff --git a/config/application.rb b/config/application.rb
index 9244f821c..2c6ceefb2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -77,7 +77,7 @@ class Application < Rails::Application
       #   IiifPrint::DerivativeRodeoService,
       #   Hyrax::FileSetDerivativesService]
 
-      DerivativeRodeo::Generators::HocrGenerator.additional_tessearct_options = "-l eng_best"
+      DerivativeRodeo::Generators::HocrGenerator.additional_tessearct_options = nil
 
       # Allows us to use decorator files
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")).sort.each do |c|

From 26ae01378bd9c1317869aa50964c741420076326 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 4 Oct 2023 11:52:29 -0700
Subject: [PATCH 038/126] =?UTF-8?q?=F0=9F=90=9B=20Bring=20fix=20for=20entr?=
 =?UTF-8?q?y=20show=20page=20not=20showing=20link?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will bring in a fix from Bulkrax that correctly shows the
object from the entry show page.

ref:
  - https://github.com/samvera-labs/bulkrax/commit/0e68a5ea81307dc9e06f9a1e7c0c4cc8cd3de873
---
 app/factories/bulkrax/object_factory_decorator.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/factories/bulkrax/object_factory_decorator.rb b/app/factories/bulkrax/object_factory_decorator.rb
index 928cd8384..67f2d74a6 100644
--- a/app/factories/bulkrax/object_factory_decorator.rb
+++ b/app/factories/bulkrax/object_factory_decorator.rb
@@ -8,6 +8,21 @@ module ObjectFactoryDecorator
     def environment(attrs)
       Hyrax::Actors::Environment.new(object, Ability.new(@user), attrs, true)
     end
+
+    # TODO: Verify and remove this once Bulkrax is updated 5.4.1 over greater and this is no longer needed
+    def search_by_identifier
+      # ref: https://github.com/samvera-labs/bulkrax/issues/866
+      # ref:https://github.com/samvera-labs/bulkrax/issues/867
+      # work_index = ::ActiveFedora.index_field_mapper.solr_name(work_identifier, :facetable)
+      work_index = work_identifier
+      query = { work_index =>
+                source_identifier_value }
+      # Query can return partial matches (something6 matches both something6 and something68)
+      # so we need to weed out any that are not the correct full match. But other items might be
+      # in the multivalued field, so we have to go through them one at a time.
+      match = klass.where(query).detect { |m| m.send(work_identifier).include?(source_identifier_value) }
+      return match if match
+    end
   end
 end
 

From 07fde572f9152d513b13f71cae90dd4fdfbfba6c Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 4 Oct 2023 12:19:18 -0700
Subject: [PATCH 039/126] =?UTF-8?q?=F0=9F=A7=B9=20Revert=20previous=20comm?=
 =?UTF-8?q?it=20and=20update=20Bulkrax?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will update Bulkrax to 5.4.1 instead of using the override
from the last commit.  We also revert the changes from the last commit.
---
 Gemfile                                           |  2 +-
 Gemfile.lock                                      |  4 ++--
 app/factories/bulkrax/object_factory_decorator.rb | 15 ---------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 683b0b823..c4a98f9c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1'
 gem 'blacklight_range_limit', '6.5.0'
 gem 'bolognese', '>= 1.9.10'
 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]
diff --git a/Gemfile.lock b/Gemfile.lock
index 976ad7d3a..1b3206776 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -266,7 +266,7 @@ GEM
       signet (~> 0.8)
       typhoeus
     builder (3.2.4)
-    bulkrax (5.4.0)
+    bulkrax (5.4.1)
       bagit (~> 0.4)
       coderay
       dry-monads (~> 1.4.0)
@@ -1328,7 +1328,7 @@ DEPENDENCIES
   blacklight_range_limit (= 6.5.0)
   bolognese (>= 1.9.10)
   bootstrap-datepicker-rails
-  bulkrax (~> 5.3)
+  bulkrax (~> 5.4)
   byebug
   capybara
   capybara-screenshot (~> 1.0)
diff --git a/app/factories/bulkrax/object_factory_decorator.rb b/app/factories/bulkrax/object_factory_decorator.rb
index 67f2d74a6..928cd8384 100644
--- a/app/factories/bulkrax/object_factory_decorator.rb
+++ b/app/factories/bulkrax/object_factory_decorator.rb
@@ -8,21 +8,6 @@ module ObjectFactoryDecorator
     def environment(attrs)
       Hyrax::Actors::Environment.new(object, Ability.new(@user), attrs, true)
     end
-
-    # TODO: Verify and remove this once Bulkrax is updated 5.4.1 over greater and this is no longer needed
-    def search_by_identifier
-      # ref: https://github.com/samvera-labs/bulkrax/issues/866
-      # ref:https://github.com/samvera-labs/bulkrax/issues/867
-      # work_index = ::ActiveFedora.index_field_mapper.solr_name(work_identifier, :facetable)
-      work_index = work_identifier
-      query = { work_index =>
-                source_identifier_value }
-      # Query can return partial matches (something6 matches both something6 and something68)
-      # so we need to weed out any that are not the correct full match. But other items might be
-      # in the multivalued field, so we have to go through them one at a time.
-      match = klass.where(query).detect { |m| m.send(work_identifier).include?(source_identifier_value) }
-      return match if match
-    end
   end
 end
 

From 8ae51d8d1ae8fb74768c4631ba382c42bbb7ec2d Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Wed, 4 Oct 2023 13:45:47 -0700
Subject: [PATCH 040/126] :bug: subject can't be blank for the contact form

Previously there was a bug because even if you typed in a subject, the contact form would error saying that it was blank.

Part of issue:
- https://github.com/scientist-softserv/adventist-dl/issues/608
---
 app/controllers/hyrax/contact_form_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index 17f6cb614..705d7e0b1 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -50,6 +50,7 @@ def create
       # not spam, form is valid, and captcha is valid
       @captcha.values[:category] = params[:contact_form][:category]
       @captcha.values[:contact_method] = params[:contact_form][:contact_method]
+      @captcha.values[:subjects] = params[:contact_form][:subject]
       @contact_form = model_class.new(@captcha.values)
       if @contact_form.valid? && @captcha.valid?
         ContactMailer.contact(@contact_form).deliver_now

From fd32f03e0571fc21517743534b264a45e67baa7b Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Wed, 4 Oct 2023 13:48:47 -0700
Subject: [PATCH 041/126] mend

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

diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index 705d7e0b1..a420f82d4 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -50,7 +50,7 @@ def create
       # not spam, form is valid, and captcha is valid
       @captcha.values[:category] = params[:contact_form][:category]
       @captcha.values[:contact_method] = params[:contact_form][:contact_method]
-      @captcha.values[:subjects] = params[:contact_form][:subject]
+      @captcha.values[:subject] = params[:contact_form][:subject]
       @contact_form = model_class.new(@captcha.values)
       if @contact_form.valid? && @captcha.valid?
         ContactMailer.contact(@contact_form).deliver_now

From 5e0cc2c05d33b25c8105bee8f182a0ae60575100 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 4 Oct 2023 17:15:13 -0400
Subject: [PATCH 042/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Add=20handling=20f?=
 =?UTF-8?q?or=20Knapsack=20theme=20overrides?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, we were looking for themes yaml files relative to
the directory of the spawning script.  For Hyku that was always the
`Rails.root` directory.  However, when running specs in Knapsack, that
directory was `Knapsack::Engine.root`.

This unearthed a potential configuration issue; namely that we want
Knapsack's to control what themes are available, meaning we don't want
to require amending Hyku's themes.

So, we introduce a mechanism for looking up files first in the Knapsack
then in Hyku.

I discovered this bug in the specs for knapsack (below is the *Error stack trace*)

<details>
<summary>Error stack trace</summary>

```
2) Hyrax::Admin::AppearancesController with an administrator GET #show assigns the requested site as @site
     Failure/Error: get :show, params: {}

     Errno::ENOENT:
       No such file or directory @ rb_sysopen - config/home_themes.yml
     # /usr/local/bundle/gems/psych-3.3.4/lib/psych.rb:582:in `initialize'
     # /usr/local/bundle/gems/psych-3.3.4/lib/psych.rb:582:in `open'
     # /usr/local/bundle/gems/psych-3.3.4/lib/psych.rb:582:in `unsafe_load_file'
     # ./hyrax-webapp/app/controllers/hyrax/admin/appearances_controller.rb:19:in `show'
     # /usr/local/bundle/gems/rails-controller-testing-1.0.5/lib/rails/controller/testing/template_assertions.rb:62:in `process'
     # /usr/local/bundle/gems/devise-4.9.2/lib/devise/test/controller_helpers.rb:35:in `block in process'
     # /usr/local/bundle/gems/devise-4.9.2/lib/devise/test/controller_helpers.rb:104:in `catch'
     # /usr/local/bundle/gems/devise-4.9.2/lib/devise/test/controller_helpers.rb:104:in `_catch_warden'
     # /usr/local/bundle/gems/devise-4.9.2/lib/devise/test/controller_helpers.rb:35:in `process'
     # /usr/local/bundle/gems/rails-controller-testing-1.0.5/lib/rails/controller/testing/integration.rb:16:in `block (2 levels) in <module:Integration>'
     # ./spec/controllers/hyrax/hyrax/admin/appearances_controller_spec.rb:31:in `block (4 levels) in <top (required)>'
     # /usr/local/bundle/gems/webmock-3.19.1/lib/webmock/rspec.rb:39:in `block (2 levels) in <top (required)>'
     # ./hyrax-webapp/spec/support/multitenancy_metadata.rb:50:in `block (2 levels) in <top (required)>'
     # /usr/local/bundle/gems/rspec-retry-0.6.2/lib/rspec/retry.rb:124:in `block in run'
     # /usr/local/bundle/gems/rspec-retry-0.6.2/lib/rspec/retry.rb:110:in `loop'
     # /usr/local/bundle/gems/rspec-retry-0.6.2/lib/rspec/retry.rb:110:in `run'
     # /usr/local/bundle/gems/rspec-retry-0.6.2/lib/rspec_ext/rspec_ext.rb:12:in `run_with_retry'
     # /usr/local/bundle/gems/rspec-retry-0.6.2/lib/rspec/retry.rb:37:in `block (2 levels) in setup'
     # ./spec/spec_helper.rb:10:in `block (2 levels) in <top (required)>'
```

</details>

Related to:

- https://github.com/samvera/hyku/pull/2007
- https://github.com/samvera/hyku/pull/2008

The above two commits will require some reconciliation once this is incorporated.
---
 .../hyrax/admin/appearances_controller.rb        |  4 ++--
 config/application.rb                            | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/controllers/hyrax/admin/appearances_controller.rb b/app/controllers/hyrax/admin/appearances_controller.rb
index b37308ebc..9130b8b11 100644
--- a/app/controllers/hyrax/admin/appearances_controller.rb
+++ b/app/controllers/hyrax/admin/appearances_controller.rb
@@ -16,8 +16,8 @@ def show
         add_breadcrumbs
         @form = form_class.new
         @fonts = [@form.headline_font, @form.body_font]
-        @home_theme_information = YAML.load_file('config/home_themes.yml')
-        @show_theme_information = YAML.load_file('config/show_themes.yml')
+        @home_theme_information = YAML.load_file(Hyku::Application.path_for('config/home_themes.yml'))
+        @show_theme_information = YAML.load_file(Hyku::Application.path_for('config/show_themes.yml'))
         @home_theme_names = load_home_theme_names
         @show_theme_names = load_show_theme_names
         @search_themes = load_search_themes
diff --git a/config/application.rb b/config/application.rb
index c221d0090..6aad688cf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -37,6 +37,22 @@ class Application < Rails::Application
     # Add this line to load the lib folder first because we need
     config.autoload_paths.unshift("#{Rails.root}/lib")
 
+    ##
+    # @api public
+    #
+    # @param relative_path [String] lookup the relative paths first in the Knapsack then in Hyku.
+    #
+    # @return [String] the path to the file, favoring those found in the knapsack but falling back
+    #         to those in the Rails.root.
+    def self.path_for(relative_path)
+      if defined?(HykuKnapsack)
+        engine_path = HykuKnapsack::Engine.root.join(relative_path)
+        return engine_path.to_s if engine_path.exist?
+      end
+
+      Rails.root.join(relative_path).to_s
+    end
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

From ff3fbcc5b0059577fdd24d841b8f5f01e66f070b Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Thu, 5 Oct 2023 08:47:22 -0400
Subject: [PATCH 043/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Favor=20Hyku::Appl?=
 =?UTF-8?q?ication.path=5Ffor=20over=20Rails.root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Given the existence of Knapsack we need to consider how overrides in
Knapsack will take precedence over Hyku files.  This change handles
cases where we want to use the Knapsack's uploaded thumbnails.

Related to:

- #2010
---
 app/services/uploaded_collection_thumbnail_path_service.rb    | 4 ++--
 .../hyrax/dashboard/collections/_current_thumbnail.html.erb   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/services/uploaded_collection_thumbnail_path_service.rb b/app/services/uploaded_collection_thumbnail_path_service.rb
index 18a3f662e..c22ac5801 100644
--- a/app/services/uploaded_collection_thumbnail_path_service.rb
+++ b/app/services/uploaded_collection_thumbnail_path_service.rb
@@ -9,11 +9,11 @@ def call(object)
 
     # rubocop:disable Metrics/LineLength, Rails/FilePath, Lint/StringConversionInInterpolation
     def uploaded_thumbnail?(collection)
-      File.exist?("#{Rails.root.to_s}/public/uploads/uploaded_collection_thumbnails/#{collection.id}/#{collection.id}_card.jpg")
+      File.exist?(File.join(upload_dir(collection), "#{collection.id}_card.jpg"))
     end
 
     def upload_dir(collection)
-      "#{Rails.root.to_s}/public/uploads/uploaded_collection_thumbnails/#{collection.id}"
+      Hyku::Application.path_for("public/uploads/uploaded_collection_thumbnails/#{collection.id}")
     end
     # rubocop:enable Metrics/LineLength, Rails/FilePath, Lint/StringConversionInInterpolation
   end
diff --git a/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb b/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
index 33306d375..fb64f8cc4 100644
--- a/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
+++ b/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
@@ -1,5 +1,5 @@
 <% thumbnail_path = SolrDocument.find(@collection.id).thumbnail_path %>
- <% if thumbnail_path.include?("uploaded_collection_thumbnails") and File.exist? Rails.root.join("public#{::SolrDocument.find(@collection.id).thumbnail_path}") %>
+ <% if thumbnail_path.include?("uploaded_collection_thumbnails") and File.exist? Hyky::Application.path_for("public#{::SolrDocument.find(@collection.id).thumbnail_path}") %>
   <%= image_tag(thumbnail_path, class: "current-thumbnail") %>
   <p>Current image: <strong><%= @thumbnail_filename %></strong></p>
 <% else %>

From 80e02d360760f87f2414245490b1c3f25f6923f2 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Fri, 6 Oct 2023 08:48:40 -0700
Subject: [PATCH 044/126] =?UTF-8?q?=F0=9F=8E=81=20Add=20highlight=20key=20?=
 =?UTF-8?q?to=20UV?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit allows for the `parent_query` to be highlighted in the UV so
users won't have to do a catalog search and also a UV search.
---
 config/uv/uv.html | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/config/uv/uv.html b/config/uv/uv.html
index c8e8eced5..c44dbb45d 100644
--- a/config/uv/uv.html
+++ b/config/uv/uv.html
@@ -19,20 +19,20 @@
             }
         </style>
         <script type="text/javascript">
-        window.addEventListener('uvLoaded', function(e) { 
+        window.addEventListener('uvLoaded', function(e) {
                 urlDataProvider = new UV.URLDataProvider(true);
                 var formattedLocales;
                 var locales = urlDataProvider.get('locales', '');
-    
+
                 if (locales) {
                     var names = locales.split(',');
                     formattedLocales = [];
-    
+
                     for (var i in names) {
                         var nameparts = String(names[i]).split(':');
                         formattedLocales[i] = {name: nameparts[0], label: nameparts[1]};
                     }
-                    
+
                 } else {
                     formattedLocales = [
                         {
@@ -40,7 +40,7 @@
                         }
                     ]
                 }
-    
+
                 uv = createUV('#uv', {
                     root: '.',
                     iiifResourceUri: urlDataProvider.get('manifest'),
@@ -53,34 +53,35 @@
                     rotation: Number(urlDataProvider.get('r', 0)),
                     xywh: urlDataProvider.get('xywh', ''),
                     embedded: true,
+                    highlight: urlDataProvider.get('q'),
                     locales: formattedLocales
                 }, urlDataProvider);
             }, false);
         </script>
-    </head>    
+    </head>
     <body>
-    
+
         <div id="uv" class="uv"></div>
-    
+
         <script>
             $(function() {
-        
+
                 var $UV = $('#uv');
-        
+
                 function resize() {
                     var windowWidth = window.innerWidth;
                     var windowHeight = window.innerHeight;
                     $UV.width(windowWidth);
                     $UV.height(windowHeight);
                 }
-        
+
                 $(window).on('resize' ,function() {
                     resize();
                 });
-                
+
                 resize();
             });
-            
+
         </script>
         <script type="text/javascript" src="uv.js"></script>
     </body>

From ae093f1c04e036057c17ec14e8a8ebeeac32a6bb Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Fri, 6 Oct 2023 22:12:27 -0700
Subject: [PATCH 045/126] =?UTF-8?q?=F0=9F=90=9B=20Mixin=20`HykuKnapsack::A?=
 =?UTF-8?q?pplicationHelper`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will mixin the `HykuKnapsack::ApplicationHelper` into the
ApplicationHelper which will allow us to use #render_ocr_snippets for
snippet highlighting.
---
 app/controllers/application_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9449da3c0..6bb33d215 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,6 +2,7 @@
 
 class ApplicationController < ActionController::Base
   include HykuHelper
+  include HykuKnapsack::ApplicationHelper
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception, prepend: true

From 9827c14489eedde7b5fffe6642bb038fb3aa4fd8 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Fri, 6 Oct 2023 22:25:02 -0700
Subject: [PATCH 046/126] =?UTF-8?q?Revert=20"=F0=9F=90=9B=20Mixin=20`HykuK?=
 =?UTF-8?q?napsack::ApplicationHelper`"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ae093f1c04e036057c17ec14e8a8ebeeac32a6bb.
---
 app/controllers/application_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6bb33d215..9449da3c0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,7 +2,6 @@
 
 class ApplicationController < ActionController::Base
   include HykuHelper
-  include HykuKnapsack::ApplicationHelper
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception, prepend: true

From 6ccd6181287d31b6f52e46f8c3107d36ad9f811a Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 10 Oct 2023 09:08:32 -0400
Subject: [PATCH 047/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Favor=20class=5Fat?=
 =?UTF-8?q?tribute=20over=20constant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In Adventist, we're needing to override the constant's values.  By
making this a class_attribute we can more readily do the override via
configuration instead of obliteration of a constant.
---
 app/forms/hyrax/forms/admin/appearance.rb     | 18 ++++++++++++----
 ...oaded_collection_thumbnail_path_service.rb |  4 ++--
 .../appearances/_default_colors_form.html.erb |  4 ++--
 .../appearances/_default_fonts_form.html.erb  |  4 ++--
 .../hyrax/forms/admin/appearance_spec.rb      | 21 +++++++++++++++++++
 5 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 spec/forms/hyrax/forms/admin/appearance_spec.rb

diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index ec64d6bb3..a58cb732d 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -17,12 +17,21 @@ class Appearance
         delegate :default_collection_image, :default_collection_image?, to: :site
         delegate :default_work_image, :default_work_image?, to: :site
 
-        DEFAULT_FONTS = {
+        ##
+        # @!group Class Attributes
+        #
+        # @!attribute default_fonts
+        #   @return [Hash<String, String>] there should be at least the key "body_font" and
+        #           "headline_font"
+        class_attribute :default_fonts, default: {
           'body_font'     => 'Helvetica Neue, Helvetica, Arial, sans-serif;',
           'headline_font' => 'Helvetica Neue, Helvetica, Arial, sans-serif;'
-        }.freeze
+        }
 
-        DEFAULT_COLORS = {
+        ##
+        # @!attribute default_colors
+        #   @return [Hash<String, String>]
+        class_attribute :default_colors, default: {
           'header_and_footer_background_color' => '#3c3c3c',
           'header_and_footer_text_color'       => '#dcdcdc',
           'navbar_background_color'            => '#000000',
@@ -40,7 +49,8 @@ class Appearance
           # 'active_tabs_background_color'     => '#337ab7',
           'facet_panel_background_color'       => '#f5f5f5',
           'facet_panel_text_color'             => '#333333'
-        }.freeze
+        }
+        # @!endgroup Class Attributes
 
         # @param [Hash] attributes the list of parameters from the form
         def initialize(attributes = {})
diff --git a/app/services/uploaded_collection_thumbnail_path_service.rb b/app/services/uploaded_collection_thumbnail_path_service.rb
index c22ac5801..1abfb8013 100644
--- a/app/services/uploaded_collection_thumbnail_path_service.rb
+++ b/app/services/uploaded_collection_thumbnail_path_service.rb
@@ -7,7 +7,7 @@ def call(object)
       "/uploads/uploaded_collection_thumbnails/#{object.id}/#{object.id}_card.jpg"
     end
 
-    # rubocop:disable Metrics/LineLength, Rails/FilePath, Lint/StringConversionInInterpolation
+    # rubocop:disable Metrics/LineLength, Rails/FilePath
     def uploaded_thumbnail?(collection)
       File.exist?(File.join(upload_dir(collection), "#{collection.id}_card.jpg"))
     end
@@ -15,6 +15,6 @@ def uploaded_thumbnail?(collection)
     def upload_dir(collection)
       Hyku::Application.path_for("public/uploads/uploaded_collection_thumbnails/#{collection.id}")
     end
-    # rubocop:enable Metrics/LineLength, Rails/FilePath, Lint/StringConversionInInterpolation
+    # rubocop:enable Metrics/LineLength, Rails/FilePath
   end
 end
diff --git a/app/views/hyrax/admin/appearances/_default_colors_form.html.erb b/app/views/hyrax/admin/appearances/_default_colors_form.html.erb
index 9a8251957..69c66108f 100644
--- a/app/views/hyrax/admin/appearances/_default_colors_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_default_colors_form.html.erb
@@ -1,6 +1,6 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
   <div class="panel-body defaultable-colors">
-    <% @form.class::DEFAULT_COLORS.each do |color_name, hex| %>
+    <% @form.default_colors.each do |color_name, hex| %>
       <%= render 'color_input', f: f, color_name: color_name, hex: hex %>
     <% end %>
   </div>
@@ -8,4 +8,4 @@
     <%= link_to 'Restore All Defaults', '#color', class: 'btn btn-default restore-all-default-colors' %>
     <%= f.submit class: 'btn btn-primary pull-right' %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb b/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb
index 3df04aba3..04e6192b2 100644
--- a/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb
@@ -1,6 +1,6 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
   <div class="panel-body defaultable-fonts">
-    <% df = @form.class::DEFAULT_FONTS %>
+    <% df = @form.default_fonts %>
     <% font = f.object.body_font %>
 
     <%= f.input :body_font, label: 'Select Body Font', required: false, input_html: { class: 'font-fields', data: { default_value: df['body_font'] } } %>
@@ -14,4 +14,4 @@
     <%= link_to 'Restore All Defaults', '#font', class: 'btn btn-default restore-all-default-fonts' %>
     <%= f.submit class: 'btn btn-primary pull-right' %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/spec/forms/hyrax/forms/admin/appearance_spec.rb b/spec/forms/hyrax/forms/admin/appearance_spec.rb
new file mode 100644
index 000000000..466c50e3b
--- /dev/null
+++ b/spec/forms/hyrax/forms/admin/appearance_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Hyrax::Forms::Admin::Appearance do
+  describe '.default_fonts' do
+    subject { described_class.default_fonts }
+
+    it { is_expected.to be_a(Hash) }
+
+    it "has the 'body_font' and 'headline_font' keys" do
+      expect(subject.keys).to match_array(['body_font', 'headline_font'])
+    end
+  end
+
+  describe '.default_colors' do
+    subject { described_class.default_colors }
+
+    it { is_expected.to be_a(Hash) }
+  end
+end

From 2ff5f6c6e2a5695ffa89277049bf1ce8ac08c928 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 10 Oct 2023 09:12:59 -0400
Subject: [PATCH 048/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Favor=20configurab?=
 =?UTF-8?q?le=20html=20head=20title=20value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, we hard-coded the page title; this is something
that should be far more configurable.  And this refactor is a step
towards that.

This also allows for downstream implementors to not have to override the
view simply to change the title element.
---
 app/views/layouts/application.html.erb | 2 +-
 config/application.rb                  | 9 +++++++++
 spec/config/application_spec.rb        | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 spec/config/application_spec.rb

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7b0575693..f0a8e0a85 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Hyku</title>
+  <title><%= Hyku::Application.html_head_title %></title>
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
diff --git a/config/application.rb b/config/application.rb
index 1eed55d69..40f2c32f2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -34,6 +34,15 @@ def self.utf_8_encode(string)
   end
 
   class Application < Rails::Application
+    ##
+    # @!group Class Attributes
+    #
+    # @!attribute html_head_title
+    #   The title to render for the application's HTML > HEAD > TITLE element.
+    #   @return [String]
+    class_attribute :html_head_title, default: "Hyku", attr_accessor: false
+    # @!endgroup Class Attributes
+
     # Add this line to load the lib folder first because we need
     # IiifPrint::SplitPdfs::AdventistPagesToJpgsSplitter
     config.autoload_paths.unshift("#{Rails.root}/lib")
diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb
new file mode 100644
index 000000000..35ce1619b
--- /dev/null
+++ b/spec/config/application_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Hyku::Application do
+  describe '.html_head_title' do
+    it { is_expected.to be_a(String) }
+  end
+end

From 1c2a9d4912f76e80ebf221208d666669b1fdf79a Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 10 Oct 2023 10:11:10 -0400
Subject: [PATCH 049/126] =?UTF-8?q?=F0=9F=90=9B=20Add=20custom=20rendering?=
 =?UTF-8?q?=20for=20license?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, the License would render as a plain URL.  With
this change, we are now coercing the license into a URL that is labeled
and titled with the name of the license.

This is copied and modified based on [Rights show partial][1]

Related to:

- https://github.com/scientist-softserv/adventist-dl/issues/620

[1]: https://github.com/samvera/hyrax/blob/b334e186e77691d7da8ed59ff27f091be1c2a700/app/views/records/show_fields/_rights.html.erb
---
 .rubocop.yml                                               | 4 ++++
 app/services/uploaded_collection_thumbnail_path_service.rb | 2 --
 app/views/records/show_fields/_license.html.erb            | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 app/views/records/show_fields/_license.html.erb

diff --git a/.rubocop.yml b/.rubocop.yml
index 90961c959..4a5fb78c8 100644
--- a/.rubocop.yml
+++ b/.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'
diff --git a/app/services/uploaded_collection_thumbnail_path_service.rb b/app/services/uploaded_collection_thumbnail_path_service.rb
index 1abfb8013..3685f9bb9 100644
--- a/app/services/uploaded_collection_thumbnail_path_service.rb
+++ b/app/services/uploaded_collection_thumbnail_path_service.rb
@@ -7,7 +7,6 @@ def call(object)
       "/uploads/uploaded_collection_thumbnails/#{object.id}/#{object.id}_card.jpg"
     end
 
-    # rubocop:disable Metrics/LineLength, Rails/FilePath
     def uploaded_thumbnail?(collection)
       File.exist?(File.join(upload_dir(collection), "#{collection.id}_card.jpg"))
     end
@@ -15,6 +14,5 @@ def uploaded_thumbnail?(collection)
     def upload_dir(collection)
       Hyku::Application.path_for("public/uploads/uploaded_collection_thumbnails/#{collection.id}")
     end
-    # rubocop:enable Metrics/LineLength, Rails/FilePath
   end
 end
diff --git a/app/views/records/show_fields/_license.html.erb b/app/views/records/show_fields/_license.html.erb
new file mode 100644
index 000000000..15cef91e0
--- /dev/null
+++ b/app/views/records/show_fields/_license.html.erb
@@ -0,0 +1,4 @@
+<% service = Hyrax::LicenseService.new %>
+<% record.license.each do |r| %>
+  <%= link_to_field('license', r, service.label(r)) %> <%= iconify_auto_link(r, false) %><br />
+<% end %>

From 363bc070b2e0c8d782cf4037203cb0f1bf75297d Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 10 Oct 2023 15:31:16 -0400
Subject: [PATCH 050/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Add=20option=20to?=
 =?UTF-8?q?=20override=20devise=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For Adventist, we wanted to disable registration of accounts as this was
creating a case where folks were creating their own accounts and
tenants.

Related to:

- https://github.com/scientist-softserv/adventist-dl/issues/492
- https://github.com/scientist-softserv/adventist-dl/issues/618
- https://github.com/samvera/hyku/pull/1964
- https://github.com/scientist-softserv/adventist-dl/pull/493
---
 app/models/user.rb              |  4 +---
 config/application.rb           | 15 +++++++++++++++
 spec/config/application_spec.rb | 18 ++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 7bfdd16cf..cfdea7500 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,9 +14,7 @@ class User < ApplicationRecord
   include Blacklight::User
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :invitable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :omniauthable, omniauth_providers: %i[saml openid_connect cas]
+  devise(*Hyku::Application.user_devise_parameters)
 
   after_create :add_default_group_membership!
 
diff --git a/config/application.rb b/config/application.rb
index 40f2c32f2..3af68f13f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -41,6 +41,21 @@ class Application < Rails::Application
     #   The title to render for the application's HTML > HEAD > TITLE element.
     #   @return [String]
     class_attribute :html_head_title, default: "Hyku", attr_accessor: false
+
+    # @!attribute user_devise_parameters
+    #   @return [Object]
+    #
+    #   This is a value that you want to set in the before_initialize block.
+    class_attribute :user_devise_parameters, instance_accessor: false, default: [
+                      :database_authenticatable,
+                      :invitable,
+                      :registerable,
+                      :recoverable,
+                      :rememberable,
+                      :trackable,
+                      :validatable,
+                      :omniauthable, { omniauth_providers: %i[saml openid_connect cas] }]
+
     # @!endgroup Class Attributes
 
     # Add this line to load the lib folder first because we need
diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb
index 35ce1619b..a3ab79038 100644
--- a/spec/config/application_spec.rb
+++ b/spec/config/application_spec.rb
@@ -4,6 +4,24 @@
 
 RSpec.describe Hyku::Application do
   describe '.html_head_title' do
+    subject { described_class.html_head_title }
+
     it { is_expected.to be_a(String) }
   end
+
+  describe '.user_devise_parameters' do
+    subject { described_class.user_devise_parameters }
+
+    it do
+      is_expected.to eq([:database_authenticatable,
+                         :invitable,
+                         :registerable,
+                         :recoverable,
+                         :rememberable,
+                         :trackable,
+                         :validatable,
+                         :omniauthable,
+                         { omniauth_providers: %i[saml openid_connect cas] }])
+    end
+  end
 end

From 961b712aeafa419c167d51996057ac636f0716b7 Mon Sep 17 00:00:00 2001
From: Rob Kaufman <rob@notch8.com>
Date: Thu, 12 Oct 2023 13:39:49 -0700
Subject: [PATCH 051/126] run asset build later in process to allow knapsack to
 run it only one time

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

diff --git a/Dockerfile b/Dockerfile
index d13b8e942..8916c378e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -91,10 +91,9 @@ ONBUILD RUN git config --global --add safe.directory /app/samvera && \
 
 ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
 
-ONBUILD RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install
-
-
 FROM hyku-base as hyku-web
+RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install
+
 CMD ./bin/web
 
 FROM hyku-web as hyku-worker

From 6930f7fdc71d693fb049a580eb9b7fc8cbafbba4 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Fri, 13 Oct 2023 12:34:12 -0400
Subject: [PATCH 052/126] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Add=20to=20Collect?=
 =?UTF-8?q?ion=20for=20page=202+=20of=20works?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, when you were on page 2 of your works and selected
a work to add to a collection, the query for available collections would
use the page 2 as part of the collection query.  This would mean the
first 100 collections (default page size) that you had access to add
works to were skipped.

With this commit, we omit the query parameters from the works page and
then query collections.

Related to:

- https://github.com/samvera/hyrax/pull/5972
- https://github.com/samvera/hyrax/issues/5969
- https://github.com/scientist-softserv/adventist-dl/issues/625

Co-authored-by: LaRita Robinson <larita@scientist.com>
---
 .../hyrax/my/works_controller_decorator.rb     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app/controllers/hyrax/my/works_controller_decorator.rb

diff --git a/app/controllers/hyrax/my/works_controller_decorator.rb b/app/controllers/hyrax/my/works_controller_decorator.rb
new file mode 100644
index 000000000..2817729e9
--- /dev/null
+++ b/app/controllers/hyrax/my/works_controller_decorator.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+##
+# OVERRIDE Hyrax 3.5.0; when Hyrax hits v4.0.0 we can remove this.
+# @see https://github.com/samvera/hyrax/pull/5972
+module Hyrax
+  module My
+    module WorksControllerDecorator
+      def collection_service
+        cloned = clone
+        cloned.params = {}
+        Hyrax::CollectionsService.new(cloned)
+      end
+    end
+  end
+end
+
+Hyrax::My::WorksController.prepend(Hyrax::My::WorksControllerDecorator)

From ad8444e99446afe93c188052fd0f41ff13fa3c87 Mon Sep 17 00:00:00 2001
From: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:26:12 -0700
Subject: [PATCH 053/126] test that invited users are added to the registered
 group

---
 .../hyku/invitations_controller_spec.rb       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/spec/controllers/hyku/invitations_controller_spec.rb b/spec/controllers/hyku/invitations_controller_spec.rb
index 4ed0cf5c0..bf87c4ff4 100644
--- a/spec/controllers/hyku/invitations_controller_spec.rb
+++ b/spec/controllers/hyku/invitations_controller_spec.rb
@@ -31,5 +31,31 @@
       expect(response).to redirect_to Hyrax::Engine.routes.url_helpers.admin_users_path(locale: 'en')
       expect(flash[:notice]).to eq 'An invitation email has been sent to user@guest.org.'
     end
+
+    context 'when user already exists' do
+      let(:user) { create(:user) }
+
+      # Mimic the state of a user who is only active in other tenants;
+      # i.e. a user who has no roles in this tenant
+      before do
+        user.roles.destroy_all
+      end
+
+      it 'adds the user to the registered group' do
+        expect(user.roles).to be_empty
+        expect(user.groups).to be_empty
+
+        post :create, params: {
+          user: {
+            email: user.email,
+            role: ''
+          }
+        }
+
+        user.reload
+        expect(user.roles).not_to be_empty
+        expect(user.groups).to eq([Ability.registered_group_name])
+      end
+    end
   end
 end

From db098e1d313624d824d1de287ffe543842f6885b Mon Sep 17 00:00:00 2001
From: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com>
Date: Thu, 12 Oct 2023 18:21:19 -0700
Subject: [PATCH 054/126] Add invited users to the registered group

Fixes a bug where users who were invited with no roles would not
show up in the users list at all
---
 app/controllers/hyku/invitations_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/hyku/invitations_controller.rb b/app/controllers/hyku/invitations_controller.rb
index dbe246cda..2aa11fcac 100644
--- a/app/controllers/hyku/invitations_controller.rb
+++ b/app/controllers/hyku/invitations_controller.rb
@@ -14,6 +14,7 @@ def create
       authorize! :grant_admin_role, User if params[:user][:role] == ::RolesService::ADMIN_ROLE
       self.resource = User.find_by(email: params[:user][:email]) || invite_resource
 
+      resource.add_default_group_membership!
       resource.add_role(params[:user][:role], Site.instance) if params[:user][:role].present?
 
       yield resource if block_given?

From 3919082b95d1cba35c1fbdc8f8d63422e9a74962 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Wed, 18 Oct 2023 12:49:43 -0400
Subject: [PATCH 055/126] =?UTF-8?q?=F0=9F=90=9B=20Change=20Hyky=20to=20Hyk?=
 =?UTF-8?q?u=20(#2029)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Typo caused inability to upload collection thumbnail.
---
 .../hyrax/dashboard/collections/_current_thumbnail.html.erb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb b/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
index fb64f8cc4..7c78b27a4 100644
--- a/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
+++ b/app/views/hyrax/dashboard/collections/_current_thumbnail.html.erb
@@ -1,5 +1,5 @@
 <% thumbnail_path = SolrDocument.find(@collection.id).thumbnail_path %>
- <% if thumbnail_path.include?("uploaded_collection_thumbnails") and File.exist? Hyky::Application.path_for("public#{::SolrDocument.find(@collection.id).thumbnail_path}") %>
+ <% if thumbnail_path.include?("uploaded_collection_thumbnails") and File.exist? Hyku::Application.path_for("public#{::SolrDocument.find(@collection.id).thumbnail_path}") %>
   <%= image_tag(thumbnail_path, class: "current-thumbnail") %>
   <p>Current image: <strong><%= @thumbnail_filename %></strong></p>
 <% else %>

From b0f2c442c18809c31f4cfe02e995558655dfa2b4 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 1 Nov 2023 12:23:11 -0700
Subject: [PATCH 056/126] =?UTF-8?q?=F0=9F=8E=81=20Modify=20labels=20in=20U?=
 =?UTF-8?q?V=20for=20V3=20manifests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will add the same treatment as we have for V2 manifests to
V3 manifests. This will allow the UV to add a more human readable label
to the pages.

Ref:
  - https://github.com/scientist-softserv/adventist-dl/issues/628
---
 .../canvas_builder_decorator.rb               | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb

diff --git a/lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb b/lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb
new file mode 100644
index 000000000..990bd1409
--- /dev/null
+++ b/lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# OVERRIDE IIIFManifest v1.3.1 to use the parent's title as the label instead of the filename
+
+module IIIFManifest
+  module V3
+    module ManifestBuilderDecorator
+      module CanvasBuilderDecorator
+        def apply_record_properties
+          super
+          canvas.label = if record.to_s.present?
+                           ManifestBuilder.language_map(record['parent_title_tesim']&.first || record.to_s)
+                         end
+        end
+      end
+    end
+  end
+end
+
+IIIFManifest::V3::ManifestBuilder.prepend(IIIFManifest::V3::ManifestBuilderDecorator)
+IIIFManifest::V3::ManifestBuilder::CanvasBuilder.prepend(IIIFManifest::V3::ManifestBuilder::CanvasBuilderDecorator)

From 7add38e9b4d8087b878714b0aa0439a1e3b23f73 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Mon, 27 Nov 2023 15:46:41 -0500
Subject: [PATCH 057/126] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bad=20method=20nam?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to:

- https://github.com/samvera/hyku/pull/2023/files
- https://github.com/scientist-softserv/atla-hyku/pull/198
---
 app/controllers/hyrax/my/works_controller_decorator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/hyrax/my/works_controller_decorator.rb b/app/controllers/hyrax/my/works_controller_decorator.rb
index 2817729e9..df68ce1ca 100644
--- a/app/controllers/hyrax/my/works_controller_decorator.rb
+++ b/app/controllers/hyrax/my/works_controller_decorator.rb
@@ -6,7 +6,7 @@
 module Hyrax
   module My
     module WorksControllerDecorator
-      def collection_service
+      def collections_service
         cloned = clone
         cloned.params = {}
         Hyrax::CollectionsService.new(cloned)

From dbe996e71afa63a5ba8f68f55e4c50ed25d3729d Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 29 Nov 2023 13:36:24 -0800
Subject: [PATCH 058/126] =?UTF-8?q?=F0=9F=90=9B=20Move=20some=20methods=20?=
 =?UTF-8?q?to=20be=20public?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will move #solr_document, #current_ability, and #request to
be public methods.  Since these methods in Hyrax were not private, in
the decorator it should not be private either.

Ref:
  - https://github.com/samvera/hyrax/blob/b334e186e77691d7da8ed59ff27f091be1c2a700/app/presenters/hyrax/file_set_presenter.rb#L10
---
 .../iiif_av/displays_content_decorator.rb     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
index 8348c245f..6260e456a 100644
--- a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
+++ b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
@@ -8,21 +8,21 @@ module IiifAv
     #   request.base_url => hostname
     # also to remove #auth_service since it was not working for now
     module DisplaysContentDecorator
-      private
+      def solr_document
+        defined?(super) ? super : object
+      end
 
-        def solr_document
-          defined?(super) ? super : object
-        end
+      def current_ability
+        defined?(super) ? super : @ability
+      end
 
-        def current_ability
-          defined?(super) ? super : @ability
-        end
+      def request
+        Request.new(base_url: hostname)
+      end
 
-        Request = Struct.new(:base_url, keyword_init: true)
+      private
 
-        def request
-          Request.new(base_url: hostname)
-        end
+        Request = Struct.new(:base_url, keyword_init: true)
 
         def image_content
           return nil unless latest_file_id

From da162d4d10864de607c43946b16af2e1a754af6e Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Mon, 11 Dec 2023 14:52:50 -0800
Subject: [PATCH 059/126] First attempt for upgrade to Hyrax 5.0.0.rc2

So far the changes throw an error `The adapter `nulldb_adapter` is not
yet supported` when doing a `docker compose build`.  Commenting out `RUN
RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb
DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn
install` in the Dockerfile allows the build to complete but still can't
boot yet.
---
 Dockerfile                   |    3 +-
 Gemfile                      |   23 +-
 Gemfile.lock                 | 1142 +++++++++++++++++-----------------
 config/application.rb        |    6 +
 config/initializers/riiif.rb |    2 +-
 5 files changed, 601 insertions(+), 575 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8916c378e..da22d3d7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-ARG HYRAX_IMAGE_VERSION=hyrax-v4.0.0.rc1
-ARG RUBY_VERSION=2.7.7
+ARG HYRAX_IMAGE_VERSION=hyrax-v5.0.0.rc2
 FROM ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_IMAGE_VERSION as hyku-base
 
 USER root
diff --git a/Gemfile b/Gemfile
index 3fd4a6453..f09b9adc8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,16 +4,16 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.5'
+gem 'rails', '~> 6.0'
 
-gem 'active-fedora', '>= 11.1.4'
+gem 'active-fedora', '~> 14.0'
 gem 'active_elastic_job', github: 'active-elastic-job/active-elastic-job', ref: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979', group: %i[aws]
 gem 'activerecord-nulldb-adapter'
 gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed
 gem 'apartment'
 gem 'aws-sdk-sqs', group: %i[aws]
-gem 'blacklight', '~> 6.7'
-gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1'
+gem 'blacklight', '~> 7.29'
+gem 'blacklight_oai_provider', '~> 7.0'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap-datepicker-rails'
 gem 'bulkrax', '~> 5.3'
@@ -29,15 +29,14 @@ gem 'devise'
 gem 'devise-guests', '~> 0.3'
 gem 'devise-i18n'
 gem 'devise_invitable', '~> 1.6'
-gem 'dry-monads', '~> 1.4.0' # Locked because 1.5.0 was not compatible with Hyrax v.3.4.2
+gem 'dry-monads', '~> 1.5'
 gem 'easy_translate', group: %i[development]
 gem 'factory_bot_rails', group: %i[test]
 gem 'fcrepo_wrapper', '~> 0.4', group: %i[development test]
-gem 'flipflop', '~> 2.6.0' # waiting for hyrax 4 upgrade
 gem 'flutie'
-gem 'hyrax', '~> 3.5.0'
-gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'main'
-gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'main'
+gem 'hyrax', github: 'samvera/hyrax', tag: 'hyrax-v5.0.0.rc2'
+gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
+gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
 gem 'i18n-debug', require: false, group: %i[development test]
 gem 'i18n-tasks', group: %i[development test]
 gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main'
@@ -63,9 +62,9 @@ gem 'pry-byebug', group: %i[development test]
 gem 'puma', '~> 5.6' # Use Puma as the app server
 gem 'rack-test', '0.7.0', group: %i[test] # rack-test >= 0.71 does not work with older Capybara versions (< 2.17). See #214 for more details
 gem 'rails-controller-testing', group: %i[test]
-gem 'rdf', '~> 3.1.15' # rdf 3.2.0 removed SerializedTransaction which ldp requires
+gem 'rdf', '~> 3.2'
 gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
-gem 'riiif', '~> 1.1'
+gem 'riiif', '~> 2.0'
 gem 'rolify'
 gem 'rsolr', '~> 2.0'
 gem 'rspec', group: %i[development test]
@@ -76,7 +75,7 @@ gem 'rspec-retry', group: %i[test]
 gem 'rspec_junit_formatter', group: %i[test]
 gem 'rubocop', '~> 0.50', '<= 0.52.1', group: %i[development test]
 gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2', group: %i[development test]
-gem 'sass-rails', '~> 5.0' # Use SCSS for stylesheets
+gem 'sass-rails', '~> 6.0' # Use SCSS for stylesheets
 gem 'scss_lint', require: false, group: %i[development]
 gem 'secure_headers'
 gem 'selenium-webdriver', '4.8.1', group: %i[test]
diff --git a/Gemfile.lock b/Gemfile.lock
index 651139ee2..fc61e6b27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,47 +9,106 @@ GIT
 
 GIT
   remote: https://github.com/samvera-labs/hyku_knapsack.git
-  revision: 446f16b928f7f12125fdaaf6feb08dcdacf1bd38
+  revision: 14f688b61afab9ee886f5f7fa26a76a37bced597
   branch: upstream_main
   specs:
     hyku_knapsack (0.0.1)
       rails (>= 5.2.0)
-      sentry-raven
 
 GIT
   remote: https://github.com/samvera-labs/hyrax-doi.git
-  revision: d494a50ef8ce3eae594c7ed7148c33b3c977d4a7
-  branch: main
+  revision: 9b7ab7f8054a14385b838de1118f55ad2e0f5da8
+  branch: rails_hyrax_upgrade
   specs:
     hyrax-doi (0.2.0)
-      bolognese (~> 1.8, >= 1.8.6)
+      bolognese (>= 1.8.6, < 2.0)
       flipflop (~> 2.3)
-      hyrax (>= 2.9, < 4.0)
-      rails (~> 5.2.4, >= 5.2.4.3)
+      hyrax (>= 2.9, < 6.0)
+      rails (>= 5.2.4.3, < 8.0)
 
 GIT
   remote: https://github.com/samvera-labs/hyrax-iiif_av.git
-  revision: 6273f90016c153d2add33f85cc24285d51a25382
-  branch: main
+  revision: 4bc4af3ebbc47b68a313108c72c319945c673c1b
+  branch: rails_hyrax_upgrade
   specs:
     hyrax-iiif_av (0.2.0)
       blacklight
-      hyrax (>= 2.9, < 4.0)
+      hyrax (>= 3.5, < 6.0)
       iiif_manifest (> 0.5)
-      rails (~> 5.1)
+      rails (>= 5.1, < 8.0)
+
+GIT
+  remote: https://github.com/samvera/hyrax.git
+  revision: 3dd81340fc2586132772fa4017946ed4c60adb8a
+  tag: hyrax-v5.0.0.rc2
+  specs:
+    hyrax (5.0.0.rc2)
+      active-fedora (~> 14.0)
+      almond-rails (~> 0.1)
+      awesome_nested_set (~> 3.1)
+      blacklight (~> 7.29)
+      blacklight-gallery (~> 4.0)
+      breadcrumbs_on_rails (~> 3.0)
+      browse-everything (>= 0.16, < 2.0)
+      carrierwave (~> 1.0)
+      clipboard-rails (~> 1.5)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.4)
+      draper (~> 4.0)
+      dry-container (~> 0.11)
+      dry-events (~> 1.0, >= 1.0.1)
+      dry-logic (~> 1.5)
+      dry-monads (~> 1.6)
+      dry-struct (~> 1.6)
+      dry-validation (~> 1.10)
+      flipflop (~> 2.3)
+      flot-rails (~> 0.0.6)
+      font-awesome-rails (~> 4.2)
+      hydra-derivatives (~> 3.3)
+      hydra-editor (~> 6.0)
+      hydra-file_characterization (~> 1.1)
+      hydra-head (~> 12.0)
+      hydra-works (>= 0.16)
+      iiif_manifest (>= 0.3, < 2.0)
+      json-schema
+      legato (~> 0.3)
+      linkeddata
+      mailboxer (~> 0.12)
+      nest (~> 3.1)
+      noid-rails (~> 3.0)
+      oauth
+      oauth2 (~> 1.2)
+      openseadragon
+      posix-spawn
+      qa (~> 5.5, >= 5.5.1)
+      rails (~> 6.1)
+      rails_autolink (~> 1.1)
+      rdf-rdfxml
+      rdf-vocab (~> 3.0)
+      redis (~> 4.0)
+      redis-namespace (~> 1.5)
+      redlock (>= 0.1.2, < 2.0)
+      reform (~> 2.3)
+      reform-rails (~> 0.2.0)
+      retriable (>= 2.9, < 4.0)
+      sass-rails (~> 6.0)
+      select2-rails (~> 3.5)
+      signet
+      sprockets (~> 3.7)
+      tinymce-rails (~> 5.10)
+      valkyrie (~> 3.1.1)
+      view_component (~> 2.74.1)
 
 GIT
   remote: https://github.com/scientist-softserv/iiif_print.git
-  revision: 9e7837ce4bd08bf8fff9126455d0e0e2602f6018
+  revision: e476998ab453afabf1bcb8afa059b4416af9b705
   branch: main
   specs:
     iiif_print (1.0.0)
-      blacklight_iiif_search (~> 1.0)
+      blacklight_iiif_search (>= 1.0, < 3.0)
       derivative-rodeo (~> 0.5)
-      dry-monads (~> 1.4.0)
-      hyrax (>= 2.5, < 4)
+      hyrax (>= 2.5, < 6)
       nokogiri (>= 1.13.2)
-      rails (~> 5.0)
       rdf-vocab (~> 3.0)
 
 GIT
@@ -65,35 +124,50 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.8.1)
-      actionpack (= 5.2.8.1)
+    actioncable (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
+    actionmailbox (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      mail (>= 2.7.1)
+    actionmailer (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.8.1)
-      actionview (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.7.6)
+      actionview (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.8.1)
-      activesupport (= 5.2.8.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.7.6)
+      activesupport (= 6.1.7.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active-fedora (13.3.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    active-fedora (14.0.1)
       active-triples (>= 0.11.0, < 2.0.0)
       activemodel (>= 5.1)
       activesupport (>= 5.1)
       deprecation
-      faraday (~> 0.12)
+      faraday (>= 1.0)
       faraday-encoding (>= 0.0.5)
       ldp (>= 0.7.0, < 2)
       rsolr (>= 1.1.2, < 3)
@@ -106,68 +180,65 @@ GEM
     active_encode (0.8.2)
       rails
       sprockets (< 4)
-    activejob (5.2.8.1)
-      activesupport (= 5.2.8.1)
+    activejob (6.1.7.6)
+      activesupport (= 6.1.7.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.8.1)
-      activesupport (= 5.2.8.1)
+    activemodel (6.1.7.6)
+      activesupport (= 6.1.7.6)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      arel (>= 9.0)
-    activerecord-import (1.4.1)
+    activerecord (6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+    activerecord-import (1.5.1)
       activerecord (>= 4.2)
-    activerecord-nulldb-adapter (0.9.0)
-      activerecord (>= 5.2.0, < 7.1)
-    activestorage (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      marcel (~> 1.0.0)
-    activesupport (5.2.8.1)
+    activerecord-nulldb-adapter (1.0.1)
+      activerecord (>= 5.2.0, < 7.2)
+    activestorage (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
     almond-rails (0.3.0)
       rails (>= 4.2)
-    amazing_print (1.4.0)
-    apartment (2.2.1)
-      activerecord (>= 3.1.2, < 6.0)
-      parallel (>= 0.7.1)
-      public_suffix (>= 2)
+    apartment (0.24.3)
+      activerecord (>= 3.1.2)
       rack (>= 1.3.6)
-    arel (9.0.0)
     ast (2.4.2)
     attr_required (1.0.1)
-    autoprefixer-rails (10.4.13.0)
-      execjs (~> 2)
-    awesome_nested_set (3.5.0)
-      activerecord (>= 4.0.0, < 7.1)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.785.0)
-    aws-sdk-core (3.178.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    awesome_nested_set (3.6.0)
+      activerecord (>= 4.0.0, < 7.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.864.0)
+    aws-sdk-core (3.190.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.74.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.121.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.141.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sdk-sqs (1.61.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+      aws-sigv4 (~> 1.8)
+    aws-sdk-sqs (1.69.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.6.0)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -176,49 +247,50 @@ GEM
     bagit (0.4.6)
       docopt (~> 0.5.0)
       validatable (~> 1.6)
+    base64 (0.2.0)
     bcp47 (0.3.3)
       i18n
-    bcrypt (3.1.18)
+    bcp47_spec (0.2.1)
+    bcrypt (3.1.20)
     benchmark_methods (0.7)
-    better_html (1.0.16)
-      actionview (>= 4.0)
-      activesupport (>= 4.0)
+    better_html (2.0.2)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
-      html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
     bibtex-ruby (6.0.0)
       latex-decode (~> 0.0)
+    bigdecimal (3.1.4)
     bindata (2.4.15)
     bindex (0.8.1)
-    blacklight (6.25.0)
-      bootstrap-sass (~> 3.2)
+    blacklight (7.35.0)
       deprecation
       globalid
+      hashdiff
+      i18n (>= 1.7.0)
       jbuilder (~> 2.7)
       kaminari (>= 0.15)
-      nokogiri (~> 1.6)
-      rails (>= 4.2, < 6)
-      rsolr (>= 1.0.6, < 3)
-      twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
-    blacklight-access_controls (0.6.2)
-      blacklight (~> 6.0)
-      cancancan (~> 1.8)
+      ostruct (>= 0.3.2)
+      rails (>= 5.1, < 7.2)
+      view_component (>= 2.66, < 4)
+    blacklight-access_controls (6.0.1)
+      blacklight (> 6.0, < 8)
+      cancancan (>= 1.8)
       deprecation (~> 1.0)
-    blacklight-gallery (0.12.0)
-      blacklight (~> 6.3)
-      bootstrap-sass (~> 3.0)
-      openseadragon (>= 0.2.0)
-      rails
-    blacklight_iiif_search (1.0.0)
-      blacklight (~> 6.0)
+    blacklight-gallery (4.4.0)
+      blacklight (>= 7.17, < 9)
+      rails (>= 6.1, < 8)
+    blacklight_iiif_search (2.0.0)
+      blacklight (~> 7.0)
       iiif-presentation
-      rails (>= 4.2, < 6)
-    blacklight_oai_provider (6.1.1)
-      blacklight (~> 6.0)
-      oai (~> 1.0)
-    bolognese (1.11.0)
+      rails (>= 5.1, < 7)
+    blacklight_oai_provider (7.0.2)
+      blacklight (~> 7.0)
+      oai (~> 1.2)
+      rexml
+    bolognese (1.11.5)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -242,27 +314,23 @@ GEM
       rdf-rdfxml (~> 3.1)
       rdf-turtle (~> 3.1)
       thor (>= 0.19)
-    bootstrap-datepicker-rails (1.9.0.1)
+    bootstrap-datepicker-rails (1.10.0.1)
       railties (>= 3.0)
-    bootstrap-sass (3.4.1)
-      autoprefixer-rails (>= 5.2.1)
-      sassc (>= 2.0.0)
     breadcrumbs_on_rails (3.0.1)
-    browse-everything (1.2.0)
+    browse-everything (1.3.0)
       addressable (~> 2.5)
       aws-sdk-s3
       dropbox_api (>= 0.1.20)
       google-apis-drive_v3
       googleauth (>= 0.6.6, < 2.0)
-      rails (>= 4.2, < 7.1)
+      rails (>= 4.2, < 7.2)
       ruby-box
       signet (~> 0.8)
       typhoeus
     builder (3.2.4)
-    bulkrax (5.4.0)
+    bulkrax (5.5.0)
       bagit (~> 0.4)
       coderay
-      dry-monads (~> 1.4.0)
       iso8601 (~> 0.9.0)
       kaminari
       language_list (~> 1.2, >= 1.2.1)
@@ -275,8 +343,8 @@ GEM
       rubyzip
       simple_form
     byebug (11.1.3)
-    cancancan (1.17.0)
-    capybara (3.39.0)
+    cancancan (3.5.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -288,7 +356,7 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.3.3)
+    carrierwave (1.3.4)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
@@ -303,8 +371,7 @@ GEM
       csl (~> 1.6)
     clipboard-rails (1.7.1)
     cocoon (1.2.15)
-    codemirror-rails (5.16.0)
-      railties (>= 3.0, < 6.0)
+    codemirror-rails (0.3.1)
     coderay (1.1.3)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
@@ -315,7 +382,7 @@ GEM
     coffee-script-source (1.12.2)
     colorize (0.8.1)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -330,14 +397,11 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.3)
+    date (3.3.4)
     declarative (0.0.20)
-    declarative-builder (0.1.0)
-      declarative-option (< 0.2.0)
-    declarative-option (0.1.0)
     deprecation (1.1.0)
       activesupport
-    derivative-rodeo (0.5.0)
+    derivative-rodeo (0.5.3)
       activesupport (>= 5)
       aws-sdk-s3
       aws-sdk-sqs
@@ -346,7 +410,7 @@ GEM
       mime-types
       mini_magick
       nokogiri
-    devise (4.9.2)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -354,18 +418,15 @@ GEM
       warden (~> 1.2.3)
     devise-guests (0.8.1)
       devise
-    devise-i18n (1.11.0)
+    devise-i18n (1.12.0)
       devise (>= 4.9.0)
     devise_invitable (1.7.5)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
     diff-lcs (1.5.0)
-    disposable (0.4.7)
+    disposable (0.6.3)
       declarative (>= 0.0.9, < 1.0.0)
-      declarative-builder (< 0.2.0)
-      declarative-option (< 0.2.0)
-      representable (>= 2.4.0, <= 3.1.0)
-      uber (< 0.2.0)
+      representable (>= 3.1.1, < 4)
     docile (1.4.0)
     docopt (0.5.0)
     draper (4.0.2)
@@ -378,97 +439,96 @@ GEM
     dropbox_api (0.1.21)
       faraday (< 3.0)
       oauth2 (~> 1.1)
-    dry-configurable (0.16.1)
-      dry-core (~> 0.6)
+    dry-configurable (1.1.0)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-    dry-core (0.9.1)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-equalizer (0.3.0)
-    dry-events (0.2.0)
+    dry-events (1.0.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
-    dry-inflector (0.3.0)
+      dry-core (~> 1.0, < 2)
+    dry-inflector (1.0.0)
     dry-initializer (3.1.1)
-    dry-logic (1.3.0)
+    dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.9, >= 0.9)
+      dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-matcher (0.9.0)
-      dry-core (~> 0.4, >= 0.4.8)
-    dry-monads (1.4.0)
+    dry-monads (1.6.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.7)
-    dry-schema (1.11.3)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.3)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.16, >= 0.16)
-      dry-core (~> 0.9, >= 0.9)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-logic (~> 1.3)
-      dry-types (~> 1.6)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-struct (1.5.2)
-      dry-core (~> 0.9, >= 0.9)
-      dry-types (~> 1.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
-    dry-transaction (0.13.3)
-      dry-container (>= 0.2.8)
-      dry-events (>= 0.1.0)
-      dry-matcher (>= 0.7.0)
-      dry-monads (>= 0.4.0)
-    dry-types (1.6.1)
+    dry-types (1.7.1)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.9, >= 0.9)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.3, >= 1.3)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    dry-validation (1.9.0)
+    dry-validation (1.10.0)
       concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.9, >= 0.9)
+      dry-core (~> 1.0, < 2)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.11, >= 1.11.0)
+      dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
     easy_translate (0.5.1)
       thread
       thread_safe
-    ebnf (2.2.1)
-      amazing_print (~> 1.2)
+    ebnf (2.4.0)
       htmlentities (~> 4.3)
-      rdf (~> 3.1)
+      rdf (~> 3.3)
       scanf (~> 1.0)
-      sxp (~> 1.1)
-      unicode-types (~> 1.6)
+      sxp (~> 1.3)
+      unicode-types (~> 1.8)
     edtf (3.1.1)
       activesupport (>= 3.0, < 8.0)
-    equivalent-xml (0.6.0)
-      nokogiri (>= 1.4.3)
     erubi (1.12.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     excon (0.71.1)
-    execjs (2.8.1)
-    factory_bot (6.2.1)
+    execjs (2.9.1)
+    factory_bot (6.4.2)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
+    factory_bot_rails (6.4.2)
+      factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faraday (0.17.6)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.12)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
     faraday-encoding (0.0.5)
       faraday
-    faraday_middleware (0.14.0)
-      faraday (>= 0.7.4, < 1.0)
+    faraday-excon (2.1.0)
+      excon (>= 0.27.4)
+      faraday (~> 2.0)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-gzip (0.1.0)
+      faraday (>= 1.0)
+      zlib (~> 2.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (3.0.2)
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
-    ffi (1.15.5)
-    flipflop (2.6.0)
+    ffi (1.16.3)
+    flipflop (2.7.1)
       activesupport (>= 4.0)
+      terminal-table (>= 1.8)
     flot-rails (0.0.7)
       jquery-rails
     flutie (2.2.0)
@@ -476,10 +536,11 @@ GEM
       railties (>= 3.2, < 8.0)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
-    geocoder (1.8.1)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    google-apis-core (0.11.0)
+    geo_coord (0.2.0)
+    geocoder (1.8.2)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -488,17 +549,20 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-drive_v3 (0.39.0)
+    google-apis-drive_v3 (0.46.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    googleauth (1.5.2)
-      faraday (>= 0.17.3, < 3.a)
+    google-cloud-env (2.0.1)
+      faraday (>= 1.0, < 3.a)
+    googleauth (1.9.0)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.0, >= 2.0.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
@@ -506,46 +570,46 @@ GEM
     hashie (5.0.0)
     highline (2.1.0)
     hiredis (0.6.3)
-    html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_logger (0.7.0)
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    hydra-access-controls (11.0.7)
+    hydra-access-controls (12.1.0)
       active-fedora (>= 10.0.0)
-      activesupport (>= 4, < 6)
-      blacklight (>= 5.16)
-      blacklight-access_controls (~> 0.6.0)
-      cancancan (~> 1.8)
+      activesupport (>= 5.2, < 7.1)
+      blacklight-access_controls (~> 6.0)
+      cancancan (>= 1.8, < 4)
       deprecation (~> 1.0)
-    hydra-core (11.0.7)
-      hydra-access-controls (= 11.0.7)
-      railties (>= 4.0.0, < 6)
-    hydra-derivatives (3.7.0)
-      active-fedora (>= 11.5.6, != 13.2.1, != 13.2.0, != 13.1.3, != 13.1.2, != 13.1.1, != 13.1.0, != 13.0.0, != 12.2.1, != 12.2.0, != 12.1.1, != 12.1.0, != 12.0.3, != 12.0.2, != 12.0.1, != 12.0.0)
+    hydra-core (12.1.0)
+      hydra-access-controls (= 12.1.0)
+      railties (>= 5.2, < 7.1)
+    hydra-derivatives (3.8.0)
+      active-fedora (>= 14.0)
+      active-triples (>= 1.2)
       active_encode (~> 0.1)
-      activesupport (>= 4.0, < 7)
+      activesupport (>= 4.0, < 7.1)
       addressable (~> 2.5)
       deprecation
       mime-types (> 2.0, < 4.0)
       mini_magick (>= 3.2, < 5)
-    hydra-editor (5.0.5)
+    hydra-editor (6.2.0)
       active-fedora (>= 9.0.0)
-      activerecord (~> 5.0)
+      activerecord (>= 5.2, < 7.1)
       almond-rails (~> 0.1)
-      cancancan (~> 1.8)
-      rails (>= 5, < 6)
-      simple_form (>= 4.1.0, < 6.0)
-      sprockets (~> 3.7)
+      cancancan
+      psych (~> 3.3, < 4)
+      rails (>= 5.2, < 7.1)
+      simple_form (>= 4.1.0, < 5.2)
+      sprockets (>= 3.7)
       sprockets-es6
-    hydra-file_characterization (1.1.2)
+    hydra-file_characterization (1.2.0)
       activesupport (>= 3.0.0)
-    hydra-head (11.0.7)
-      hydra-access-controls (= 11.0.7)
-      hydra-core (= 11.0.7)
-      rails (>= 5.2, < 6.1)
+    hydra-head (12.1.0)
+      hydra-access-controls (= 12.1.0)
+      hydra-core (= 12.1.0)
+      rails (>= 5.2, < 7.1)
     hydra-pcdm (1.3.0)
       active-fedora (>= 10, < 15)
       mime-types (>= 1)
@@ -555,64 +619,6 @@ GEM
       hydra-derivatives (~> 3.6)
       hydra-file_characterization (~> 1.0)
       hydra-pcdm (>= 0.9)
-    hyrax (3.5.0)
-      active-fedora (~> 13.1, >= 13.1.2)
-      almond-rails (~> 0.1)
-      awesome_nested_set (~> 3.1)
-      blacklight (~> 6.14)
-      blacklight-gallery (~> 0.7)
-      breadcrumbs_on_rails (~> 3.0)
-      browse-everything (>= 0.16, < 2.0)
-      carrierwave (~> 1.0)
-      clipboard-rails (~> 1.5)
-      draper (~> 4.0)
-      dry-equalizer (~> 0.2)
-      dry-events (~> 0.2.0)
-      dry-monads (< 1.5)
-      dry-struct (~> 1.0)
-      dry-transaction (~> 0.11)
-      dry-validation (~> 1.3)
-      flipflop (~> 2.3)
-      flot-rails (~> 0.0.6)
-      font-awesome-rails (~> 4.2)
-      hydra-derivatives (~> 3.3)
-      hydra-editor (~> 5.0, >= 5.0.4)
-      hydra-file_characterization (~> 1.1.2)
-      hydra-head (~> 11.0, >= 11.0.1)
-      hydra-works (>= 0.16)
-      iiif_manifest (>= 0.3, < 2.0)
-      jquery-datatables-rails (~> 3.4)
-      jquery-ui-rails (~> 6.0)
-      json-ld (< 3.2)
-      json-schema
-      kaminari_route_prefix (~> 0.1.1)
-      legato (~> 0.3)
-      linkeddata
-      mailboxer (~> 0.12)
-      nest (~> 3.1)
-      noid-rails (~> 3.0.0)
-      oauth
-      oauth2 (~> 1.2)
-      posix-spawn
-      power_converter (~> 0.1, >= 0.1.2)
-      psych (~> 3.3)
-      qa (~> 5.5, >= 5.5.1)
-      rails (~> 5.0)
-      rails_autolink (~> 1.1)
-      rdf-rdfxml
-      rdf-vocab (~> 3.0)
-      redis (~> 4.0)
-      redis-namespace (~> 1.5)
-      redlock (>= 0.1.2)
-      reform (~> 2.3)
-      reform-rails (~> 0.2.0)
-      retriable (>= 2.9, < 4.0)
-      samvera-nesting_indexer (~> 2.0)
-      sass-rails (~> 5.0)
-      select2-rails (~> 3.5)
-      signet
-      tinymce-rails (~> 5.10)
-      valkyrie (~> 2, >= 2.1.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n-debug (1.2.0)
@@ -629,9 +635,12 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    iiif-presentation (1.1.0)
+    iiif-image-api (0.2.0)
+      activesupport
+    iiif-presentation (1.3.0)
       activesupport (>= 3.2.18)
-      faraday (>= 0.9)
+      faraday (~> 2.7)
+      geo_coord
       json
     iiif_manifest (1.3.1)
       activesupport (>= 4)
@@ -641,40 +650,34 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    jquery-datatables-rails (3.4.0)
-      actionpack (>= 3.1)
-      jquery-rails
-      railties (>= 3.1)
-      sass-rails
-    jquery-rails (4.5.1)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
-      railties (>= 3.2.16)
-    json (2.6.3)
+    json (2.7.1)
     json-canonicalization (0.3.1)
-    json-jwt (1.15.3)
+    json-jwt (1.16.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
-      httpclient
-    json-ld (3.1.10)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    json-ld (3.2.4)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.2)
+      json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.14)
-      rack (~> 2.0)
-      rdf (~> 3.1)
-    json-ld-preloaded (3.1.6)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
-    json-schema (4.0.0)
+      multi_json (~> 1.15)
+      rack (>= 2.2, < 4)
+      rdf (~> 3.2, >= 3.2.10)
+    json-ld-preloaded (3.2.2)
+      json-ld (~> 3.2)
+      rdf (~> 3.2)
+    json-schema (4.1.1)
       addressable (>= 2.8)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
-    jwt (2.7.0)
+    jwt (2.7.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -687,25 +690,24 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    kaminari_route_prefix (0.1.1)
-      kaminari (~> 1.0)
     language_list (1.2.1)
     latex-decode (0.4.0)
     launchy (2.5.2)
       addressable (~> 2.8)
-    ld-patch (3.1.3)
-      ebnf (~> 2.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
-    ldp (1.0.3)
+    ld-patch (3.3.0)
+      ebnf (~> 2.4)
+      rdf (~> 3.3)
+      rdf-xsd (~> 3.3)
+      sparql (~> 3.3)
+      sxp (~> 1.3)
+    ldp (1.2.0)
       deprecation
-      faraday
+      faraday (>= 1)
       http_logger
-      json-ld
-      rdf (>= 1.1)
+      json-ld (~> 3.2)
+      rdf (~> 3.2)
       rdf-isomorphic
+      rdf-ldp
       rdf-turtle
       rdf-vocab (>= 0.8)
       slop
@@ -718,44 +720,44 @@ GEM
       multi_json
     libxml-ruby (3.2.4)
     link_header (0.0.8)
-    linkeddata (3.1.6)
-      equivalent-xml (~> 0.6)
-      json-ld (~> 3.1, >= 3.1.10)
-      json-ld-preloaded (~> 3.1, >= 3.1.6)
-      ld-patch (~> 3.1, >= 3.1.3)
-      nokogiri (~> 1.12)
-      rdf (~> 3.1, >= 3.1.15)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-isomorphic (~> 3.1, >= 3.1.1)
-      rdf-json (~> 3.1)
-      rdf-microdata (~> 3.1, >= 3.1.4)
-      rdf-n3 (~> 3.1, >= 3.1.2)
-      rdf-normalize (~> 0.4)
-      rdf-ordered-repo (~> 3.1, >= 3.1.1)
-      rdf-rdfa (~> 3.1, >= 3.1.3)
-      rdf-rdfxml (~> 3.1, >= 3.1.1)
-      rdf-reasoner (~> 0.7, >= 0.7.2)
-      rdf-tabular (~> 3.1, >= 3.1.1)
-      rdf-trig (~> 3.1, >= 3.1.2)
-      rdf-trix (~> 3.1, >= 3.1.1)
-      rdf-turtle (~> 3.1, >= 3.1.3)
-      rdf-vocab (~> 3.1, >= 3.1.14)
-      rdf-xsd (~> 3.1, >= 3.1.1)
-      shacl (~> 0.1, >= 0.1.1)
-      shex (~> 0.6, >= 0.6.4)
-      sparql (~> 3.1, >= 3.1.8)
-      sparql-client (~> 3.1, >= 3.1.2)
-    listen (3.1.5)
+    linkeddata (3.2.1)
+      json-ld (~> 3.2, >= 3.2.3)
+      json-ld-preloaded (~> 3.2)
+      ld-patch (~> 3.2)
+      nokogiri (~> 1.13, >= 1.13.8)
+      rdf (~> 3.2, >= 3.2.9)
+      rdf-aggregate-repo (~> 3.2, >= 3.2.1)
+      rdf-hamster-repo (~> 3.2)
+      rdf-isomorphic (~> 3.2, >= 3.2.1)
+      rdf-json (~> 3.2)
+      rdf-microdata (~> 3.2, >= 3.2.1)
+      rdf-n3 (~> 3.2, >= 3.2.1)
+      rdf-normalize (~> 0.5)
+      rdf-ordered-repo (~> 3.2, >= 3.2.1)
+      rdf-rdfa (~> 3.2)
+      rdf-rdfxml (~> 3.2)
+      rdf-reasoner (~> 0.8)
+      rdf-tabular (~> 3.2, >= 3.2.1)
+      rdf-trig (~> 3.2)
+      rdf-trix (~> 3.2)
+      rdf-turtle (~> 3.2, >= 3.2.1)
+      rdf-vocab (~> 3.2, >= 3.2.1)
+      rdf-xsd (~> 3.2, >= 3.2.1)
+      shacl (~> 0.2, >= 0.2.1)
+      shex (~> 0.7, >= 0.7.1)
+      sparql (~> 3.2, >= 3.2.4)
+      sparql-client (~> 3.2, >= 3.2.1)
+      yaml-ld (~> 0.0)
+    listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    logger (1.5.3)
-    lograge (0.12.0)
+    logger (1.6.0)
+    lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -767,27 +769,29 @@ GEM
       carrierwave (>= 0.5.8)
       rails (>= 5.0.0)
     marcel (1.0.2)
-    maremma (4.9.8)
+    maremma (4.9.9)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.71.0)
-      faraday (~> 0.17.3)
-      faraday-encoding (~> 0.0.4)
-      faraday_middleware (~> 0.14.0)
-      nokogiri (>= 1.11.2, < 1.14.0)
+      faraday (>= 2.0)
+      faraday-encoding (~> 0.0.5)
+      faraday-excon (~> 2.1.0)
+      faraday-follow_redirects (~> 0.3.0)
+      faraday-gzip (~> 0.1.0)
+      faraday-multipart (~> 1.0.4)
+      nokogiri (>= 1.13.1, < 1.14.0)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
     matrix (0.4.2)
-    memoist (0.16.2)
     method_source (1.0.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
+    mime-types-data (3.2023.1205)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.4)
-    minitest (5.18.1)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
+    minitest (5.20.0)
     mods (2.4.1)
       edtf
       iso-639
@@ -804,19 +808,19 @@ GEM
       redic
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.3.6)
+    net-imap (0.4.8)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
-    nio4r (2.5.9)
+    nio4r (2.7.0)
     noid (0.9.0)
-    noid-rails (3.0.3)
-      actionpack (>= 5.0.0, < 7)
+    noid-rails (3.1.0)
+      actionpack (>= 5.0.0, < 7.1)
       noid (~> 0.9)
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
@@ -824,10 +828,10 @@ GEM
     nom-xml (1.2.0)
       i18n
       nokogiri
-    oai (1.1.0)
+    oai (1.2.1)
       builder (>= 3.1.0)
-      faraday
-      faraday_middleware
+      faraday (< 3)
+      faraday-follow_redirects (>= 0.3.0, < 2)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
       snaky_hash (~> 2.0)
@@ -840,9 +844,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    oj (3.14.3)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
     oj_mimic_json (1.0.1)
-    okcomputer (1.18.4)
+    okcomputer (1.18.5)
     omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
@@ -855,36 +860,38 @@ GEM
     omniauth-saml (2.1.0)
       omniauth (~> 2.0)
       ruby-saml (~> 1.12)
-    omniauth_openid_connect (0.6.1)
+    omniauth_openid_connect (0.7.1)
       omniauth (>= 1.9, < 3)
-      openid_connect (~> 1.1)
-    openid_connect (1.4.2)
+      openid_connect (~> 2.2)
+    openid_connect (2.2.0)
       activemodel
       attr_required (>= 1.0.0)
-      json-jwt (>= 1.15.0)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+      json-jwt (>= 1.16)
       net-smtp
-      rack-oauth2 (~> 1.21)
-      swd (~> 1.3)
+      rack-oauth2 (~> 2.2)
+      swd (~> 2.0)
       tzinfo
       validate_email
       validate_url
-      webfinger (~> 1.2)
+      webfinger (~> 2.0)
     openseadragon (0.6.0)
       rails (> 3.2.0)
-    optimist (3.0.1)
+    optimist (3.1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
+    ostruct (0.6.0)
     parallel (1.23.0)
     parser (2.5.3.0)
       ast (~> 2.4.0)
     parslet (2.0.0)
-    pg (1.5.3)
+    pg (1.5.4)
     posix-spawn (0.3.15)
     postrank-uri (1.1)
       addressable (>= 2.4.0)
       nokogiri (>= 1.8.0)
       public_suffix (>= 4.0.0, < 5)
-    power_converter (0.1.2)
     powerpack (0.1.3)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -896,158 +903,168 @@ GEM
     public_suffix (4.0.7)
     puma (5.6.7)
       nio4r (~> 2.0)
-    qa (5.10.0)
+    qa (5.11.0)
       activerecord-import
       deprecation
       faraday (< 3.0, != 2.0.0)
       geocoder
       ldpath
       nokogiri (~> 1.6)
-      rails (>= 5.0, < 7.1)
+      rails (>= 5.0, < 7.2)
       rdf
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
-    rack-oauth2 (1.21.3)
+    rack-oauth2 (2.2.0)
       activesupport
       attr_required
-      httpclient
+      faraday (~> 2.0)
+      faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (3.0.6)
-      rack
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-test (0.7.0)
       rack (>= 1.0, < 3)
-    rails (5.2.8.1)
-      actioncable (= 5.2.8.1)
-      actionmailer (= 5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      activestorage (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.8.1)
+    rails (6.1.7.6)
+      actioncable (= 6.1.7.6)
+      actionmailbox (= 6.1.7.6)
+      actionmailer (= 6.1.7.6)
+      actionpack (= 6.1.7.6)
+      actiontext (= 6.1.7.6)
+      actionview (= 6.1.7.6)
+      activejob (= 6.1.7.6)
+      activemodel (= 6.1.7.6)
+      activerecord (= 6.1.7.6)
+      activestorage (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
+      bundler (>= 1.15.0)
+      railties (= 6.1.7.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
-    rails-i18n (5.1.3)
+    rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
+      railties (>= 6.0.0, < 8)
     rails_autolink (1.1.8)
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    railties (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
+    railties (6.1.7.6)
+      actionpack (= 6.1.7.6)
+      activesupport (= 6.1.7.6)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.1.15)
-      hamster (~> 3.0)
+    rdf (3.3.1)
+      bcp47_spec (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.1.0)
-      rdf (~> 3.1)
-    rdf-isomorphic (3.1.1)
-      rdf (~> 3.1)
-    rdf-json (3.1.0)
-      rdf (~> 3.1)
-    rdf-microdata (3.1.4)
+    rdf-aggregate-repo (3.3.0)
+      rdf (~> 3.3)
+    rdf-hamster-repo (3.3.0)
+      hamster (~> 3.0)
+      rdf (~> 3.3)
+    rdf-isomorphic (3.3.0)
+      rdf (~> 3.3)
+    rdf-json (3.3.0)
+      rdf (~> 3.3)
+    rdf-ldp (0.1.0)
+      deprecation
+      rdf
+    rdf-microdata (3.2.1)
       htmlentities (~> 4.3)
-      nokogiri (~> 1.12)
-      rdf (~> 3.1, >= 3.1.13)
-      rdf-rdfa (~> 3.1, >= 3.1.3)
-      rdf-xsd (~> 3.1)
-    rdf-n3 (3.1.2)
-      ebnf (~> 2.1)
-      rdf (~> 3.1, >= 3.1.8)
-      sparql (~> 3.1, >= 3.1.4)
-      sxp (~> 1.1)
-    rdf-normalize (0.4.0)
-      rdf (~> 3.1)
-    rdf-ordered-repo (3.1.1)
-      rdf (~> 3.1)
-    rdf-rdfa (3.1.3)
-      haml (~> 5.2)
+      nokogiri (~> 1.13)
+      rdf (~> 3.2)
+      rdf-rdfa (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-n3 (3.3.0)
+      ebnf (~> 2.4)
+      rdf (~> 3.3)
+      sparql (~> 3.3)
+      sxp (~> 1.3)
+    rdf-normalize (0.7.0)
+      rdf (~> 3.3)
+    rdf-ordered-repo (3.3.0)
+      rdf (~> 3.3)
+    rdf-rdfa (3.3.0)
+      haml (~> 6.1)
       htmlentities (~> 4.3)
-      rdf (~> 3.1, >= 3.1.13)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-vocab (~> 3.1, >= 3.1.11)
-      rdf-xsd (~> 3.1)
-    rdf-rdfxml (3.1.1)
+      rdf (~> 3.3)
+      rdf-aggregate-repo (~> 3.3)
+      rdf-vocab (~> 3.3)
+      rdf-xsd (~> 3.3)
+    rdf-rdfxml (3.3.0)
+      builder (~> 3.2, >= 3.2.4)
       htmlentities (~> 4.3)
-      rdf (~> 3.1)
-      rdf-rdfa (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-reasoner (0.7.2)
-      rdf (~> 3.1, >= 3.1.12)
-      rdf-xsd (~> 3.1)
-    rdf-tabular (3.1.1)
-      addressable (~> 2.3)
+      rdf (~> 3.3)
+      rdf-xsd (~> 3.3)
+    rdf-reasoner (0.9.0)
+      rdf (~> 3.3)
+      rdf-xsd (~> 3.3)
+    rdf-tabular (3.2.1)
+      addressable (~> 2.8)
       bcp47 (~> 0.3, >= 0.3.3)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
-      rdf-vocab (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-trig (3.1.2)
-      ebnf (~> 2.1)
-      rdf (~> 3.1)
-      rdf-turtle (~> 3.1)
-    rdf-trix (3.1.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-turtle (3.1.3)
-      ebnf (~> 2.1)
-      rdf (~> 3.1, >= 3.1.8)
-    rdf-vocab (3.1.14)
-      rdf (~> 3.1, >= 3.1.12)
-    rdf-xsd (3.1.1)
-      rdf (~> 3.1)
+      json-ld (~> 3.2)
+      rdf (~> 3.2, >= 3.2.7)
+      rdf-vocab (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-trig (3.3.0)
+      ebnf (~> 2.4)
+      rdf (~> 3.3)
+      rdf-turtle (~> 3.3)
+    rdf-trix (3.3.0)
+      rdf (~> 3.3)
+      rdf-xsd (~> 3.3)
+    rdf-turtle (3.3.0)
+      ebnf (~> 2.4)
+      rdf (~> 3.3)
+    rdf-vocab (3.3.0)
+      rdf (~> 3.3)
+    rdf-xsd (3.3.0)
+      rdf (~> 3.3)
       rexml (~> 3.2)
     redic (1.5.3)
       hiredis
     redis (4.8.1)
-    redis-namespace (1.10.0)
+    redis-namespace (1.11.0)
       redis (>= 4)
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
-    reform (2.5.0)
-      disposable (>= 0.4.2, < 0.5.0)
-      representable (>= 2.4.0, < 3.1.0)
+    reform (2.6.2)
+      disposable (>= 0.5.0, < 1.0.0)
+      representable (>= 3.1.1, < 4)
       uber (< 0.2.0)
-    reform-rails (0.2.3)
+    reform-rails (0.2.6)
       activemodel (>= 5.0)
       reform (>= 2.3.1, < 3.0.0)
-    regexp_parser (2.8.0)
-    representable (3.0.4)
+    regexp_parser (2.8.3)
+    representable (3.2.0)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.2.5)
-    riiif (1.7.1)
+    rexml (3.2.6)
+    riiif (2.4.0)
       deprecation (>= 1.0.0)
-      railties (>= 4.2, < 6)
+      iiif-image-api (>= 0.1.0)
+      railties (>= 4.2, < 8)
     rolify (6.0.1)
     rsolr (2.5.0)
       builder (>= 2.1.2)
@@ -1056,7 +1073,7 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-activemodel-mocks (1.1.0)
+    rspec-activemodel-mocks (1.2.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
@@ -1068,20 +1085,20 @@ GEM
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
+    rspec-rails (6.1.0)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.52.1)
@@ -1099,27 +1116,26 @@ GEM
       multipart-post
       oauth2
     ruby-progressbar (1.13.0)
-    ruby-saml (1.15.0)
+    ruby-saml (1.16.0)
       nokogiri (>= 1.13.10)
       rexml
     ruby2_keywords (0.0.5)
-    ruby_dep (1.5.0)
     rubyzip (2.3.2)
-    samvera-nesting_indexer (2.0.0)
-      dry-equalizer
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     scanf (1.0.0)
     scss_lint (0.60.0)
       sass (~> 3.5, >= 3.5.5)
@@ -1129,34 +1145,32 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-raven (2.13.0)
-      faraday (>= 0.7.6, < 1.0)
-    shacl (0.1.1)
-      json-ld (~> 3.1, >= 3.1.7)
-      rdf (~> 3.1, >= 3.1.8)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
-    shex (0.6.4)
-      ebnf (~> 2.1, >= 2.2)
+    shacl (0.3.0)
+      json-ld (~> 3.2)
+      rdf (~> 3.2, >= 3.2.8)
+      sparql (~> 3.2, >= 3.2.4)
+      sxp (~> 1.2)
+    shex (0.7.1)
+      ebnf (~> 2.2)
       htmlentities (~> 4.3)
-      json-ld (~> 3.1)
-      json-ld-preloaded (~> 3.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
+      json-ld (~> 3.2)
+      json-ld-preloaded (~> 3.2)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+      sparql (~> 3.2)
+      sxp (~> 1.2)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (6.5.9)
+    sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)
       rack (~> 2.0)
       redis (>= 4.5.0, < 5)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simple_form (5.2.0)
+    simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     simplecov (0.22.0)
@@ -1175,18 +1189,18 @@ GEM
       retriable
       ruby-progressbar
       rubyzip
-    sparql (3.1.8)
-      builder (~> 3.2)
-      ebnf (~> 2.1)
-      logger (~> 1.4)
-      rdf (~> 3.1, >= 3.1.14)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql-client (~> 3.1, >= 3.1.2)
-      sxp (~> 1.1)
-    sparql-client (3.1.2)
-      net-http-persistent (~> 4.0, >= 4.0.1)
-      rdf (~> 3.1)
+    sparql (3.3.0)
+      builder (~> 3.2, >= 3.2.4)
+      ebnf (~> 2.4)
+      logger (~> 1.5)
+      rdf (~> 3.3)
+      rdf-aggregate-repo (~> 3.3)
+      rdf-xsd (~> 3.3)
+      sparql-client (~> 3.3)
+      sxp (~> 1.3)
+    sparql-client (3.3.0)
+      net-http-persistent (~> 4.0, >= 4.0.2)
+      rdf (~> 3.3)
     spring (1.7.2)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -1203,40 +1217,39 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.8)
-    swd (1.3.0)
+    swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
-    sxp (1.1.0)
-      rdf (~> 3.1)
-    temple (0.10.0)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    sxp (1.3.0)
+      matrix (~> 0.4)
+      rdf (~> 3.3)
+    temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    terser (1.1.14)
+    terser (1.1.20)
       execjs (>= 0.3.0, < 3)
     tether-rails (1.4.0)
       rails (>= 3.1)
-    thor (1.2.2)
+    thor (1.3.0)
     thread (0.2.2)
     thread_safe (0.3.6)
-    tilt (2.1.0)
-    timeout (0.4.0)
-    tinymce-rails (5.10.7)
+    tilt (2.3.0)
+    timeout (0.4.1)
+    tinymce-rails (5.10.9)
       railties (>= 3.1.1)
+    trailblazer-option (0.1.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    twitter-typeahead-rails (0.11.1.pre.corejavascript)
-      actionpack (>= 3.1)
-      jquery-rails
-      railties (>= 3.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (1.8.0)
-    unicode-types (1.8.0)
+    unicode-types (1.9.0)
     unicode_utils (1.4.0)
     validatable (1.6.7)
     validate_email (0.1.6)
@@ -1245,14 +1258,13 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    valkyrie (2.2.0)
+    valkyrie (3.1.1)
       activemodel
       activesupport
-      disposable (~> 0.4.5)
-      draper
       dry-struct
       dry-types (~> 1.0)
-      faraday (< 1.0)
+      faraday (>= 0.9, < 3, != 2.0.0)
+      faraday-multipart
       json
       json-ld
       railties
@@ -1260,46 +1272,57 @@ GEM
       rdf-vocab
       reform (~> 2.2)
       reform-rails
-    version_gem (1.1.2)
+    version_gem (1.1.3)
+    view_component (2.74.1)
+      activesupport (>= 5.0.0, < 8.0)
+      concurrent-ruby (~> 1.0)
+      method_source (~> 1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-console (3.7.0)
-      actionview (>= 5.0)
-      activemodel (>= 5.0)
+    web-console (4.2.1)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
-      railties (>= 5.0)
+      railties (>= 6.0.0)
     webdrivers (4.7.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (> 3.141, < 5.0)
-    webfinger (1.2.0)
+    webfinger (2.1.2)
       activesupport
-      httpclient (>= 2.4)
-    webmock (3.18.1)
+      faraday (~> 2.0)
+      faraday-follow_redirects
+    webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.8.1)
-    websocket (1.2.9)
-    websocket-driver (0.7.5)
+    websocket (1.2.10)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.8)
+    yaml-ld (0.0.2)
+      json-ld (~> 3.2, >= 3.2.3)
+      psych (>= 3.3)
+      rdf (~> 3.2, >= 3.2.9)
+      rdf-xsd (~> 3.2)
+    zeitwerk (2.6.12)
+    zlib (2.1.1)
 
 PLATFORMS
-  ruby
+  x86_64-linux-musl
 
 DEPENDENCIES
-  active-fedora (>= 11.1.4)
+  active-fedora (~> 14.0)
   active_elastic_job!
   activerecord-nulldb-adapter
   addressable (= 2.8.1)
   apartment
   aws-sdk-sqs
-  blacklight (~> 6.7)
-  blacklight_oai_provider (~> 6.1, >= 6.1.1)
+  blacklight (~> 7.29)
+  blacklight_oai_provider (~> 7.0)
   bolognese (>= 1.9.10)
   bootstrap-datepicker-rails
   bulkrax (~> 5.3)
@@ -1315,14 +1338,13 @@ DEPENDENCIES
   devise-guests (~> 0.3)
   devise-i18n
   devise_invitable (~> 1.6)
-  dry-monads (~> 1.4.0)
+  dry-monads (~> 1.5)
   easy_translate
   factory_bot_rails
   fcrepo_wrapper (~> 0.4)
-  flipflop (~> 2.6.0)
   flutie
   hyku_knapsack!
-  hyrax (~> 3.5.0)
+  hyrax!
   hyrax-doi!
   hyrax-iiif_av!
   i18n-debug
@@ -1348,11 +1370,11 @@ DEPENDENCIES
   pry-byebug
   puma (~> 5.6)
   rack-test (= 0.7.0)
-  rails (~> 5.2.5)
+  rails (~> 6.0)
   rails-controller-testing
-  rdf (~> 3.1.15)
+  rdf (~> 3.2)
   redlock (>= 0.1.2, < 2.0)
-  riiif (~> 1.1)
+  riiif (~> 2.0)
   rolify
   rsolr (~> 2.0)
   rspec
@@ -1363,7 +1385,7 @@ DEPENDENCIES
   rspec_junit_formatter
   rubocop (~> 0.50, <= 0.52.1)
   rubocop-rspec (~> 1.22, <= 1.22.2)
-  sass-rails (~> 5.0)
+  sass-rails (~> 6.0)
   scss_lint
   secure_headers
   selenium-webdriver (= 4.8.1)
@@ -1381,4 +1403,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.4.14
+   2.4.21
diff --git a/config/application.rb b/config/application.rb
index c221d0090..88b9b87e3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,4 +1,5 @@
 require_relative 'boot'
+require_relative '../app/middleware/no_cache_middleware'
 
 require 'rails/all'
 require 'i18n/debug' if ENV['I18N_DEBUG']
@@ -37,6 +38,9 @@ class Application < Rails::Application
     # Add this line to load the lib folder first because we need
     config.autoload_paths.unshift("#{Rails.root}/lib")
 
+    # Add the middleware directory to the eager load paths
+    config.eager_load_paths << "#{Rails.root}/app/middleware"
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -128,5 +132,7 @@ class Application < Rails::Application
         Time
       ]
     end
+
+
   end
 end
diff --git a/config/initializers/riiif.rb b/config/initializers/riiif.rb
index e64daf644..9b7328ee2 100644
--- a/config/initializers/riiif.rb
+++ b/config/initializers/riiif.rb
@@ -18,7 +18,7 @@
   end
 end
 
-Riiif::Image.authorization_service = Hyrax::IIIFAuthorizationService
+Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
 
 Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
 Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')

From 0840f985c7714fc8d45a3b17a13c815ccfecb52f Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Tue, 12 Dec 2023 11:53:08 -0800
Subject: [PATCH 060/126] =?UTF-8?q?=F0=9F=A7=B9=20Get=20assets=20to=20prec?=
 =?UTF-8?q?ompile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit has a lot in it, but of note:

- We forked apartment gem to expand activerecord version support
- Used the Hyrax upgrade guide to update assets
- Replaced bootstrap 3 variables with hard coded values
- Commented out blacklight_helper_behavior.rb because Blacklight 7
  removed it, we'll have to figure out how to get the same functionality
  in the new version
---
 Gemfile                                       |  6 ++-
 Gemfile.lock                                  | 40 +++++++++++++------
 app/assets/javascripts/application.js         |  9 +++--
 app/assets/stylesheets/application.css        |  2 +-
 app/assets/stylesheets/hyku.scss              | 14 +++----
 app/assets/stylesheets/hyrax.scss             | 11 +++--
 .../themes/cultural_repository.scss           | 10 ++---
 .../themes/neutral_repository.scss            |  4 +-
 app/controllers/application_controller.rb     |  7 ----
 ...r.rb => blacklight_helper_behavior.rb.old} |  0
 app/models/user.rb                            |  1 -
 config/analytics.yml                          |  4 ++
 config/environments/development.rb            |  2 +
 config/environments/production.rb             |  2 +-
 config/initializers/hyrax.rb                  |  1 -
 15 files changed, 64 insertions(+), 49 deletions(-)
 rename app/helpers/blacklight/{blacklight_helper_behavior.rb => blacklight_helper_behavior.rb.old} (100%)

diff --git a/Gemfile b/Gemfile
index f09b9adc8..1d102d515 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,11 +10,12 @@ gem 'active-fedora', '~> 14.0'
 gem 'active_elastic_job', github: 'active-elastic-job/active-elastic-job', ref: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979', group: %i[aws]
 gem 'activerecord-nulldb-adapter'
 gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed
-gem 'apartment'
+gem 'apartment', github: 'scientist-softserv/apartment', branch: 'development'
 gem 'aws-sdk-sqs', group: %i[aws]
 gem 'blacklight', '~> 7.29'
 gem 'blacklight_oai_provider', '~> 7.0'
 gem 'bolognese', '>= 1.9.10'
+gem 'bootstrap', '~> 4.6'
 gem 'bootstrap-datepicker-rails'
 gem 'bulkrax', '~> 5.3'
 gem 'byebug', group: %i[development test]
@@ -28,12 +29,13 @@ gem 'database_cleaner', group: %i[test]
 gem 'devise'
 gem 'devise-guests', '~> 0.3'
 gem 'devise-i18n'
-gem 'devise_invitable', '~> 1.6'
+gem 'devise_invitable', '~> 2.0'
 gem 'dry-monads', '~> 1.5'
 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 'googleauth', '= 1.8.1' # 1.9.0 got yanked from rubygems, hard pinning until we can upgrade
 gem 'hyrax', github: 'samvera/hyrax', tag: 'hyrax-v5.0.0.rc2'
 gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
 gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
diff --git a/Gemfile.lock b/Gemfile.lock
index fc61e6b27..5ebb4c929 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,6 +99,17 @@ GIT
       valkyrie (~> 3.1.1)
       view_component (~> 2.74.1)
 
+GIT
+  remote: https://github.com/scientist-softserv/apartment.git
+  revision: e1a24b5574dca7116f69e99f140372c42b75e041
+  branch: development
+  specs:
+    apartment (2.2.1)
+      activerecord (>= 3.1.2, < 7.0)
+      parallel (>= 0.7.1)
+      public_suffix (>= 2)
+      rack (>= 1.3.6)
+
 GIT
   remote: https://github.com/scientist-softserv/iiif_print.git
   revision: e476998ab453afabf1bcb8afa059b4416af9b705
@@ -214,11 +225,10 @@ GEM
     aes_key_wrap (1.1.0)
     almond-rails (0.3.0)
       rails (>= 4.2)
-    apartment (0.24.3)
-      activerecord (>= 3.1.2)
-      rack (>= 1.3.6)
     ast (2.4.2)
     attr_required (1.0.1)
+    autoprefixer-rails (10.4.16.0)
+      execjs (~> 2)
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.3.0)
@@ -314,6 +324,10 @@ GEM
       rdf-rdfxml (~> 3.1)
       rdf-turtle (~> 3.1)
       thor (>= 0.19)
+    bootstrap (4.6.2)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.16.1, < 2)
+      sassc-rails (>= 2.0.0)
     bootstrap-datepicker-rails (1.10.0.1)
       railties (>= 3.0)
     breadcrumbs_on_rails (3.0.1)
@@ -420,9 +434,9 @@ GEM
       devise
     devise-i18n (1.12.0)
       devise (>= 4.9.0)
-    devise_invitable (1.7.5)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
+    devise_invitable (2.0.9)
+      actionmailer (>= 5.0)
+      devise (>= 4.6)
     diff-lcs (1.5.0)
     disposable (0.6.3)
       declarative (>= 0.0.9, < 1.0.0)
@@ -551,11 +565,8 @@ GEM
       webrick
     google-apis-drive_v3 (0.46.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-env (2.0.1)
-      faraday (>= 1.0, < 3.a)
-    googleauth (1.9.0)
-      faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.0, >= 2.0.1)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
@@ -887,6 +898,7 @@ GEM
       ast (~> 2.4.0)
     parslet (2.0.0)
     pg (1.5.4)
+    popper_js (1.16.1)
     posix-spawn (0.3.15)
     postrank-uri (1.1)
       addressable (>= 2.4.0)
@@ -1319,11 +1331,12 @@ DEPENDENCIES
   active_elastic_job!
   activerecord-nulldb-adapter
   addressable (= 2.8.1)
-  apartment
+  apartment!
   aws-sdk-sqs
   blacklight (~> 7.29)
   blacklight_oai_provider (~> 7.0)
   bolognese (>= 1.9.10)
+  bootstrap (~> 4.6)
   bootstrap-datepicker-rails
   bulkrax (~> 5.3)
   byebug
@@ -1337,12 +1350,13 @@ DEPENDENCIES
   devise
   devise-guests (~> 0.3)
   devise-i18n
-  devise_invitable (~> 1.6)
+  devise_invitable (~> 2.0)
   dry-monads (~> 1.5)
   easy_translate
   factory_bot_rails
   fcrepo_wrapper (~> 0.4)
   flutie
+  googleauth (= 1.8.1)
   hyku_knapsack!
   hyrax!
   hyrax-doi!
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index df9e83c18..04b9aebbf 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,10 +14,12 @@
 //= require codemirror-autorefresh
 //= require codemirror/modes/css
 //= require jquery3
-//= require jquery_ujs
+//= require rails-ujs
+//= require popper
+//= require bootstrap
 //= require jquery.fontselect
-//= require dataTables/jquery.dataTables
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//= require jquery.dataTables
+//= require dataTables.bootstrap4
 //= require stat_slider
 //= require turbolinks
 //= require cocoon
@@ -25,6 +27,7 @@
 //= require tether
 // Required by Blacklight
 //= require blacklight/blacklight
+//= require blacklight_gallery
 
 // Moved the Hyku JS *above* the Hyrax JS to resolve #1187 (following
 // a pattern found in ScholarSphere)
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 8b66c7d5d..9694fb3af 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -15,7 +15,7 @@
  *= require codemirror
  *= require codemirror-theme
  *= require hyrax
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+ *= require dataTables.bootstrap4
  *= require bootstrap-datepicker
  *= require single_signon
  *= require_self
diff --git a/app/assets/stylesheets/hyku.scss b/app/assets/stylesheets/hyku.scss
index 8979ddd16..118e799ac 100644
--- a/app/assets/stylesheets/hyku.scss
+++ b/app/assets/stylesheets/hyku.scss
@@ -16,7 +16,7 @@
   }
 }
 
-@media (min-width: $screen-sm-min) {
+@media (min-width: 768px) {
   .logo-set {
     display: flex;
     flex-direction: column;
@@ -131,7 +131,7 @@ footer.navbar {
 
 .sidebar {
   .h5 {
-    padding: $nav-link-padding;
+    padding: 10px 15px;
   }
 
   &.maximized {
@@ -275,7 +275,7 @@ footer.navbar {
 }
 
 .callout-danger {
-  background-color: $well-bg;
+  background-color: #f5f5f5;
   border-color: $brand-danger;
 
   h1,
@@ -374,7 +374,7 @@ a.btn.btn-default.restore-default-color.with-color-hint {
   height: auto;
 }
 
-@media (min-width: $screen-lg-min) {
+@media (min-width: 1200px) {
   a.restore-default-color {
     margin-top: 2em;
   }
@@ -388,7 +388,7 @@ a.btn.btn-default.restore-default-color.with-color-hint {
   display: inline-block;
 }
 
-@media (max-width: $screen-md-min) {
+@media (max-width: 992px) {
   .product-features {
     .grid-item {
       width: 50%;
@@ -396,7 +396,7 @@ a.btn.btn-default.restore-default-color.with-color-hint {
   }
 }
 
-@media (max-width: $screen-sm-min) {
+@media (max-width: 768px) {
   .product-features {
     .grid-item {
       width: 100%;
@@ -433,7 +433,7 @@ body.public-facing {
 }
 
 // FEATURED COLLECTIONS
-@media (max-width: $screen-sm-min) {
+@media (max-width: 768px) {
   .admin-show-page
     .collection-title-row-wrapper
     .collection-title-row-content
diff --git a/app/assets/stylesheets/hyrax.scss b/app/assets/stylesheets/hyrax.scss
index 5efe46c15..411eca65f 100644
--- a/app/assets/stylesheets/hyrax.scss
+++ b/app/assets/stylesheets/hyrax.scss
@@ -5,18 +5,17 @@
 */
 @import "variables";
 @import "bootstrap-default-overrides";
-@import "bootstrap-sprockets";
 @import "bootstrap";
 @import "blacklight/blacklight";
+@import "blacklight_gallery/gallery";
+@import "blacklight_gallery/masonry";
+@import "blacklight_gallery/slideshow";
+@import "blacklight_gallery/osd_viewer";
+@import "hyrax/blacklight_gallery";
 @import "font-awesome";
 @import "hyrax/hyrax";
 @import "hyku";
 @import "accounts";
 @import "viewer";
 
-@import "blacklight_gallery/gallery";
-@import "blacklight_gallery/masonry";
-@import "blacklight_gallery/slideshow";
-@import "blacklight_gallery/osd_viewer";
-
 @import "themes/*";
diff --git a/app/assets/stylesheets/themes/cultural_repository.scss b/app/assets/stylesheets/themes/cultural_repository.scss
index fc451c0c7..811e8e7dc 100644
--- a/app/assets/stylesheets/themes/cultural_repository.scss
+++ b/app/assets/stylesheets/themes/cultural_repository.scss
@@ -14,7 +14,7 @@
   body.dashboard {
     padding-top: 100px !important;
 
-    @media (max-width: $screen-md-min) {
+    @media (max-width: 992px) {
       padding-top: 0 !important;
     }
 
@@ -162,7 +162,7 @@
   .facet-panel-background-color {
     background-color: #ffffff;
 
-    @media (max-width: $screen-md-min) {
+    @media (max-width: 992px) {
       background-color: transparent;
     }
 
@@ -240,14 +240,14 @@
 
   ////// Media Queries //////
 
-  @media (min-width: $screen-xs-min) and (max-width: $screen-md-max) {
+  @media (min-width: 480px) and (max-width: 1199px) {
     .mt-reverse-mb {
       margin-bottom: 40px;
       margin-top: 0;
     }
   }
 
-  @media (max-width: $screen-sm-max) {
+  @media (max-width: 991px) {
     div.home_page_text.homepage-text-container {
       height: 0;
       margin-bottom: 30px;
@@ -255,7 +255,7 @@
     }
   }
 
-  @media screen and (max-width: $screen-md-min) {
+  @media screen and (max-width: 992px) {
     div.recently-uploaded:nth-of-type(2n+3),
     div.featured-works-6-column-layout:nth-of-type(2n+3),
     div.featured-works-4-column-layout:nth-of-type(2n+3) {
diff --git a/app/assets/stylesheets/themes/neutral_repository.scss b/app/assets/stylesheets/themes/neutral_repository.scss
index ec037fa89..26639ca41 100644
--- a/app/assets/stylesheets/themes/neutral_repository.scss
+++ b/app/assets/stylesheets/themes/neutral_repository.scss
@@ -152,13 +152,13 @@
 
   ////// Media Queries //////
 
-  @media (max-width: $screen-md-min) {
+  @media (max-width: 992px) {
     div.neutral-repository-collections:nth-of-type(2n+3) {
       clear: left;
     }
   }
 
-  @media (min-width: $screen-md-min) {
+  @media (min-width: 992px) {
     div.neutral-repository-collections:nth-of-type(3n+4) {
       clear: left;
     }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9449da3c0..424590530 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -6,8 +6,6 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception, prepend: true
 
-  force_ssl if: :ssl_configured?
-
   helper Openseadragon::OpenseadragonHelper
   # Adds a few additional behaviors into the application controller
   include Blacklight::Controller
@@ -24,7 +22,6 @@ class ApplicationController < ActionController::Base
   before_action :require_active_account!, if: :multitenant?
   before_action :set_account_specific_connections!
   before_action :elevate_single_tenant!, if: :singletenant?
-  skip_after_action :discard_flash_if_xhr
 
   rescue_from Apartment::TenantNotFound do
     raise ActionController::RoutingError, 'Not Found'
@@ -131,8 +128,4 @@ def append_info_to_payload(payload)
       payload[:user_id] = current_user.id if current_user
       payload[:account_id] = current_account.cname if current_account
     end
-
-    def ssl_configured?
-      ActiveRecord::Type::Boolean.new.cast(current_account.ssl_configured)
-    end
 end
diff --git a/app/helpers/blacklight/blacklight_helper_behavior.rb b/app/helpers/blacklight/blacklight_helper_behavior.rb.old
similarity index 100%
rename from app/helpers/blacklight/blacklight_helper_behavior.rb
rename to app/helpers/blacklight/blacklight_helper_behavior.rb.old
diff --git a/app/models/user.rb b/app/models/user.rb
index 7bfdd16cf..cf903b102 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -9,7 +9,6 @@ class User < ApplicationRecord
   include Hyrax::User
   include Hyrax::UserUsageStats
 
-  attr_accessible :email, :password, :password_confirmation if Blacklight::Utils.needs_attr_accessible?
   # Connects this user object to Blacklights Bookmarks.
   include Blacklight::User
   # Include default devise modules. Others available are:
diff --git a/config/analytics.yml b/config/analytics.yml
index 42cbb1452..9b5ab5a7f 100644
--- a/config/analytics.yml
+++ b/config/analytics.yml
@@ -9,3 +9,7 @@
 #     privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
 #     privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
 #     client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
+#   matomo:
+#     base_url: <%= ENV['MATOMO_BASE_URL'] %>
+#     site_id: <%= ENV['MATOMO_SITE_ID'] %>
+#     auth_token: <%= ENV['MATOMO_AUTH_TOKEN'] %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9bafa102c..4a0d92943 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -63,4 +63,6 @@
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  config.hosts << "hyku.test"
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 311b96965..249a5507b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -44,7 +44,7 @@
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 1d2480ddc..1269df850 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -27,7 +27,6 @@
 
   # Specify a Google Analytics tracking ID to gather usage statistics
   # This is set by account settings
-  # config.google_analytics_id = 'UA-99999999-1'
 
   # Specify a date you wish to start collecting Google Analytic statistics for.
   # config.analytic_start_date = DateTime.new(2014,9,10)

From 68f89094ffeb22e32789ca81d444ba72d42a79b1 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Tue, 12 Dec 2023 13:07:03 -0800
Subject: [PATCH 061/126] =?UTF-8?q?=F0=9F=A7=B9=20Switch=20to=20Hyrax=20`d?=
 =?UTF-8?q?ouble=5Fcombo`=20branch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are using this branch on Hyrax because it has quite a few Valkyrie
related fixes in it.
---
 Gemfile      | 2 +-
 Gemfile.lock | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1d102d515..905efd1ad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ gem 'factory_bot_rails', group: %i[test]
 gem 'fcrepo_wrapper', '~> 0.4', group: %i[development test]
 gem 'flutie'
 gem 'googleauth', '= 1.8.1' # 1.9.0 got yanked from rubygems, hard pinning until we can upgrade
-gem 'hyrax', github: 'samvera/hyrax', tag: 'hyrax-v5.0.0.rc2'
+gem 'hyrax', github: 'samvera/hyrax', branch: 'double_combo'
 gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
 gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
 gem 'i18n-debug', require: false, group: %i[development test]
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ebb4c929..90d84f205 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,8 +39,8 @@ GIT
 
 GIT
   remote: https://github.com/samvera/hyrax.git
-  revision: 3dd81340fc2586132772fa4017946ed4c60adb8a
-  tag: hyrax-v5.0.0.rc2
+  revision: 9ef64090a13abdeaabfaabdee851829093d02cc4
+  branch: double_combo
   specs:
     hyrax (5.0.0.rc2)
       active-fedora (~> 14.0)
@@ -59,7 +59,6 @@ GIT
       dry-events (~> 1.0, >= 1.0.1)
       dry-logic (~> 1.5)
       dry-monads (~> 1.6)
-      dry-struct (~> 1.6)
       dry-validation (~> 1.10)
       flipflop (~> 2.3)
       flot-rails (~> 0.0.6)
@@ -1366,7 +1365,6 @@ DEPENDENCIES
   iiif_print!
   jbuilder (~> 2.5)
   jquery-rails
-  json-canonicalization (= 0.3.1)
   launchy
   listen (>= 3.0.5, < 3.2)
   lograge

From 0f67c4c259f917d02cea2053883644fca8324749 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Wed, 13 Dec 2023 09:10:22 -0800
Subject: [PATCH 062/126] =?UTF-8?q?=F0=9F=A7=B9=20use=20class=20attribute?=
 =?UTF-8?q?=20instead=20of=20constant=20to=20correct=20failing=20specs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/forms/hyrax/forms/admin/appearance.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index a58cb732d..56000bd98 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax 3.4.0 ot add custom theming
+# OVERRIDE Hyrax 3.4.0 to add custom theming
 
 # rubocop:disable Metrics/ClassLength
 module Hyrax
@@ -439,7 +439,7 @@ def convert_to_rgba(hex_color, alpha = 0.5)
           end
 
           def default_values
-            @default_values ||= DEFAULT_FONTS.merge(DEFAULT_COLORS)
+            @default_values ||= default_fonts.merge(default_colors)
           end
 
           def block_for(name, dynamic_default = nil)

From 6930a863d531286565e443876cdc8dfba3854075 Mon Sep 17 00:00:00 2001
From: Kirk Wang <k3wang@gmail.com>
Date: Tue, 12 Dec 2023 19:32:41 -0800
Subject: [PATCH 063/126] Fix specs

---
 app/controllers/hyrax/homepage_controller.rb  | 147 ++++++++++++++++++
 .../hyrax/homepage_controller_decorator.rb    |  19 ---
 .../content_blocks/edit.html.erb_spec.rb      |   2 +-
 3 files changed, 148 insertions(+), 20 deletions(-)
 create mode 100644 app/controllers/hyrax/homepage_controller.rb
 delete mode 100644 app/controllers/hyrax/homepage_controller_decorator.rb

diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
new file mode 100644
index 000000000..b9130eb9e
--- /dev/null
+++ b/app/controllers/hyrax/homepage_controller.rb
@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+#########################################################################################
+#########################################################################################
+#
+#
+# HACK: We have copied over the Hyrax::HomepageController to address Hyku specific
+#       customizations.  This controller needs significant refactoring and reconciliation
+#       with Hyrax prime.  Note, we are inheriting differently than Hyrax does and
+#       there are other adjustments.
+#
+#
+#########################################################################################
+#########################################################################################
+# OVERRIDE: Hyrax v2.9.0 to add home_text content block to the index method - Adding themes
+# OVERRIDE: Hyrax v2.9.0 from Hyrax v2.9.0 to add facets to home page - inheriting from
+# CatalogController rather than ApplicationController
+# OVERRIDE: Hyrax v2.9.0 from Hyrax v2.9.0 to add inject_theme_views method for theming
+# OVERRIDE: Hyrax v2.9.0 to add search_action_url method from Blacklight 6.23.0 to make facet links to go to /catalog
+# OVERRIDE: Hyrax v2.9.0 to add .sort_by to return collections in alphabetical order by title on the homepage
+# OVERRIDE: Hyrax v2.9.0 add all_collections page for IR theme
+# OVERRIDE: Hyrax v2.9.0 to add facet counts for resource types for IR theme
+# OVERRIDE: Hyrax v. 2.9.0 to add @featured_collection_list to index method
+
+module Hyrax
+  # Changed to inherit from CatalogController for home page facets
+  class HomepageController < CatalogController
+    # Adds Hydra behaviors into the application controller
+    include Blacklight::SearchContext
+    include Blacklight::SearchHelper
+    include Blacklight::AccessControls::Catalog
+
+    # OVERRIDE: account for Hyku themes
+    around_action :inject_theme_views
+
+    # The search builder for finding recent documents
+    # Override of Blacklight::RequestBuilders and default CatalogController behavior
+    def search_builder_class
+      Hyrax::HomepageSearchBuilder
+    end
+
+    class_attribute :presenter_class
+    self.presenter_class = Hyrax::HomepagePresenter
+    layout 'homepage'
+    helper Hyrax::ContentBlockHelper
+
+    def index
+      # BEGIN copy Hyrax prime's Hyrax::HomepageController#index
+      @presenter = presenter_class.new(current_ability, collections)
+      @featured_researcher = ContentBlock.for(:researcher)
+      @marketing_text = ContentBlock.for(:marketing)
+      @featured_work_list = FeaturedWorkList.new
+      @announcement_text = ContentBlock.for(:announcement)
+      recent
+      # END copy
+
+      # BEGIN OVERRIDE
+      # What follows is Hyku specific overrides
+      @home_text = ContentBlock.for(:home_text) # hyrax v3.5.0 added @home_text - Adding Themes
+      @featured_collection_list = FeaturedCollectionList.new # OVERRIDE here to add featured collection list
+
+      ir_counts if home_page_theme == 'institutional_repository'
+
+      (@response, @document_list) = search_results(params)
+
+      respond_to do |format|
+        format.html { store_preferred_view }
+        format.rss  { render layout: false }
+        format.atom { render layout: false }
+        format.json do
+          @presenter = Blacklight::JsonPresenter.new(@response,
+                                                     @document_list,
+                                                     facets_from_request,
+                                                     blacklight_config)
+        end
+        additional_response_formats(format)
+        document_export_formats(format)
+      end
+    end
+
+    def browserconfig; end
+
+    def all_collections
+      @presenter = presenter_class.new(current_ability, collections)
+      @marketing_text = ContentBlock.for(:marketing)
+      @announcement_text = ContentBlock.for(:announcement)
+      @collections = collections(rows: 100_000)
+      ir_counts if home_page_theme == 'institutional_repository'
+    end
+
+    # Added from Blacklight 6.23.0 to change url for facets on home page
+    protected
+
+      # Default route to the search action (used e.g. in global partials). Override this method
+      # in a controller or in your ApplicationController to introduce custom logic for choosing
+      # which action the search form should use
+      def search_action_url(options = {})
+        # Rails 4.2 deprecated url helpers accepting string keys for 'controller' or 'action'
+        main_app.search_catalog_path(options)
+      end
+
+    private
+
+      # Return 6 collections
+      def collections(rows: 6)
+        builder = Hyrax::CollectionSearchBuilder.new(self)
+                                                .rows(rows)
+        response = repository.search(builder)
+        # adding .sort_by to return collections in alphabetical order by title on the homepage
+        response.documents.sort_by(&:title)
+      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+        []
+      end
+
+      def recent
+        # grab any recent documents
+        (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 6)
+      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+        @recent_documents = []
+      end
+
+      def ir_counts
+        @ir_counts = get_facet_field_response('resource_type_sim', {}, "f.resource_type_sim.facet.limit" => "-1")
+      end
+
+      # COPIED from Hyrax::HomepageController
+      def sort_field
+        "date_uploaded_dtsi desc"
+      end
+
+      # Add this method to prepend the theme views into the view_paths
+      def inject_theme_views
+        if home_page_theme && home_page_theme != 'default_home'
+          original_paths = view_paths
+          home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
+          prepend_view_path(home_theme_view_path)
+          yield
+          # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+          # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
+          view_paths=(original_paths)
+          # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+        else
+          yield
+        end
+      end
+  end
+end
diff --git a/app/controllers/hyrax/homepage_controller_decorator.rb b/app/controllers/hyrax/homepage_controller_decorator.rb
deleted file mode 100644
index e4564a9bb..000000000
--- a/app/controllers/hyrax/homepage_controller_decorator.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE Hyrax 3.5 to add content blocks
-module Hyrax
-  module HomepageControllerDecorator
-    def index
-      @presenter = presenter_class.new(current_ability, collections)
-      @featured_researcher = ContentBlock.for(:researcher)
-      @marketing_text = ContentBlock.for(:marketing)
-      @featured_work_list = FeaturedWorkList.new
-      @announcement_text = ContentBlock.for(:announcement)
-      @homepage_about_section_heading = ContentBlock.for(:homepage_about_section_heading)
-      @homepage_about_section_content = ContentBlock.for(:homepage_about_section_content)
-      recent
-    end
-  end
-end
-
-Hyrax::HomepageController.prepend Hyrax::HomepageControllerDecorator
diff --git a/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb b/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
index 9039fa2bf..5dbd31afa 100644
--- a/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
+++ b/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
@@ -36,7 +36,7 @@
   end
 
   it "renders the instruction blocks" do
-    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', count: 4)
+    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', count: 6)
   end
 
   # TODO: These next 4 tests are tightly coupled with the implimentation,

From 939bd17eb4ab071b83002e0091432e98ad81d795 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Tue, 12 Dec 2023 13:36:58 -0800
Subject: [PATCH 064/126] =?UTF-8?q?=F0=9F=A7=B9=20Get=20the=20page=20to=20?=
 =?UTF-8?q?load?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will get the proprietor page to load.  You can create a
tenant and vist it as well.
---
 Gemfile.lock                                          | 3 ++-
 app/helpers/application_helper.rb                     | 2 +-
 app/jobs/create_default_admin_set_job.rb              | 2 +-
 app/services/create_account.rb                        | 2 +-
 app/services/roles_service.rb                         | 2 +-
 app/views/layouts/hyrax.html.erb                      | 2 +-
 config/environments/development.rb                    | 3 ++-
 db/seeds.rb                                           | 2 +-
 spec/features/admin_set_form_participants_tab_spec.rb | 2 +-
 spec/features/assign_workflow_to_group_spec.rb        | 2 +-
 spec/features/create_generic_work_spec.rb             | 2 +-
 spec/features/create_image_spec.rb                    | 2 +-
 spec/features/create_work_spec.rb                     | 2 +-
 spec/features/show_page_theme_spec.rb                 | 2 +-
 spec/requests/work_depositor_role_spec.rb             | 2 +-
 15 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 90d84f205..8c95cd3bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,7 +100,7 @@ GIT
 
 GIT
   remote: https://github.com/scientist-softserv/apartment.git
-  revision: e1a24b5574dca7116f69e99f140372c42b75e041
+  revision: 9ad4b0ef2ee6debb956e86ef9e7095c8358fef5e
   branch: development
   specs:
     apartment (2.2.1)
@@ -1365,6 +1365,7 @@ DEPENDENCIES
   iiif_print!
   jbuilder (~> 2.5)
   jquery-rails
+  json-canonicalization (= 0.3.1)
   launchy
   listen (>= 3.0.5, < 3.2)
   lograge
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e27eee4ae..681cd4d18 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -24,7 +24,7 @@ def locale_for(type:, term:, record_class:)
     locale
   end
 
-  def missing_translation(value)
+  def missing_translation(value, options = {})
     value.include?('translation missing')
   end
 end
diff --git a/app/jobs/create_default_admin_set_job.rb b/app/jobs/create_default_admin_set_job.rb
index 592b32f8e..1f8ee9437 100644
--- a/app/jobs/create_default_admin_set_job.rb
+++ b/app/jobs/create_default_admin_set_job.rb
@@ -2,6 +2,6 @@
 
 class CreateDefaultAdminSetJob < ApplicationJob
   def perform(_account)
-    AdminSet.find_or_create_default_admin_set_id
+    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
   end
 end
diff --git a/app/services/create_account.rb b/app/services/create_account.rb
index f021fbff4..1ce61f94e 100644
--- a/app/services/create_account.rb
+++ b/app/services/create_account.rb
@@ -46,7 +46,7 @@ def create_defaults
     Hyrax::CollectionType.find_or_create_admin_set_type
     return if account.search_only?
 
-    AdminSet.find_or_create_default_admin_set_id
+    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
   end
 
   # Workaround for upstream issue https://github.com/samvera/hyrax/issues/3136
diff --git a/app/services/roles_service.rb b/app/services/roles_service.rb
index c5c6a5de8..7b28747ad 100644
--- a/app/services/roles_service.rb
+++ b/app/services/roles_service.rb
@@ -87,7 +87,7 @@ def create_default_hyrax_groups_with_roles!
       default_hyrax_groups_with_roles.each do |group_name, group_attrs|
         group_roles = group_attrs.delete(:roles)
         group = Hyrax::Group.find_or_create_by!(name: group_name)
-        group.update_attributes(group_attrs)
+        group.update(group_attrs)
 
         group_roles.each do |role_name|
           next if role_name.blank?
diff --git a/app/views/layouts/hyrax.html.erb b/app/views/layouts/hyrax.html.erb
index e2ff69136..448eba3d3 100644
--- a/app/views/layouts/hyrax.html.erb
+++ b/app/views/layouts/hyrax.html.erb
@@ -31,6 +31,6 @@
       <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 4a0d92943..07f298607 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -64,5 +64,6 @@
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
-  config.hosts << "hyku.test"
+  # adding `.` wildcard to allow for subdomains
+  config.hosts << "." + ENV['HYKU_ADMIN_HOST']
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 509224c1e..a3b84dae7 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -17,7 +17,7 @@
   AccountElevator.switch!(single_tenant_default.cname)
 
   puts "\n== Creating default admin set"
-  admin_set = AdminSet.find(AdminSet.find_or_create_default_admin_set_id)
+  admin_set = AdminSet.find(Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id)
 
   puts "\n== Creating default collection types"
   Hyrax::CollectionType.find_or_create_default_collection_type
diff --git a/spec/features/admin_set_form_participants_tab_spec.rb b/spec/features/admin_set_form_participants_tab_spec.rb
index 06fb8d1fa..13bea005e 100644
--- a/spec/features/admin_set_form_participants_tab_spec.rb
+++ b/spec/features/admin_set_form_participants_tab_spec.rb
@@ -23,7 +23,7 @@
     end
 
     let(:admin) { FactoryBot.create(:admin) }
-    let!(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let!(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let!(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
 
     context 'add group participants' do
diff --git a/spec/features/assign_workflow_to_group_spec.rb b/spec/features/assign_workflow_to_group_spec.rb
index 636d3859c..e6d791630 100644
--- a/spec/features/assign_workflow_to_group_spec.rb
+++ b/spec/features/assign_workflow_to_group_spec.rb
@@ -25,7 +25,7 @@
     let!(:group) { FactoryBot.create(:group, name: 'flinstones', humanized_name: 'Flinstones') }
     let!(:group_3) { FactoryBot.create(:group, name: 'town_of_bedrock', humanized_name: 'Town of Bedrock') }
 
-    let!(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let!(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let!(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
 
     it 'admin assigns an approving workflow role to a user' do
diff --git a/spec/features/create_generic_work_spec.rb b/spec/features/create_generic_work_spec.rb
index 890e6ebf6..1490a6710 100644
--- a/spec/features/create_generic_work_spec.rb
+++ b/spec/features/create_generic_work_spec.rb
@@ -10,7 +10,7 @@
 
   context 'a logged in user with the :work_depositor role' do
     let(:user) { create(:user, roles: [:work_depositor]) }
-    let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
     let(:workflow) do
       Sipity::Workflow.create!(
diff --git a/spec/features/create_image_spec.rb b/spec/features/create_image_spec.rb
index 9154f3b88..8cd1cf796 100644
--- a/spec/features/create_image_spec.rb
+++ b/spec/features/create_image_spec.rb
@@ -10,7 +10,7 @@
 
   context 'a logged in user with the :work_depositor role' do
     let(:user) { create(:user, roles: [:work_depositor]) }
-    let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
     let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
     let(:workflow) do
       Sipity::Workflow.create!(
diff --git a/spec/features/create_work_spec.rb b/spec/features/create_work_spec.rb
index 6eddc7e85..49523a9cc 100644
--- a/spec/features/create_work_spec.rb
+++ b/spec/features/create_work_spec.rb
@@ -9,7 +9,7 @@
     FactoryBot.create(:admin_group)
     FactoryBot.create(:editors_group)
     FactoryBot.create(:depositors_group)
-    AdminSet.find_or_create_default_admin_set_id
+    Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
     login_as user, scope: :user
   end
 
diff --git a/spec/features/show_page_theme_spec.rb b/spec/features/show_page_theme_spec.rb
index 941ae652f..2e66de5b3 100644
--- a/spec/features/show_page_theme_spec.rb
+++ b/spec/features/show_page_theme_spec.rb
@@ -13,7 +13,7 @@
            user: user)
   end
 
-  let(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+  let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
   let(:permission_template) { Hyrax::PermissionTemplate.find_or_create_by!(source_id: admin_set_id) }
   let(:workflow) do
     Sipity::Workflow.create!(
diff --git a/spec/requests/work_depositor_role_spec.rb b/spec/requests/work_depositor_role_spec.rb
index b95ae1c2e..0053ac892 100644
--- a/spec/requests/work_depositor_role_spec.rb
+++ b/spec/requests/work_depositor_role_spec.rb
@@ -15,7 +15,7 @@
   end
 
   describe 'read permissions' do
-    let!(:admin_set_id) { AdminSet.find_or_create_default_admin_set_id }
+    let!(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
 
     before do
       solr = Blacklight.default_index.connection

From 31de0fe382db138f342a42df59774f1111d38fc1 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 4 Oct 2023 10:49:31 -0400
Subject: [PATCH 065/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Introduce=20Hyku::?=
 =?UTF-8?q?Application.theme=5Fview=5Fpath=5Froots?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the introduction of [HykuKnapsack][1], we are adjusting how we
create instances of Hyku.  Namely we don't clone Hyku but instead we
incorporate Hyku as a submodule into a Knapsack.

The Knapsack is a Rails engine that is mounted in the Hyku application.
What this means is that when we want to

Prior to this commit, the only way to adjust themed views would have
been to add them to the Rails application (e.g. Hyku) directly.  Which
would work in a non-Knapsack ecosystem.

However, with Knapsack we need a means of saying "Hey, for themes we
want to be able to add/adjust views within the knapsack."  Hence this
change.

[1]: https://github.com/samvera-labs/hyku_knapsack
---
 .../concerns/hyrax/works_controller_behavior.rb |  6 ++++--
 .../hyrax/contact_form_controller.rb            |  6 ++++--
 app/controllers/hyrax/pages_controller.rb       |  6 ++++--
 config/application.rb                           | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/controllers/concerns/hyrax/works_controller_behavior.rb b/app/controllers/concerns/hyrax/works_controller_behavior.rb
index f5b51f64f..91f005843 100644
--- a/app/controllers/concerns/hyrax/works_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/works_controller_behavior.rb
@@ -505,8 +505,10 @@ def available_admin_sets
       def inject_show_theme_views
         if show_page_theme && show_page_theme != 'default_show'
           original_paths = view_paths
-          show_theme_view_path = Rails.root.join('app', 'views', "themes", show_page_theme.to_s)
-          prepend_view_path(show_theme_view_path)
+          Hyku::Application.theme_view_path_roots.each do |root|
+            show_theme_view_path = File.join(root, 'app', 'views', "themes", show_page_theme.to_s)
+            prepend_view_path(show_theme_view_path)
+          end
           yield
           # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
           # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index a420f82d4..c941ee191 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -102,8 +102,10 @@ def collections(rows: 6)
       def inject_theme_views
         if home_page_theme && home_page_theme != 'default_home'
           original_paths = view_paths
-          home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
-          prepend_view_path(home_theme_view_path)
+          Hyku::Application.theme_view_path_roots.each do |root|
+            home_theme_view_path = File.join(root, 'app', 'views', "themes", home_page_theme.to_s)
+            prepend_view_path(home_theme_view_path)
+          end
           yield
           # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
           # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
diff --git a/app/controllers/hyrax/pages_controller.rb b/app/controllers/hyrax/pages_controller.rb
index cdfd8d0a7..b47e19856 100644
--- a/app/controllers/hyrax/pages_controller.rb
+++ b/app/controllers/hyrax/pages_controller.rb
@@ -101,8 +101,10 @@ def collections(rows: 6)
       def inject_theme_views
         if home_page_theme && home_page_theme != 'default_home'
           original_paths = view_paths
-          home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
-          prepend_view_path(home_theme_view_path)
+          Hyku::Application.theme_view_path_roots.each do |root|
+            home_theme_view_path = File.join(root, 'app', 'views', "themes", home_page_theme.to_s)
+            prepend_view_path(home_theme_view_path)
+          end
           yield
           # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
           # Do NOT change this method. This is an override of the view_paths= method and not a variable assignment.
diff --git a/config/application.rb b/config/application.rb
index 3af68f13f..616515c97 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -62,6 +62,22 @@ class Application < Rails::Application
     # IiifPrint::SplitPdfs::AdventistPagesToJpgsSplitter
     config.autoload_paths.unshift("#{Rails.root}/lib")
 
+    ##
+    #   @return [Array<String>] an array of strings in which we should be looking for theme view
+    #           candidates.
+    # @see Hyrax::WorksControllerBehavior
+    # @see Hyrax::ContactFormController
+    # @see Hyrax::PagesController
+    # @see https://api.rubyonrails.org/classes/ActionView/ViewPaths.html#method-i-prepend_view_path
+    #
+    # @see .path_for
+    # @see
+    def self.theme_view_path_roots
+      returning_value = [Rails.root.to_s]
+      returning_value.push HykuKnapsack::Engine.root.to_s if defined?(HykuKnapsack)
+      returning_value
+    end
+
     ##
     # @api public
     #
@@ -69,6 +85,7 @@ class Application < Rails::Application
     #
     # @return [String] the path to the file, favoring those found in the knapsack but falling back
     #         to those in the Rails.root.
+    # @see .theme_view_path_roots
     def self.path_for(relative_path)
       if defined?(HykuKnapsack)
         engine_path = HykuKnapsack::Engine.root.join(relative_path)

From 2d7f8b76813f6849521278bd5de3234b3ca4efcd Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 13 Dec 2023 15:05:40 -0800
Subject: [PATCH 066/126] =?UTF-8?q?=F0=9F=A7=B9=20Prepping=20for=20rubocop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will change the Docker image to rc1 because rc2 stopped
working (at least locally).  Also getting things ready to run rubocop.
---
 .rubocop.yml                      | 170 +++++++++++----------
 .rubocop_fixme.yml                | 201 +++++++++++++++++++++++++
 .rubocop_todo.yml                 | 235 ++++++++++++------------------
 Dockerfile                        |   2 +-
 Gemfile                           |   6 +-
 Gemfile.lock                      |  38 +++--
 app/helpers/application_helper.rb |   2 +-
 7 files changed, 412 insertions(+), 242 deletions(-)
 create mode 100644 .rubocop_fixme.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 4a5fb78c8..7af771792 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,133 +1,127 @@
-# Turn on RSpec cops
-require: rubocop-rspec
-inherit_from: .rubocop_todo.yml
+inherit_from:
+  - .rubocop_fixme.yml
 
-# With the rubocop 0.47.0 and rubocop-rspec 1.8.0 the following stderr message was sent:
-#   An error occurred while RSpec/DescribedClass cop was inspecting path/to/file
-RSpec/DescribedClass:
-  Enabled: false
+inherit_gem:
+  bixby: bixby_default.yml
 
 AllCops:
+  TargetRubyVersion: 2.6
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
   Exclude:
-    - 'bin/**/*'
     - 'db/**/*'
-    - 'config/**/*'
-    - 'vendor/**/*'
-    - '.internal_test_app/**/*'
-    - 'spec/fixtures/**/*'
-    - 'spec/internal/**/*'
+    - 'script/**/*'
     - 'spec/test_app_templates/**/*'
-    - 'Rakefile'
-    - 'lib/tasks/rubocop.rake'
-    # disabling collections controller as most of the rubocop errors are in hyrax
-    - 'app/controllers/hyrax/dashboard/collections_controller.rb'
-
-Rails:
-  Enabled: true
+    - 'vendor/**/*'
+    - 'lib/hyrax/specs/**/*'
 
-Rails/DynamicFindBy:
-  Whitelist:
-    - find_by_user_key
+Lint/ImplicitStringConcatenation:
   Exclude:
-    - 'lib/importer/factory/object_factory.rb'
+    - 'lib/generators/hyrax/**/*'
 
-Rails/UnknownEnv:
-  Environments:
-    - development
-    - production
-    - staging
-    - test
+Rails/Output:
+  Exclude:
+    - 'lib/generators/**/*'
 
-Metrics/LineLength:
-  Max: 120
+Metrics/BlockLength:
+  ExcludedMethods: ['included']
   Exclude:
-    - 'app/controllers/catalog_controller.rb'
-    - 'spec/controllers/curation_concerns/generic_works_controller_spec.rb'
-    - 'spec/services/iiif_collection_thumbnail_path_service_spec.rb'
-    - 'spec/services/iiif_work_thumbnail_path_service_spec.rb'
-    - 'spec/routing/proprietor/accounts_routing_spec.rb'
+    - 'hyrax.gemspec'
+    - 'app/models/concerns/hyrax/content_block_behavior.rb'
+    - 'app/services/hyrax/workflow/workflow_schema.rb'
+    - 'config/initializers/simple_form.rb'
+    - 'config/features.rb'
+    - 'config/routes.rb'
+    - 'lib/generators/hyrax/templates/catalog_controller.rb'
+    - 'lib/generators/hyrax/templates/config/initializers/simple_form_bootstrap.rb'
+    - 'lib/hyrax/rails/routes.rb'
+    - 'lib/tasks/*.rake'
+    - 'spec/**/*.rb'
+    - 'tasks/benchmark.rake'
 
-Layout/IndentationConsistency:
-  EnforcedStyle: rails
+Style/AsciiComments:
+  Enabled: false
 
-Layout/DotPosition:
-  EnforcedStyle: leading
+# rubocop suggests !thing.nil? instead, but that is NOT equivalent
+Style/DoubleNegation:
+  Enabled: false
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'
 
-Style/Documentation:
+Style/SymbolArray:
   Enabled: false
 
-Style/StringLiterals:
+Style/ClassAndModuleChildren:
   Enabled: false
 
-Style/WordArray:
+Style/SingleLineBlockParams:
   Enabled: false
 
-Metrics/ClassLength:
-  Exclude:
-    - 'app/controllers/catalog_controller.rb'
+Rails/ApplicationJob:
+  Enabled: false
 
-Metrics/ModuleLength:
-  Max: 200
+Rails/ApplicationRecord:
+  Enabled: false
 
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/role.rb'
+Rails/RakeEnvironment:
+  Enabled: false
 
-RSpec/AnyInstance:
+# We define custom methods like `find_by_user_key`,
+# `find_by_created_date`, etc
+Rails/DynamicFindBy:
   Enabled: false
 
-RSpec/InstanceVariable:
+Rails/FilePath:
   Exclude:
-    - 'spec/controllers/hyku/registrations_controller_spec.rb'
+    - 'spec/abilities/**/*'
 
-RSpec/NamedSubject:
-  Enabled: false
+Rails/OutputSafety:
+  Exclude:
+    - 'app/builders/hyrax/form_builder.rb'
+    - 'app/helpers/hyrax/citations_behaviors/formatters/apa_formatter.rb'
+    - 'app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb'
+    - 'app/helpers/hyrax/citations_behaviors/formatters/mla_formatter.rb'
+    - 'app/helpers/hyrax/collections_helper.rb'
+    - 'app/helpers/hyrax/content_block_helper_behavior.rb'
+    - 'app/helpers/hyrax/hyrax_helper_behavior.rb'
+    - 'app/presenters/hyrax/fixity_status_presenter.rb'
+    - 'app/presenters/hyrax/presents_attributes.rb'
+    - 'app/renderers/hyrax/renderers/attribute_renderer.rb'
+    - 'spec/views/hyrax/my/works/_list_works.html.erb_spec.rb'
 
 RSpec/DescribeClass:
   Exclude:
-    - 'spec/requests/**/*'
+    - 'spec/abilities/**/*'
+    - 'spec/config/hyrax_events_spec.rb'
+    - 'spec/conversions/**/*'
     - 'spec/features/**/*'
+    - 'spec/inputs/**/*'
+    - 'spec/javascripts/jasmine_spec.rb'
+    - 'spec/tasks/rake_spec.rb'
     - 'spec/views/**/*'
-    - 'spec/routing/**/*'
-    - 'spec/tasks/**/*'
 
-Rails/FilePath:
-  Exclude:
-    - 'spec/routing/**/*'
+# # By default RSpec/MessageSpies has the following:
+# #   Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
+# # The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive'
+RSpec/MessageSpies:
+  Enabled: false
 
 RSpec/ExpectActual:
-  Exclude:
-    - 'spec/routing/**/*'
+  Enabled: false
 
-RSpec/VerifiedDoubles:
+RSpec/LetSetup:
   Enabled: false
 
 RSpec/MessageExpectation:
   Enabled: false
 
-# By default RSpec/MessageSpies has the following:
-#   Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
-RSpec/MessageSpies:
-  Enabled: true
-  EnforcedStyle: receive
-
-RSpec/ExampleLength:
-  Max: 20
-
 RSpec/NestedGroups:
-  Max: 4
-
-RSpec/MultipleExpectations:
   Enabled: false
 
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*.rb'
-    - 'lib/tasks/*.rake'
-    - 'app/controllers/catalog_controller.rb'
-
-RSpec/FilePath:
-  Exclude:
-    - 'spec/config/application_spec.rb'
+RSpec/LeadingSubject:
+  Enabled: false
diff --git a/.rubocop_fixme.yml b/.rubocop_fixme.yml
new file mode 100644
index 000000000..964bae6dc
--- /dev/null
+++ b/.rubocop_fixme.yml
@@ -0,0 +1,201 @@
+Security/MarshalLoad:
+  Exclude:
+    - 'app/models/concerns/hyrax/user.rb'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'app/controllers/hyrax/dashboard/collections_controller.rb'
+    - 'app/controllers/hyrax/admin/admin_sets_controller.rb'
+    - 'app/controllers/hyrax/batch_edits_controller.rb'
+    - 'app/controllers/hyrax/downloads_controller.rb'
+    - 'app/controllers/hyrax/file_sets_controller.rb'
+    - 'app/forms/hyrax/forms/permission_template_form.rb'
+    - 'app/presenters/hyrax/work_show_presenter.rb'
+    - 'app/presenters/hyrax/collection_presenter.rb'
+    - 'app/services/hyrax/user_stat_importer.rb'
+    - 'lib/generators/hyrax/templates/catalog_controller.rb'
+    - 'lib/generators/hyrax/install_generator.rb'
+    - 'lib/hyrax/configuration.rb'
+
+Metrics/ParameterLists:
+  Exclude:
+    - 'app/jobs/batch_create_job.rb'
+
+Metrics/ModuleLength:
+  Exclude:
+    - 'app/controllers/concerns/hyrax/works_controller_behavior.rb'
+    - 'app/helpers/hyrax/hyrax_helper_behavior.rb'
+    - 'app/models/concerns/hyrax/ability.rb'
+    - 'app/services/hyrax/workflow/permission_query.rb'
+    - 'spec/services/hyrax/workflow/permission_query_spec.rb'
+    # TODO:  extract CollectionAccessControls or something, so we don't have to skip this check?
+    - 'app/models/concerns/hyrax/collection_behavior.rb'
+
+RSpec/NamedSubject:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Max: 9
+  Exclude:
+    - 'spec/actors/hyrax/actors/file_set_actor_spec.rb'
+    - 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
+    - 'spec/controllers/hyrax/api/items_controller_spec.rb'
+    - 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
+    - 'spec/controllers/hyrax/batch_uploads_controller_spec.rb'
+    - 'spec/controllers/hyrax/file_sets_controller_spec.rb'
+    - 'spec/controllers/hyrax/generic_works_controller_spec.rb'
+    - 'spec/controllers/hyrax/my/highlights_controller_spec.rb'
+    - 'spec/controllers/hyrax/transfers_controller_spec.rb'
+    - 'spec/forms/hyrax/forms/collection_form_spec.rb'
+    - 'spec/forms/hyrax/forms/batch_edit_form_spec.rb'
+    - 'spec/forms/hyrax/forms/batch_upload_form_spec.rb'
+    - 'spec/forms/hyrax/forms/file_set_edit_form_spec.rb'
+    - 'spec/features/**/*'
+    - 'spec/helpers/hyrax/charts_helper_spec.rb'
+    - 'spec/helpers/dashboard_helper_spec.rb'
+    - 'spec/helpers/hyrax_helper_spec.rb'
+    - 'spec/indexers/hyrax/file_set_indexer_spec.rb'
+    - 'spec/javascripts/jasmine_spec.rb'
+    - 'spec/jobs/file_set_attached_event_job_spec.rb'
+    - 'spec/jobs/batch_create_job_spec.rb'
+    - 'spec/jobs/create_work_job_spec.rb'
+    - 'spec/jobs/content_update_event_job_spec.rb'
+    - 'spec/jobs/content_restored_version_event_job_spec.rb'
+    - 'spec/jobs/content_new_version_event_job_spec.rb'
+    - 'spec/jobs/content_depositor_change_event_job_spec.rb'
+    - 'spec/jobs/change_depositor_event_job_spec.rb'
+    - 'spec/jobs/content_deposit_event_job_spec.rb'
+    - 'spec/jobs/content_delete_event_job_spec.rb'
+    - 'spec/jobs/ingest_file_job_spec.rb'
+    - 'spec/lib/hyrax/arkivo/actor_spec.rb'
+    - 'spec/lib/hyrax/resource_sync/capability_list_writer_spec.rb'
+    - 'spec/models/checksum_audit_log_spec.rb'
+    - 'spec/models/featured_work_spec.rb'
+    - 'spec/models/file_set_spec.rb'
+    - 'spec/models/generic_work_spec.rb'
+    - 'spec/presenters/hyrax/inspect_work_presenter_spec.rb'
+    - 'spec/services/hyrax/actor_factory_spec.rb'
+    - 'spec/services/hyrax/admin_set_create_service_spec.rb'
+    - 'spec/services/hyrax/default_middleware_stack_spec.rb'
+    - 'spec/services/hyrax/graph_exporter_spec.rb'
+    - 'spec/services/hyrax/user_stat_importer_spec.rb'
+    - 'spec/services/hyrax/workflow/activate_object_spec.rb'
+    - 'spec/services/hyrax/workflow/deactivate_object_spec.rb'
+    - 'spec/services/hyrax/workflow/permission_generator_spec.rb'
+    - 'spec/services/hyrax/workflow/permission_query_spec.rb'
+    - 'spec/services/hyrax/workflow/state_machine_generator_spec.rb'
+    - 'spec/services/hyrax/workflow/workflow_importer_spec.rb'
+    - 'spec/views/**/*'
+    - 'spec/wings/valkyrie/persister_spec.rb'
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
+    - 'spec/controllers/hyrax/file_sets_controller_spec.rb'
+    - 'spec/models/file_set_spec.rb'
+    - 'spec/models/hyrax/work_behavior_spec.rb'
+    - 'spec/search_builders/hyrax/file_set_search_builder_spec.rb'
+    - 'spec/models/hyrax/operation_spec.rb'
+    - 'spec/controllers/hyrax/accepts_batches_controller_spec.rb'
+    - 'spec/indexers/hyrax/repository_reindexer_spec.rb'
+    - 'spec/lib/hyrax/analytics_spec.rb'
+    - 'spec/models/job_io_wrapper_spec.rb'
+    - 'spec/search_builders/hyrax/abstract_type_relation_spec.rb'
+    - 'spec/services/hyrax/database_migrator_spec.rb'
+
+RSpec/AnyInstance:
+  Exclude:
+    - 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
+    - 'spec/controllers/hyrax/api/items_controller_spec.rb'
+    - 'spec/controllers/hyrax/api/zotero_controller_spec.rb'
+    - 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
+    - 'spec/controllers/hyrax/stats_controller_spec.rb'
+    - 'spec/controllers/hyrax/users_controller_spec.rb'
+    - 'spec/hyrax/transactions/steps/delete_access_control_spec.rb'
+    - 'spec/hyrax/transactions/steps/save_access_control_spec.rb'
+    - 'spec/jobs/content_restored_version_event_job_spec.rb'
+    - 'spec/jobs/file_set_attached_event_job_spec.rb'
+    - 'spec/jobs/hyrax/grant_edit_to_members_job_spec.rb'
+    - 'spec/jobs/hyrax/grant_read_to_members_job_spec.rb'
+    - 'spec/jobs/hyrax/revoke_edit_from_members_job_spec.rb'
+    - 'spec/lib/hyrax/arkivo/create_subscription_job_spec.rb'
+    - 'spec/presenters/hyrax/file_usage_spec.rb'
+    - 'spec/presenters/hyrax/work_usage_spec.rb'
+    - 'spec/services/hyrax/repository_fixity_check_service_spec.rb'
+    - 'spec/services/hyrax/workflow/permission_generator_spec.rb'
+    - 'spec/services/hyrax/workflow/sipity_actions_generator_spec.rb'
+    - 'spec/services/hyrax/workflow/state_machine_generator_spec.rb'
+    - 'spec/services/hyrax/workflow/workflow_permissions_generator_spec.rb'
+    - 'spec/controllers/hyrax/homepage_controller_spec.rb'
+    - 'spec/controllers/hyrax/my/collections_controller_spec.rb'
+    - 'spec/controllers/hyrax/my/works_controller_spec.rb'
+    - 'spec/presenters/hyrax/admin/repository_object_presenter_spec.rb'
+
+# Offense count: 51
+RSpec/ExpectInHook:
+  Enabled: false
+
+# Offense count: 27
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: and_return, block
+RSpec/ReturnFromStub:
+  Exclude:
+    - 'spec/controllers/hyrax/api/items_controller_spec.rb'
+    - 'spec/controllers/hyrax/file_sets_controller_spec.rb'
+    - 'spec/lib/hyrax/arkivo/create_subscription_job_spec.rb'
+    - 'spec/models/file_set_spec.rb'
+    - 'spec/presenters/hyrax/admin_set_options_presenter_spec.rb'
+    - 'spec/routing/api_route_spec.rb'
+    - 'spec/views/_user_util_links.html.erb_spec.rb'
+    - 'spec/views/hyrax/base/_attributes.html.erb_spec.rb'
+    - 'spec/views/hyrax/base/_form.html.erb_spec.rb'
+    - 'spec/views/hyrax/base/file_manager.html.erb_spec.rb'
+    - 'spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb'
+    - 'spec/views/hyrax/users/_user_info.html.erb_spec.rb'
+
+# Offense count: 26
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'spec/models/sipity/agent_spec.rb'
+    - 'spec/models/sipity/comment_spec.rb'
+    - 'spec/models/sipity/entity_spec.rb'
+    - 'spec/models/sipity/entity_specific_responsibility_spec.rb'
+    - 'spec/models/sipity/role_spec.rb'
+    - 'spec/models/sipity/workflow_action_spec.rb'
+    - 'spec/models/sipity/workflow_responsibility_spec.rb'
+    - 'spec/models/sipity/workflow_role_spec.rb'
+    - 'spec/models/sipity/workflow_state_action_permission_spec.rb'
+    - 'spec/models/sipity/workflow_state_action_spec.rb'
+    - 'spec/models/sipity/workflow_state_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasManyOrHasOneDependent:
+  Exclude:
+    - 'app/models/admin_set.rb'
+    - 'app/models/hyrax/permission_template.rb'
+
+# Offense count: 1
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'app/services/hyrax/works/migration_service.rb'
+
+# Offense count: 12
+Lint/MissingSuper:
+  Exclude:
+    - 'app/actors/hyrax/actors/interpret_visibility_actor.rb'
+    - 'app/actors/hyrax/actors/ordered_members_actor.rb'
+    - 'app/models/concerns/hyrax/file_set/characterization.rb'
+    - 'app/presenters/hyrax/file_usage.rb'
+    - 'app/presenters/hyrax/work_usage.rb'
+    - 'app/services/hyrax/batch_create_failure_service.rb'
+    - 'app/services/hyrax/batch_create_success_service.rb'
+    - 'app/services/hyrax/collection_types/create_service.rb'
+    - 'app/services/hyrax/solr_query_service.rb'
+    - 'lib/hyrax/form_fields.rb'
+    - 'lib/hyrax/health_checks/solr_check.rb'
+    - 'lib/hyrax/schema.rb'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 902a16471..ad19a7fd2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,186 +1,139 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-05-15 17:53:23 +0000 using RuboCop version 0.52.1.
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 1.28.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'app/controllers/catalog_controller.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith, AutoCorrect.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Lint/EndAlignment:
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
   Exclude:
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
+    - 'app/jobs/bulkrax/import_file_set_job.rb'
+    - 'app/models/bulkrax/entry.rb'
 
 # Offense count: 2
-Lint/UselessAssignment:
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
   Exclude:
-    - 'app/forms/hyrax/forms/admin/appearance.rb'
-    - 'spec/controllers/proprietor/users_controller_spec.rb'
-
-# Offense count: 10
-Metrics/AbcSize:
-  Max: 49
+    - 'spec/rails_helper.rb'
 
 # Offense count: 3
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 112
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'app/parsers/bulkrax/csv_parser.rb'
+    - 'spec/models/bulkrax/rdf_entry_spec.rb'
+    - 'spec/models/bulkrax/xml_entry_spec.rb'
 
-# Offense count: 2
-Metrics/CyclomaticComplexity:
-  Max: 12
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'spec/rails_helper.rb'
 
-# Offense count: 23
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 8
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 376
-
-# Offense count: 7
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 35
+Layout/LineLength:
+  Max: 301
 
 # Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 168
-
-# Offense count: 2
-Metrics/PerceivedComplexity:
-  Max: 14
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: symmetrical, new_line, same_line
+Layout/MultilineMethodCallBraceLayout:
+  Exclude:
+    - 'app/parsers/bulkrax/csv_parser.rb'
 
 # Offense count: 1
-# Configuration parameters: Blacklist.
-# Blacklist: END, (?-mix:EO[A-Z]{1})
-Naming/HeredocDelimiterNaming:
+# This cop supports safe auto-correction (--auto-correct).
+Layout/RescueEnsureAlignment:
   Exclude:
-    - 'spec/jobs/import_work_from_purl_job_spec.rb'
-
-# Offense count: 6
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-# MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/controllers/application_controller.rb'
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-    - 'app/models/user.rb'
+    - 'spec/rails_helper.rb'
 
-# Offense count: 6
-RSpec/BeforeAfterAll:
-  Exclude:
-    - 'spec/spec_helper.rb'
+# Offense count: 7
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'app/models/bulkrax/csv_entry.rb'
+    - 'app/parsers/bulkrax/csv_parser.rb'
+    - 'spec/models/bulkrax/rdf_entry_spec.rb'
+    - 'spec/models/bulkrax/xml_entry_spec.rb'
     - 'spec/rails_helper.rb'
-    - 'spec/support/**/*.rb'
-    - 'spec/models/hyku/group_spec.rb'
-    - 'spec/models/uploaded_file_spec.rb'
-    - 'spec/tasks/rake_spec.rb'
 
-# Offense count: 85
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Enabled: false
+# Offense count: 16
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 42
 
-# Offense count: 3
-RSpec/ExpectInHook:
-  Exclude:
-    - 'spec/controllers/sites_controller_spec.rb'
-    - 'spec/models/uploaded_file_spec.rb'
+# Offense count: 4
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ClassLength:
+  Max: 201
 
-# Offense count: 1
-RSpec/IteratedExpectation:
-  Exclude:
-    - 'spec/tasks/rake_spec.rb'
+# Offense count: 13
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 19
 
-# Offense count: 4
-RSpec/LetSetup:
-  Exclude:
-    - 'spec/models/account_spec.rb'
-    - 'spec/models/role_spec.rb'
-    - 'spec/models/user_spec.rb'
+# Offense count: 32
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+Metrics/MethodLength:
+  Max: 26
 
 # Offense count: 2
-RSpec/MessageChain:
-  Exclude:
-    - 'spec/views/shared/select_work_type_modal.html.erb_spec.rb'
+# Configuration parameters: CountComments, CountAsOne.
+Metrics/ModuleLength:
+  Max: 131
 
-# Offense count: 8
-RSpec/ScatteredLet:
-  Exclude:
-    - 'spec/controllers/account_sign_up_controller_spec.rb'
-    - 'spec/controllers/admin/accounts_controller_spec.rb'
-    - 'spec/controllers/proprietor/accounts_controller_spec.rb'
-    - 'spec/jobs/import_work_from_purl_job_spec.rb'
+# Offense count: 9
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Max: 19
 
 # Offense count: 1
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
-    - 'app/models/endpoint.rb'
+    - 'app/models/concerns/bulkrax/status_info.rb'
 
-# Offense count: 5
-Rails/OutputSafety:
-  Exclude:
-    - 'app/forms/hyrax/forms/admin/appearance.rb'
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-
-# Offense count: 3
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: Keywords, RequireColon.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
+Style/CommentAnnotation:
   Exclude:
-    - 'app/models/account.rb'
-    - 'spec/models/account_spec.rb'
+    - 'app/models/bulkrax/xml_entry.rb'
+    - 'spec/models/bulkrax/oai_entry_spec.rb'
 
-# Offense count: 4
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+Style/IfUnlessModifier:
   Exclude:
-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/hyrax/downloads_controller.rb'
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
-    - 'app/models/bulkrax/entry.rb'
+    - 'app/models/bulkrax/csv_entry.rb'
+    - 'lib/generators/bulkrax/templates/config/initializers/bulkrax.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: line_count_dependent, lambda, literal
-Style/Lambda:
+# This cop supports safe auto-correction (--auto-correct).
+Style/MultilineIfModifier:
   Exclude:
-    - 'app/models/user.rb'
+    - 'app/models/bulkrax/csv_entry.rb'
 
 # Offense count: 1
-Style/MixinUsage:
+# This cop supports safe auto-correction (--auto-correct).
+Style/RedundantBegin:
   Exclude:
-    - 'spec/support/devise.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/helpers/blacklight/catalog_helper_behavior.rb'
+    - 'spec/rails_helper.rb'
diff --git a/Dockerfile b/Dockerfile
index da22d3d7c..325d61452 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG HYRAX_IMAGE_VERSION=hyrax-v5.0.0.rc2
+ARG HYRAX_IMAGE_VERSION=hyrax-v5.0.0.rc1
 FROM ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_IMAGE_VERSION as hyku-base
 
 USER root
diff --git a/Gemfile b/Gemfile
index 1ddb2fe60..a676dbfcb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,7 @@ gem 'blacklight_range_limit'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap', '~> 4.6'
 gem 'bootstrap-datepicker-rails'
+gem 'bixby', '~> 5.0', '>= 5.0.2', group: %i[development test]
 gem 'bulkrax', '~> 5.4'
 gem 'byebug', group: %i[development test]
 gem 'capybara', group: %i[test]
@@ -61,7 +62,7 @@ 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 'parser', '>= 3.1.0.0'
 gem 'pg'
 gem 'postrank-uri', '>= 1.0.24'
 gem 'pry-byebug', group: %i[development test]
@@ -79,8 +80,9 @@ gem 'rspec-its', group: %i[test]
 gem 'rspec-rails', '>= 3.6.0', group: %i[development test]
 gem 'rspec-retry', group: %i[test]
 gem 'rspec_junit_formatter', group: %i[test]
-gem 'rubocop', '~> 0.50', '<= 0.52.1', group: %i[development test]
+gem 'rubocop', '1.28.2', group: %i[development test]
 gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2', group: %i[development test]
+gem 'rubocop-rails', '~> 2.15', group: %i[development test]
 gem 'sass-rails', '~> 6.0' # Use SCSS for stylesheets
 gem 'scss_lint', require: false, group: %i[development]
 gem 'secure_headers'
diff --git a/Gemfile.lock b/Gemfile.lock
index c397bf7af..6676493a1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,6 +274,12 @@ GEM
     bigdecimal (3.1.5)
     bindata (2.4.15)
     bindex (0.8.1)
+    bixby (5.0.2)
+      rubocop (= 1.28.2)
+      rubocop-ast
+      rubocop-performance
+      rubocop-rails
+      rubocop-rspec
     blacklight (7.35.0)
       deprecation
       globalid
@@ -916,8 +922,9 @@ GEM
     os (1.1.4)
     ostruct (0.6.0)
     parallel (1.23.0)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
+    parser (3.2.2.4)
+      ast (~> 2.4.1)
+      racc
     parslet (2.0.0)
     pg (1.5.4)
     popper_js (1.16.1)
@@ -926,7 +933,6 @@ GEM
       addressable (>= 2.4.0)
       nokogiri (>= 1.8.0)
       public_suffix (>= 4.0.0, < 5)
-    powerpack (0.1.3)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -1136,13 +1142,24 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.52.1)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
-      powerpack (~> 0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.19.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.15.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
     rubocop-rspec (1.22.2)
       rubocop (>= 0.52.1)
     ruby-box (1.15.0)
@@ -1347,6 +1364,7 @@ GEM
     zlib (2.1.1)
 
 PLATFORMS
+  aarch64-linux-musl
   x86_64-linux-musl
 
 DEPENDENCIES
@@ -1356,6 +1374,7 @@ DEPENDENCIES
   addressable (= 2.8.1)
   apartment!
   aws-sdk-sqs
+  bixby (~> 5.0, >= 5.0.2)
   blacklight (~> 7.29)
   blacklight_advanced_search
   blacklight_oai_provider (~> 7.0)
@@ -1405,7 +1424,7 @@ DEPENDENCIES
   omniauth-saml (~> 2.1)
   omniauth_openid_connect
   order_already
-  parser (~> 2.5.3)
+  parser (>= 3.1.0.0)
   pg
   postrank-uri (>= 1.0.24)
   pry-byebug
@@ -1424,7 +1443,8 @@ DEPENDENCIES
   rspec-rails (>= 3.6.0)
   rspec-retry
   rspec_junit_formatter
-  rubocop (~> 0.50, <= 0.52.1)
+  rubocop (= 1.28.2)
+  rubocop-rails (~> 2.15)
   rubocop-rspec (~> 1.22, <= 1.22.2)
   sass-rails (~> 6.0)
   scss_lint
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 18b2d58b4..df85c9a77 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -25,7 +25,7 @@ def locale_for(type:, term:, record_class:)
     locale
   end
 
-  def missing_translation(value, options = {})
+  def missing_translation(value, _options = {})
     value.include?('translation missing')
   end
 end

From fecb4e923038594123b7f05d9e5ca360db0408cb Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 13 Dec 2023 15:07:35 -0800
Subject: [PATCH 067/126] =?UTF-8?q?=F0=9F=A7=B9=20Ran=20`bundle=20exec=20r?=
 =?UTF-8?q?ubocop=20-a`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                       |  10 +-
 app/controllers/account_sign_up_controller.rb |  32 +-
 app/controllers/admin/accounts_controller.rb  |  12 +-
 .../admin/group_roles_controller.rb           |  30 +-
 .../admin/group_users_controller.rb           |  32 +-
 app/controllers/admin/groups_controller.rb    |  18 +-
 app/controllers/admin/users_controller.rb     |   6 +-
 .../admin/work_types_controller.rb            |   6 +-
 app/controllers/admin_controller.rb           |  12 +-
 app/controllers/application_controller.rb     | 156 ++---
 app/controllers/catalog_controller.rb         |   4 +-
 .../hyrax/admin/users_controller_behavior.rb  |  10 +-
 .../hyrax/users_controller_decorator.rb       |  40 +-
 .../hyrax/works_controller_behavior.rb        | 624 +++++++++---------
 .../hyku/invitations_controller.rb            |  10 +-
 .../hyku/registrations_controller.rb          |   6 +-
 .../hyrax/admin/appearances_controller.rb     |  64 +-
 .../hyrax/admin/workflow_roles_controller.rb  |   6 +-
 .../hyrax/contact_form_controller.rb          |  86 +--
 .../hyrax/dashboard/collections_controller.rb |  50 +-
 .../featured_collection_lists_controller.rb   |   6 +-
 app/controllers/hyrax/homepage_controller.rb  |  88 +--
 app/controllers/hyrax/pages_controller.rb     |  78 +--
 .../identity_providers_controller.rb          |  42 +-
 app/controllers/labels_controller.rb          |  12 +-
 .../proprietor/accounts_controller.rb         |  64 +-
 .../proprietor/users_controller.rb            |  72 +-
 app/controllers/roles_controller.rb           |   6 +-
 app/controllers/sites_controller.rb           |  56 +-
 .../users/omniauth_callbacks_controller.rb    |   2 +-
 app/forms/hyrax/forms/admin/appearance.rb     |  94 +--
 app/helpers/shared_search_helper.rb           |  22 +-
 app/jobs/cleanup_account_job.rb               |  28 +-
 app/jobs/create_solr_collection_job.rb        | 120 ++--
 app/jobs/delete_old_guests_job.rb             |   6 +-
 app/jobs/embargo_auto_expiry_job.rb           |   6 +-
 app/jobs/import_work_from_purl_job.rb         | 100 +--
 app/jobs/lease_auto_expiry_job.rb             |   6 +-
 app/jobs/remove_solr_collection_job.rb        |   8 +-
 app/mailers/hyku_mailer.rb                    |   6 +-
 app/models/concerns/account_cname.rb          |   8 +-
 app/models/concerns/account_settings.rb       | 126 ++--
 app/models/concerns/account_switch.rb         |   2 +-
 app/models/featured_collection_list.rb        |  32 +-
 app/models/hyrax/group.rb                     |  28 +-
 app/models/nil_fcrepo_endpoint.rb             |   6 +-
 app/models/nil_solr_endpoint.rb               |  22 +-
 app/models/redis_endpoint.rb                  |   6 +-
 app/models/role.rb                            |  10 +-
 app/models/site.rb                            |  38 +-
 app/models/user.rb                            |   2 +-
 .../iiif_av/displays_content_decorator.rb     | 110 +--
 .../hyku/admin/group/navigation_presenter.rb  | 118 ++--
 .../hyku/collapsable_section_presenter.rb     |  22 +-
 app/presenters/hyku/work_show_presenter.rb    |  30 +-
 app/presenters/hyrax/admin/users_presenter.rb |   8 +-
 .../hyrax/collection_presenter_decorator.rb   |  20 +-
 app/presenters/hyrax/homepage_presenter.rb    |   8 +-
 app/services/create_account.rb                |   8 +-
 app/services/group_aware_role_checker.rb      |  20 +-
 .../manifest_builder_service_decorator.rb     |  30 +-
 app/services/hyrax/thumbnail_path_service.rb  |  80 +--
 .../hyrax/workflow/permission_grantor.rb      |  90 +--
 app/services/roles_service.rb                 |   4 +-
 bin/extract_mods_to_spreadsheet               |  10 +-
 bin/git-cleanup                               |   6 +-
 bin/graph                                     |  13 +-
 bin/import_from_purl                          |   2 +-
 bin/import_mods_files                         |   2 -
 bin/web                                       |   4 +-
 bin/worker                                    |   6 +-
 config/application.rb                         |  22 +-
 config/environments/development.rb            |  13 +-
 config/environments/production.rb             |   6 +-
 config/initializers/0db_created.rb            |   4 +-
 config/initializers/apartment.rb              |  11 +-
 config/initializers/bulkrax.rb                |  23 +-
 config/initializers/devise.rb                 |   4 +-
 .../file_set_derivatives_overrides.rb         |   4 +-
 config/initializers/hyrax.rb                  |  10 +-
 config/initializers/mailboxer.rb              |  15 +-
 config/initializers/mime_types.rb             |   2 +-
 config/initializers/rolify.rb                 |   2 +-
 config/initializers/simple_form.rb            |   1 -
 config/routes.rb                              |  12 +-
 config/spring.rb                              |   4 +-
 lib/active_job_tenant.rb                      |  22 +-
 .../derivatives/processors/image_decorator.rb |  18 +-
 .../canvas_builder_decorator.rb               |   4 +-
 lib/importer/csv_importer.rb                  |  38 +-
 lib/importer/csv_parser.rb                    | 200 +++---
 lib/importer/factory/object_factory.rb        |  98 +--
 .../factory/with_associated_collection.rb     |   6 +-
 lib/importer/mods_parser.rb                   | 102 +--
 lib/stanford/importer/mods_parser.rb          |  14 +-
 lib/stanford/importer/purl_parser.rb          |  18 +-
 lib/stanford/importer/purl_retriever.rb       |  16 +-
 spec/factories/admin_sets.rb                  |   4 +-
 spec/factories/collection_types.rb            |   8 +-
 spec/factories/collections.rb                 |  16 +-
 spec/factories/permission_templates.rb        |  24 +-
 spec/lib/importer/csv_importer_spec.rb        |   2 +-
 spec/models/account_spec.rb                   |   2 +-
 .../admin/group/navigation_presenter_spec.rb  |   8 +-
 spec/rails_helper.rb                          |   8 +-
 .../account_sign_up/new.html.erb_spec.rb      |   2 +-
 .../proprietor/accounts/new.html.erb_spec.rb  |   2 +-
 .../proprietor/users/new.html.erb_spec.rb     |   2 +-
 .../proprietor/users/show.html.erb_spec.rb    |   2 +-
 109 files changed, 1796 insertions(+), 1860 deletions(-)

diff --git a/Gemfile b/Gemfile
index a676dbfcb..a350101b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,12 +6,13 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0'
 
-gem 'active-fedora', '~> 14.0'
 gem 'active_elastic_job', github: 'active-elastic-job/active-elastic-job', ref: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979', group: %i[aws]
+gem 'active-fedora', '~> 14.0'
 gem 'activerecord-nulldb-adapter'
 gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed
 gem 'apartment', github: 'scientist-softserv/apartment', branch: 'development'
 gem 'aws-sdk-sqs', group: %i[aws]
+gem 'bixby', '~> 5.0', '>= 5.0.2', group: %i[development test]
 gem 'blacklight', '~> 7.29'
 gem 'blacklight_advanced_search'
 gem 'blacklight_oai_provider', '~> 7.0'
@@ -19,7 +20,6 @@ gem 'blacklight_range_limit'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap', '~> 4.6'
 gem 'bootstrap-datepicker-rails'
-gem 'bixby', '~> 5.0', '>= 5.0.2', group: %i[development test]
 gem 'bulkrax', '~> 5.4'
 gem 'byebug', group: %i[development test]
 gem 'capybara', group: %i[test]
@@ -58,9 +58,9 @@ gem 'negative_captcha'
 gem 'okcomputer'
 gem 'omniauth-cas', github: 'stanhu/omniauth-cas', ref: '4211e6d05941b4a981f9a36b49ec166cecd0e271'
 gem 'omniauth-multi-provider'
+gem 'omniauth_openid_connect'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'omniauth-saml', '~> 2.1'
-gem 'omniauth_openid_connect'
 gem 'order_already'
 gem 'parser', '>= 3.1.0.0'
 gem 'pg'
@@ -77,12 +77,12 @@ gem 'rsolr', '~> 2.0'
 gem 'rspec', group: %i[development test]
 gem 'rspec-activemodel-mocks', group: %i[test]
 gem 'rspec-its', group: %i[test]
+gem 'rspec_junit_formatter', group: %i[test]
 gem 'rspec-rails', '>= 3.6.0', group: %i[development test]
 gem 'rspec-retry', group: %i[test]
-gem 'rspec_junit_formatter', group: %i[test]
 gem 'rubocop', '1.28.2', group: %i[development test]
-gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2', group: %i[development test]
 gem 'rubocop-rails', '~> 2.15', group: %i[development test]
+gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2', group: %i[development test]
 gem 'sass-rails', '~> 6.0' # Use SCSS for stylesheets
 gem 'scss_lint', require: false, group: %i[development]
 gem 'secure_headers'
diff --git a/app/controllers/account_sign_up_controller.rb b/app/controllers/account_sign_up_controller.rb
index 89b06cb6e..c0fe62fae 100644
--- a/app/controllers/account_sign_up_controller.rb
+++ b/app/controllers/account_sign_up_controller.rb
@@ -27,24 +27,24 @@ def create
 
   private
 
-    def ensure_admin!
-      # Require Admin access to perform any actions
-      authorize! :read, :admin_dashboard
-    end
+  def ensure_admin!
+    # Require Admin access to perform any actions
+    authorize! :read, :admin_dashboard
+  end
 
-    def admin_only_tenant_creation?
-      ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_ADMIN_ONLY_TENANT_CREATION', false))
-    end
+  def admin_only_tenant_creation?
+    ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_ADMIN_ONLY_TENANT_CREATION', false))
+  end
 
-    def first_user_registration_url
-      if current_user
-        new_user_session_url(host: @account.cname)
-      else
-        new_user_registration_url(host: @account.cname)
-      end
+  def first_user_registration_url
+    if current_user
+      new_user_session_url(host: @account.cname)
+    else
+      new_user_registration_url(host: @account.cname)
     end
+  end
 
-    def create_params
-      params.require(:account).permit(:name)
-    end
+  def create_params
+    params.require(:account).permit(:name)
+  end
 end
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index f27c0e2a7..d5028b217 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -28,12 +28,12 @@ def update
 
     private
 
-      def account_params
-        params.require(:account).permit(:name, :cname, :title, *@account.public_settings.keys)
-      end
+    def account_params
+      params.require(:account).permit(:name, :cname, :title, *@account.public_settings.keys)
+    end
 
-      def set_current_account
-        @account = Site.account
-      end
+    def set_current_account
+      @account = Site.account
+    end
   end
 end
diff --git a/app/controllers/admin/group_roles_controller.rb b/app/controllers/admin/group_roles_controller.rb
index d1966f2dd..1818e85a6 100644
--- a/app/controllers/admin/group_roles_controller.rb
+++ b/app/controllers/admin/group_roles_controller.rb
@@ -44,23 +44,23 @@ def destroy
 
     private
 
-      def load_group
-        @group = Hyrax::Group.find_by(id: params[:group_id])
-      end
+    def load_group
+      @group = Hyrax::Group.find_by(id: params[:group_id])
+    end
 
-      def redirect_not_found
-        flash[:error] = 'Unable to find Group Role with that ID'
-        redirect_to admin_group_roles_path(@group)
-      end
+    def redirect_not_found
+      flash[:error] = 'Unable to find Group Role with that ID'
+      redirect_to admin_group_roles_path(@group)
+    end
 
-      def cannot_remove_admin_role_from_admin_group
-        role = Role.find_by(id: params[:role_id])
-        return unless @group.name == ::Ability.admin_group_name && role.name == 'admin'
+    def cannot_remove_admin_role_from_admin_group
+      role = Role.find_by(id: params[:role_id])
+      return unless @group.name == ::Ability.admin_group_name && role.name == 'admin'
 
-        redirect_back(
-          fallback_location: edit_admin_group_path(@group),
-          flash: { error: "Admin role cannot be removed from this group" }
-        )
-      end
+      redirect_back(
+        fallback_location: edit_admin_group_path(@group),
+        flash: { error: "Admin role cannot be removed from this group" }
+      )
+    end
   end
 end
diff --git a/app/controllers/admin/group_users_controller.rb b/app/controllers/admin/group_users_controller.rb
index 3488fda4c..c7544ead0 100644
--- a/app/controllers/admin/group_users_controller.rb
+++ b/app/controllers/admin/group_users_controller.rb
@@ -32,25 +32,25 @@ def destroy
 
     private
 
-      def load_group
-        @group = Hyrax::Group.find_by(id: params[:group_id])
-      end
+    def load_group
+      @group = Hyrax::Group.find_by(id: params[:group_id])
+    end
 
-      def page_number
-        params.fetch(:page, 1).to_i
-      end
+    def page_number
+      params.fetch(:page, 1).to_i
+    end
 
-      def page_size
-        params.fetch(:per, 10).to_i
-      end
+    def page_size
+      params.fetch(:per, 10).to_i
+    end
 
-      def cannot_remove_admin_users_from_admin_group
-        return unless @group.name == ::Ability.admin_group_name
+    def cannot_remove_admin_users_from_admin_group
+      return unless @group.name == ::Ability.admin_group_name
 
-        redirect_back(
-          fallback_location: edit_admin_group_path(@group),
-          flash: { error: "Admin users cannot be removed from this group" }
-        )
-      end
+      redirect_back(
+        fallback_location: edit_admin_group_path(@group),
+        flash: { error: "Admin users cannot be removed from this group" }
+      )
+    end
   end
 end
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index c939ff5de..513ef190e 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -83,16 +83,16 @@ def destroy
 
     private
 
-      def group_params
-        params.require(:group).permit(:name, :humanized_name, :description)
-      end
+    def group_params
+      params.require(:group).permit(:name, :humanized_name, :description)
+    end
 
-      def page_number
-        params.fetch(:page, 1).to_i
-      end
+    def page_number
+      params.fetch(:page, 1).to_i
+    end
 
-      def page_size
-        params.fetch(:per, 10).to_i
-      end
+    def page_size
+      params.fetch(:per, 10).to_i
+    end
   end
 end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index fa6740127..6230b44c3 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -28,8 +28,8 @@ def activate
 
     private
 
-      def load_user
-        @user = User.from_url_component(params[:id])
-      end
+    def load_user
+      @user = User.from_url_component(params[:id])
+    end
   end
 end
diff --git a/app/controllers/admin/work_types_controller.rb b/app/controllers/admin/work_types_controller.rb
index babaf515c..105745775 100644
--- a/app/controllers/admin/work_types_controller.rb
+++ b/app/controllers/admin/work_types_controller.rb
@@ -24,8 +24,8 @@ def update
 
     private
 
-      def site
-        @site ||= Site.first
-      end
+    def site
+      @site ||= Site.first
+    end
   end
 end
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 2f8d6cb33..e9005f827 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -7,11 +7,11 @@ class AdminController < ApplicationController
 
   private
 
-    def ensure_admin!
-      authorize! :read, :admin_dashboard
-    end
+  def ensure_admin!
+    authorize! :read, :admin_dashboard
+  end
 
-    def deny_access(_exception)
-      redirect_to main_app.root_url, alert: t('hyku.admin.flash.access_denied')
-    end
+  def deny_access(_exception)
+    redirect_to main_app.root_url, alert: t('hyku.admin.flash.access_denied')
+  end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 424590530..4c6abe1a8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -29,103 +29,103 @@ class ApplicationController < ActionController::Base
 
   protected
 
-    def is_hidden
-      current_account.persisted? && !current_account.is_public?
-    end
+  def is_hidden
+    current_account.persisted? && !current_account.is_public?
+  end
 
-    def is_api_or_pdf
-      request.format.to_s.match('json') ||
-        params[:print] ||
-        request.path.include?('api') ||
-        request.path.include?('pdf')
-    end
+  def is_api_or_pdf
+    request.format.to_s.match('json') ||
+      params[:print] ||
+      request.path.include?('api') ||
+      request.path.include?('pdf')
+  end
 
-    def is_staging
-      ['staging'].include?(Rails.env)
-    end
+  def is_staging
+    ['staging'].include?(Rails.env)
+  end
 
-    ##
-    # Extra authentication for palni-palci during development phase
-    def authenticate_if_needed
-      # Disable this extra authentication in test mode
-      return true if Rails.env.test?
-      if (is_hidden || is_staging) && !is_api_or_pdf
-        authenticate_or_request_with_http_basic do |username, password|
-          username == "samvera" && password == "hyku"
-        end
+  ##
+  # Extra authentication for palni-palci during development phase
+  def authenticate_if_needed
+    # Disable this extra authentication in test mode
+    return true if Rails.env.test?
+    if (is_hidden || is_staging) && !is_api_or_pdf
+      authenticate_or_request_with_http_basic do |username, password|
+        username == "samvera" && password == "hyku"
       end
     end
+  end
 
-    def super_and_current_users
-      users = Role.find_by(name: 'superadmin')&.users.to_a
-      users << current_user if current_user && !users.include?(current_user)
-      users
-    end
+  def super_and_current_users
+    users = Role.find_by(name: 'superadmin')&.users.to_a
+    users << current_user if current_user && !users.include?(current_user)
+    users
+  end
 
   private
 
-    def require_active_account!
-      return if singletenant?
-      return if devise_controller?
-      raise Apartment::TenantNotFound, "No tenant for #{request.host}" unless current_account.persisted?
-    end
+  def require_active_account!
+    return if singletenant?
+    return if devise_controller?
+    raise Apartment::TenantNotFound, "No tenant for #{request.host}" unless current_account.persisted?
+  end
 
-    def set_account_specific_connections!
-      current_account&.switch!
-    end
+  def set_account_specific_connections!
+    current_account&.switch!
+  end
 
-    def multitenant?
-      @multitenant ||= ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_MULTITENANT', false))
-    end
+  def multitenant?
+    @multitenant ||= ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_MULTITENANT', false))
+  end
 
-    def singletenant?
-      !multitenant?
-    end
+  def singletenant?
+    !multitenant?
+  end
 
-    def elevate_single_tenant!
-      AccountElevator.switch!(current_account.cname) if current_account && root_host?
-    end
+  def elevate_single_tenant!
+    AccountElevator.switch!(current_account.cname) if current_account && root_host?
+  end
 
-    def root_host?
-      Account.canonical_cname(request.host) == Account.root_host
-    end
+  def root_host?
+    Account.canonical_cname(request.host) == Account.root_host
+  end
 
-    def admin_host?
-      return false if singletenant?
-      Account.canonical_cname(request.host) == Account.admin_host
-    end
+  def admin_host?
+    return false if singletenant?
+    Account.canonical_cname(request.host) == Account.admin_host
+  end
 
-    def current_account
-      @current_account ||= Account.from_request(request)
-      @current_account ||= if multitenant?
-                             Account.new do |a|
-                               a.build_solr_endpoint
-                               a.build_fcrepo_endpoint
-                               a.build_redis_endpoint
-                             end
-                           else
-                             Account.single_tenant_default
+  def current_account
+    @current_account ||= Account.from_request(request)
+    @current_account ||= if multitenant?
+                           Account.new do |a|
+                             a.build_solr_endpoint
+                             a.build_fcrepo_endpoint
+                             a.build_redis_endpoint
                            end
-    end
+                         else
+                           Account.single_tenant_default
+                         end
+  end
 
-    # Find themes set on Site model, or return default
-    def home_page_theme
-      current_account.sites&.first&.home_theme || 'default_home'
-    end
+  # Find themes set on Site model, or return default
+  def home_page_theme
+    current_account.sites&.first&.home_theme || 'default_home'
+  end
 
-    def show_page_theme
-      current_account.sites&.first&.show_theme || 'default_show'
-    end
+  def show_page_theme
+    current_account.sites&.first&.show_theme || 'default_show'
+  end
 
-    def search_results_theme
-      current_account.sites&.first&.search_theme || 'list_view'
-    end
+  def search_results_theme
+    current_account.sites&.first&.search_theme || 'list_view'
+  end
 
-    # Add context information to the lograge entries
-    def append_info_to_payload(payload)
-      super
-      payload[:request_id] = request.uuid
-      payload[:user_id] = current_user.id if current_user
-      payload[:account_id] = current_account.cname if current_account
-    end
+  # Add context information to the lograge entries
+  def append_info_to_payload(payload)
+    super
+    payload[:request_id] = request.uuid
+    payload[:user_id] = current_user.id if current_user
+    payload[:account_id] = current_account.cname if current_account
+  end
 end
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index a9105df5b..ebbb4bf82 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -427,8 +427,8 @@ def self.uploaded_field
         repository_name: ->(controller) { controller.send(:current_account)&.name.presence },
         # repository_url:  ->(controller) { controller.oai_catalog_url },
         record_prefix: ->(controller) { controller.send(:current_account).oai_prefix },
-        admin_email:   ->(controller) { controller.send(:current_account).oai_admin_email },
-        sample_id:     ->(controller) { controller.send(:current_account).oai_sample_identifier }
+        admin_email: ->(controller) { controller.send(:current_account).oai_admin_email },
+        sample_id: ->(controller) { controller.send(:current_account).oai_sample_identifier }
       },
       document: {
         limit: 100, # number of records returned with each request, default: 15
diff --git a/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb b/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb
index cd4d075e9..8b15f9e23 100644
--- a/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb
@@ -30,11 +30,11 @@ def index
 
       private
 
-        # OVERRIDE Hyrax v3.4.2 Replace :ensure_admin! with :ensure_access! to leverage User abilities.
-        # @see app/models/concerns/hyrax/ability/user_ability.rb
-        def ensure_access!
-          authorize! :read, ::User
-        end
+      # OVERRIDE Hyrax v3.4.2 Replace :ensure_admin! with :ensure_access! to leverage User abilities.
+      # @see app/models/concerns/hyrax/ability/user_ability.rb
+      def ensure_access!
+        authorize! :read, ::User
+      end
     end
   end
 end
diff --git a/app/controllers/concerns/hyrax/users_controller_decorator.rb b/app/controllers/concerns/hyrax/users_controller_decorator.rb
index 98f6ca53e..bdbc358bc 100644
--- a/app/controllers/concerns/hyrax/users_controller_decorator.rb
+++ b/app/controllers/concerns/hyrax/users_controller_decorator.rb
@@ -11,28 +11,28 @@ module UsersControllerDecorator
 
     private
 
-      def users_match!
-        # The #find_user method is a :before_action on the Hyrax::UsersController. It sets
-        # the @user variable, which we need in this method.
-        #
-        # However, because we are decorating Hyrax::UsersController with this module,
-        # this method's :before_action will fire before the one that calls #find_user.
-        # This means that #find_user will fire a second time after this method runs.
-        #
-        # This is not ideal, but after discussing with @jeremyf, we decided that this is
-        # the "lesser evil" compared to other override methods (i.e. using #class_eval,
-        # overriding the entire file, etc.); since User is an ActiveRecord object, the
-        # database query that sets @user in #find_user will be cached.
-        #
-        # Classes that inherit from Hyrax::UsersController do not have this problem
-        # (e.g. Hyrax::Dashboard::ProfilesController), which is why we check for presence.
-        find_user if @user.blank?
+    def users_match!
+      # The #find_user method is a :before_action on the Hyrax::UsersController. It sets
+      # the @user variable, which we need in this method.
+      #
+      # However, because we are decorating Hyrax::UsersController with this module,
+      # this method's :before_action will fire before the one that calls #find_user.
+      # This means that #find_user will fire a second time after this method runs.
+      #
+      # This is not ideal, but after discussing with @jeremyf, we decided that this is
+      # the "lesser evil" compared to other override methods (i.e. using #class_eval,
+      # overriding the entire file, etc.); since User is an ActiveRecord object, the
+      # database query that sets @user in #find_user will be cached.
+      #
+      # Classes that inherit from Hyrax::UsersController do not have this problem
+      # (e.g. Hyrax::Dashboard::ProfilesController), which is why we check for presence.
+      find_user if @user.blank?
 
-        return if can?(:read, @user)
-        return if current_user == @user
+      return if can?(:read, @user)
+      return if current_user == @user
 
-        raise CanCan::AccessDenied
-      end
+      raise CanCan::AccessDenied
+    end
   end
 end
 
diff --git a/app/controllers/concerns/hyrax/works_controller_behavior.rb b/app/controllers/concerns/hyrax/works_controller_behavior.rb
index f5b51f64f..a8f9fa914 100644
--- a/app/controllers/concerns/hyrax/works_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/works_controller_behavior.rb
@@ -147,375 +147,375 @@ def json_manifest
 
     private
 
-      def iiif_manifest_presenter
-        IiifManifestPresenter.new(search_result_document(id: params[:id])).tap do |p|
-          p.hostname = request.hostname
-          p.ability = current_ability
-        end
+    def iiif_manifest_presenter
+      IiifManifestPresenter.new(search_result_document(id: params[:id])).tap do |p|
+        p.hostname = request.hostname
+        p.ability = current_ability
       end
+    end
 
-      def user_collections
-        collections_service.search_results(:deposit)
-      end
+    def user_collections
+      collections_service.search_results(:deposit)
+    end
 
-      def collections_service
-        Hyrax::CollectionsService.new(self)
-      end
+    def collections_service
+      Hyrax::CollectionsService.new(self)
+    end
 
-      def admin_set_id_for_new
-        Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
-      end
+    def admin_set_id_for_new
+      Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
+    end
 
-      def build_form
-        @form = work_form_service.build(curation_concern, current_ability, self)
-      end
+    def build_form
+      @form = work_form_service.build(curation_concern, current_ability, self)
+    end
 
-      def actor
-        @actor ||= Hyrax::CurationConcern.actor
-      end
+    def actor
+      @actor ||= Hyrax::CurationConcern.actor
+    end
 
-      ##
-      # @return [#errors]
-      def create_valkyrie_work
-        form = build_form
-        return after_create_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
-
-        result =
-          transactions['change_set.create_work']
-          .with_step_args(
-            'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
-            'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-            'change_set.set_user_as_depositor' => { user: current_user },
-            'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
-          )
-          .call(form)
-        @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
-        after_create_response
-      end
+    ##
+    # @return [#errors]
+    def create_valkyrie_work
+      form = build_form
+      return after_create_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
+
+      result =
+        transactions['change_set.create_work']
+        .with_step_args(
+          'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
+          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+          'change_set.set_user_as_depositor' => { user: current_user },
+          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
+        )
+        .call(form)
+      @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
+      after_create_response
+    end
 
-      def update_valkyrie_work
-        form = build_form
-        return after_update_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
-        result =
-          transactions['change_set.update_work']
-          .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-                          'work_resource.update_work_members' => { work_members_attributes: work_members_attributes })
-          .call(form)
-        @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
-        after_update_response
-      end
+    def update_valkyrie_work
+      form = build_form
+      return after_update_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
+      result =
+        transactions['change_set.update_work']
+        .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes })
+        .call(form)
+      @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
+      after_update_response
+    end
 
-      def work_members_attributes
-        params[hash_key_for_curation_concern][:work_members_attributes]&.permit!&.to_h
-      end
+    def work_members_attributes
+      params[hash_key_for_curation_concern][:work_members_attributes]&.permit!&.to_h
+    end
 
-      def form_err_msg(form)
-        form.errors.messages.values.flatten.to_sentence
-      end
+    def form_err_msg(form)
+      form.errors.messages.values.flatten.to_sentence
+    end
 
-      def transaction_err_msg(result)
-        result.failure.first
-      end
+    def transaction_err_msg(result)
+      result.failure.first
+    end
 
-      def presenter
-        @presenter ||= show_presenter.new(search_result_document(id: params[:id]), current_ability, request)
-      end
+    def presenter
+      @presenter ||= show_presenter.new(search_result_document(id: params[:id]), current_ability, request)
+    end
 
-      def parent_presenter
-        return @parent_presenter unless params[:parent_id]
+    def parent_presenter
+      return @parent_presenter unless params[:parent_id]
 
-        @parent_presenter ||=
-          show_presenter.new(search_result_document(id: params[:parent_id]), current_ability, request)
-      end
+      @parent_presenter ||=
+        show_presenter.new(search_result_document(id: params[:parent_id]), current_ability, request)
+    end
 
-      # Include 'hyrax/base' in the search path for views, while prefering
-      # our local paths. Thus we are unable to just override `self.local_prefixes`
-      def _prefixes
-        @_prefixes ||= super + ['hyrax/base']
-      end
+    # Include 'hyrax/base' in the search path for views, while prefering
+    # our local paths. Thus we are unable to just override `self.local_prefixes`
+    def _prefixes
+      @_prefixes ||= super + ['hyrax/base']
+    end
 
-      def actor_environment
-        Actors::Environment.new(curation_concern, current_ability, attributes_for_actor)
-      end
+    def actor_environment
+      Actors::Environment.new(curation_concern, current_ability, attributes_for_actor)
+    end
 
-      def hash_key_for_curation_concern
-        _curation_concern_type.model_name.param_key
-      end
+    def hash_key_for_curation_concern
+      _curation_concern_type.model_name.param_key
+    end
 
-      def contextual_path(presenter, parent_presenter)
-        ::Hyrax::ContextualPath.new(presenter, parent_presenter).show
-      end
+    def contextual_path(presenter, parent_presenter)
+      ::Hyrax::ContextualPath.new(presenter, parent_presenter).show
+    end
 
-      # @deprecated
-      def curation_concern_from_search_results
-        Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-          "Instead, use '#search_result_document'.")
-        search_params = params.deep_dup
-        search_params.delete :page
-        search_result_document(search_params)
-      end
+    # @deprecated
+    def curation_concern_from_search_results
+      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
+        "Instead, use '#search_result_document'.")
+      search_params = params.deep_dup
+      search_params.delete :page
+      search_result_document(search_params)
+    end
 
-      ##
-      # Only returns unsuppressed documents the user has read access to
-      #
-      # @api public
-      #
-      # @param search_params [ActionController::Parameters] this should
-      #   include an :id key, but based on implementation and use of the
-      #   WorkSearchBuilder, it need not.
-      #
-      # @return [SolrDocument]
-      #
-      # @raise [WorkflowAuthorizationException] when the object is not
-      #   found via the search builder's search logic BUT the object is
-      #   suppressed AND the user can read it (Yeah, it's confusing but
-      #   after a lot of debugging that's the logic)
-      #
-      # @raise [CanCan::AccessDenied] when the object is not found via
-      #   the search builder's search logic BUT the object is not
-      #   supressed OR not readable by the user (Yeah.)
-      #
-      # @note This is Jeremy, I have suspicions about the first line of
-      #   this comment (eg, "Only return unsuppressed...").  The
-      #   reason is that I've encounter situations in the specs
-      #   where the document_list is empty but if I then query Solr
-      #   for the object by ID, I get a document that is NOT
-      #   suppressed AND can be read.  In other words, I believe
-      #   there is more going on in the search_results method
-      #   (e.g. a filter is being applied that is beyond what the
-      #   comment indicates)
-      #
-      # @see #document_not_found!
-      def search_result_document(search_params)
-        _, document_list = search_results(search_params)
-        return document_list.first unless document_list.empty?
-        document_not_found!
-      end
+    ##
+    # Only returns unsuppressed documents the user has read access to
+    #
+    # @api public
+    #
+    # @param search_params [ActionController::Parameters] this should
+    #   include an :id key, but based on implementation and use of the
+    #   WorkSearchBuilder, it need not.
+    #
+    # @return [SolrDocument]
+    #
+    # @raise [WorkflowAuthorizationException] when the object is not
+    #   found via the search builder's search logic BUT the object is
+    #   suppressed AND the user can read it (Yeah, it's confusing but
+    #   after a lot of debugging that's the logic)
+    #
+    # @raise [CanCan::AccessDenied] when the object is not found via
+    #   the search builder's search logic BUT the object is not
+    #   supressed OR not readable by the user (Yeah.)
+    #
+    # @note This is Jeremy, I have suspicions about the first line of
+    #   this comment (eg, "Only return unsuppressed...").  The
+    #   reason is that I've encounter situations in the specs
+    #   where the document_list is empty but if I then query Solr
+    #   for the object by ID, I get a document that is NOT
+    #   suppressed AND can be read.  In other words, I believe
+    #   there is more going on in the search_results method
+    #   (e.g. a filter is being applied that is beyond what the
+    #   comment indicates)
+    #
+    # @see #document_not_found!
+    def search_result_document(search_params)
+      _, document_list = search_results(search_params)
+      return document_list.first unless document_list.empty?
+      document_not_found!
+    end
 
-      def document_not_found!
-        doc = ::SolrDocument.find(params[:id])
-        raise WorkflowAuthorizationException if doc.suppressed? && current_ability.can?(:read, doc)
-        raise CanCan::AccessDenied.new(nil, :show)
-      end
+    def document_not_found!
+      doc = ::SolrDocument.find(params[:id])
+      raise WorkflowAuthorizationException if doc.suppressed? && current_ability.can?(:read, doc)
+      raise CanCan::AccessDenied.new(nil, :show)
+    end
 
-      def render_unavailable
-        message = I18n.t("hyrax.workflow.unauthorized")
-        respond_to do |wants|
-          wants.html do
-            unavailable_presenter
-            flash[:notice] = message
-            render 'unavailable', status: :unauthorized
-          end
-          wants.json { render plain: message, status: :unauthorized }
-          additional_response_formats(wants)
-          wants.ttl { render plain: message, status: :unauthorized }
-          wants.jsonld { render plain: message, status: :unauthorized }
-          wants.nt { render plain: message, status: :unauthorized }
+    def render_unavailable
+      message = I18n.t("hyrax.workflow.unauthorized")
+      respond_to do |wants|
+        wants.html do
+          unavailable_presenter
+          flash[:notice] = message
+          render 'unavailable', status: :unauthorized
         end
+        wants.json { render plain: message, status: :unauthorized }
+        additional_response_formats(wants)
+        wants.ttl { render plain: message, status: :unauthorized }
+        wants.jsonld { render plain: message, status: :unauthorized }
+        wants.nt { render plain: message, status: :unauthorized }
       end
+    end
 
-      def unavailable_presenter
-        @presenter ||= show_presenter.new(::SolrDocument.find(params[:id]), current_ability, request)
-      end
+    def unavailable_presenter
+      @presenter ||= show_presenter.new(::SolrDocument.find(params[:id]), current_ability, request)
+    end
 
-      def decide_layout
-        layout = case action_name
-                 when 'show'
-                   '1_column'
-                 else
-                   'dashboard'
-                 end
-        File.join(theme, layout)
-      end
+    def decide_layout
+      layout = case action_name
+               when 'show'
+                 '1_column'
+               else
+                 'dashboard'
+               end
+      File.join(theme, layout)
+    end
 
-      ##
-      # @todo should the controller know so much about browse_everything?
-      #   hopefully this can be refactored to be more reusable.
-      #
-      # Add uploaded_files to the parameters received by the actor.
-      def attributes_for_actor
-        raw_params = params[hash_key_for_curation_concern]
-        attributes = if raw_params
-                       work_form_service.form_class(curation_concern).model_attributes(raw_params)
-                     else
-                       {}
-                     end
-
-        # If they selected a BrowseEverything file, but then clicked the
-        # remove button, it will still show up in `selected_files`, but
-        # it will no longer be in uploaded_files. By checking the
-        # intersection, we get the files they added via BrowseEverything
-        # that they have not removed from the upload widget.
-        uploaded_files = params.fetch(:uploaded_files, [])
-        selected_files = params.fetch(:selected_files, {}).values
-        browse_everything_urls = uploaded_files &
-                                 selected_files.map { |f| f[:url] }
-
-        # we need the hash of files with url and file_name
-        browse_everything_files = selected_files
-                                  .select { |v| uploaded_files.include?(v[:url]) }
-        attributes[:remote_files] = browse_everything_files
-        # Strip out any BrowseEverthing files from the regular uploads.
-        attributes[:uploaded_files] = uploaded_files -
-                                      browse_everything_urls
-        attributes
-      end
+    ##
+    # @todo should the controller know so much about browse_everything?
+    #   hopefully this can be refactored to be more reusable.
+    #
+    # Add uploaded_files to the parameters received by the actor.
+    def attributes_for_actor
+      raw_params = params[hash_key_for_curation_concern]
+      attributes = if raw_params
+                     work_form_service.form_class(curation_concern).model_attributes(raw_params)
+                   else
+                     {}
+                   end
+
+      # If they selected a BrowseEverything file, but then clicked the
+      # remove button, it will still show up in `selected_files`, but
+      # it will no longer be in uploaded_files. By checking the
+      # intersection, we get the files they added via BrowseEverything
+      # that they have not removed from the upload widget.
+      uploaded_files = params.fetch(:uploaded_files, [])
+      selected_files = params.fetch(:selected_files, {}).values
+      browse_everything_urls = uploaded_files &
+                               selected_files.map { |f| f[:url] }
+
+      # we need the hash of files with url and file_name
+      browse_everything_files = selected_files
+                                .select { |v| uploaded_files.include?(v[:url]) }
+      attributes[:remote_files] = browse_everything_files
+      # Strip out any BrowseEverthing files from the regular uploads.
+      attributes[:uploaded_files] = uploaded_files -
+                                    browse_everything_urls
+      attributes
+    end
 
-      def after_create_response
-        respond_to do |wants|
-          wants.html do
-            # Calling `#t` in a controller context does not mark _html keys as html_safe
-            flash[:notice] = view_context.t('hyrax.works.create.after_create_html', application_name: view_context.application_name)
+    def after_create_response
+      respond_to do |wants|
+        wants.html do
+          # Calling `#t` in a controller context does not mark _html keys as html_safe
+          flash[:notice] = view_context.t('hyrax.works.create.after_create_html', application_name: view_context.application_name)
 
-            redirect_to [main_app, curation_concern]
-          end
-          wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
+          redirect_to [main_app, curation_concern]
         end
+        wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
       end
+    end
 
-      def format_error_messages(errors)
-        errors.messages.map do |field, messages|
-          field_name = field.to_s.humanize
-          messages.map { |message| "#{field_name} #{message.sub(/^./, &:downcase)}" }
-        end.flatten.join("\n")
-      end
+    def format_error_messages(errors)
+      errors.messages.map do |field, messages|
+        field_name = field.to_s.humanize
+        messages.map { |message| "#{field_name} #{message.sub(/^./, &:downcase)}" }
+      end.flatten.join("\n")
+    end
 
-      def after_create_error(errors, original_input_params_for_form = nil)
-        respond_to do |wants|
-          wants.html do
-            flash[:error] = format_error_messages(errors)
-            rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
-            render 'new', status: :unprocessable_entity
-          end
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+    def after_create_error(errors, original_input_params_for_form = nil)
+      respond_to do |wants|
+        wants.html do
+          flash[:error] = format_error_messages(errors)
+          rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
+          render 'new', status: :unprocessable_entity
         end
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
       end
+    end
 
-      # Creating a form object that can re-render most of the submitted parameters.
-      # Required for ActiveFedora::Base objects only.
-      def rebuild_form(original_input_params_for_form)
-        build_form
-        @form = Hyrax::Forms::FailedSubmissionFormWrapper
-                .new(form: @form,
-                     input_params: original_input_params_for_form)
-      end
-
-      def after_update_response
-        return redirect_to hyrax.confirm_access_permission_path(curation_concern) if permissions_changed? && concern_has_file_sets?
+    # Creating a form object that can re-render most of the submitted parameters.
+    # Required for ActiveFedora::Base objects only.
+    def rebuild_form(original_input_params_for_form)
+      build_form
+      @form = Hyrax::Forms::FailedSubmissionFormWrapper
+              .new(form: @form,
+                   input_params: original_input_params_for_form)
+    end
 
-        respond_to do |wants|
-          wants.html { redirect_to [main_app, curation_concern], notice: "Work \"#{curation_concern}\" successfully updated." }
-          wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
-        end
-      end
+    def after_update_response
+      return redirect_to hyrax.confirm_access_permission_path(curation_concern) if permissions_changed? && concern_has_file_sets?
 
-      def after_update_error(errors)
-        respond_to do |wants|
-          wants.html do
-            flash[:error] = format_error_messages(errors)
-            build_form unless @form.is_a? Hyrax::ChangeSet
-            render 'edit', status: :unprocessable_entity
-          end
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
-        end
+      respond_to do |wants|
+        wants.html { redirect_to [main_app, curation_concern], notice: "Work \"#{curation_concern}\" successfully updated." }
+        wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
       end
+    end
 
-      def after_destroy_response(title)
-        respond_to do |wants|
-          wants.html { redirect_to hyrax.my_works_path, notice: "Deleted #{title}" }
-          wants.json { render_json_response(response_type: :deleted, message: "Deleted #{curation_concern.id}") }
+    def after_update_error(errors)
+      respond_to do |wants|
+        wants.html do
+          flash[:error] = format_error_messages(errors)
+          build_form unless @form.is_a? Hyrax::ChangeSet
+          render 'edit', status: :unprocessable_entity
         end
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
       end
+    end
 
-      def additional_response_formats(format)
-        format.endnote do
-          send_data(presenter.solr_document.export_as_endnote,
-                    type: "application/x-endnote-refer",
-                    filename: presenter.solr_document.endnote_filename)
-        end
+    def after_destroy_response(title)
+      respond_to do |wants|
+        wants.html { redirect_to hyrax.my_works_path, notice: "Deleted #{title}" }
+        wants.json { render_json_response(response_type: :deleted, message: "Deleted #{curation_concern.id}") }
       end
+    end
 
-      def save_permissions
-        @saved_permissions =
-          case curation_concern
-          when ActiveFedora::Base
-            curation_concern.permissions.map(&:to_hash)
-          else
-            Hyrax::AccessControl.for(resource: curation_concern).permissions
-          end
+    def additional_response_formats(format)
+      format.endnote do
+        send_data(presenter.solr_document.export_as_endnote,
+                  type: "application/x-endnote-refer",
+                  filename: presenter.solr_document.endnote_filename)
       end
+    end
 
-      def permissions_changed?
-        @saved_permissions !=
-          case curation_concern
-          when ActiveFedora::Base
-            curation_concern.permissions.map(&:to_hash)
-          else
-            Hyrax::AccessControl.for(resource: curation_concern).permissions
-          end
-      end
+    def save_permissions
+      @saved_permissions =
+        case curation_concern
+        when ActiveFedora::Base
+          curation_concern.permissions.map(&:to_hash)
+        else
+          Hyrax::AccessControl.for(resource: curation_concern).permissions
+        end
+    end
 
-      def concern_has_file_sets?
+    def permissions_changed?
+      @saved_permissions !=
         case curation_concern
-        when ActiveFedora::Common
-          curation_concern.file_sets.present?
+        when ActiveFedora::Base
+          curation_concern.permissions.map(&:to_hash)
         else
-          Hyrax.custom_queries.find_child_file_set_ids(resource: curation_concern).any?
+          Hyrax::AccessControl.for(resource: curation_concern).permissions
         end
-      end
+    end
 
-      def uploaded_files
-        UploadedFile.find(params.fetch(:uploaded_files, []))
+    def concern_has_file_sets?
+      case curation_concern
+      when ActiveFedora::Common
+        curation_concern.file_sets.present?
+      else
+        Hyrax.custom_queries.find_child_file_set_ids(resource: curation_concern).any?
       end
+    end
 
-      def available_admin_sets
-        # only returns admin sets in which the user can deposit
-        admin_set_results = Hyrax::AdminSetService.new(self).search_results(:deposit)
-
-        # get all the templates at once, reducing query load
-        templates = PermissionTemplate.where(source_id: admin_set_results.map(&:id)).to_a
-
-        admin_sets = admin_set_results.map do |admin_set_doc|
-          template = templates.find { |temp| temp.source_id == admin_set_doc.id.to_s }
-
-          ## OVERRIDE Hyrax v3.4.2
-          # Removes a short-circuit that allowed users with manage access to
-          # the given permission_template to always be able to edit a record's sharing
-          # (i.e. the "Sharing" tab in forms).
-          #
-          # We remove this because there is currently a bug in Hyrax where, if the
-          # workflow does not allow access grants, changes to a record's sharing
-          # are not being persisted, leading to a confusing UX.
-          # @see https://github.com/samvera/hyrax/issues/5904
-          #
-          # TEMPORARY: This override should be removed when the bug is resolved in
-          # upstream Hyrax and brought into this project.
-          #
-          # determine if sharing tab should be visible
-          sharing = !!template&.active_workflow&.allows_access_grant? # rubocop:disable Style/DoubleNegation
-
-          AdminSetSelectionPresenter::OptionsEntry
-            .new(admin_set: admin_set_doc, permission_template: template, permit_sharing: sharing)
-        end
+    def uploaded_files
+      UploadedFile.find(params.fetch(:uploaded_files, []))
+    end
 
-        AdminSetSelectionPresenter.new(admin_sets: admin_sets)
-      end
+    def available_admin_sets
+      # only returns admin sets in which the user can deposit
+      admin_set_results = Hyrax::AdminSetService.new(self).search_results(:deposit)
+
+      # get all the templates at once, reducing query load
+      templates = PermissionTemplate.where(source_id: admin_set_results.map(&:id)).to_a
+
+      admin_sets = admin_set_results.map do |admin_set_doc|
+        template = templates.find { |temp| temp.source_id == admin_set_doc.id.to_s }
+
+        ## OVERRIDE Hyrax v3.4.2
+        # Removes a short-circuit that allowed users with manage access to
+        # the given permission_template to always be able to edit a record's sharing
+        # (i.e. the "Sharing" tab in forms).
+        #
+        # We remove this because there is currently a bug in Hyrax where, if the
+        # workflow does not allow access grants, changes to a record's sharing
+        # are not being persisted, leading to a confusing UX.
+        # @see https://github.com/samvera/hyrax/issues/5904
+        #
+        # TEMPORARY: This override should be removed when the bug is resolved in
+        # upstream Hyrax and brought into this project.
+        #
+        # determine if sharing tab should be visible
+        sharing = !!template&.active_workflow&.allows_access_grant? # rubocop:disable Style/DoubleNegation
+
+        AdminSetSelectionPresenter::OptionsEntry
+          .new(admin_set: admin_set_doc, permission_template: template, permit_sharing: sharing)
+      end
+
+      AdminSetSelectionPresenter.new(admin_sets: admin_sets)
+    end
 
-      # added to prepend the show theme views into the view_paths
-      def inject_show_theme_views
-        if show_page_theme && show_page_theme != 'default_show'
-          original_paths = view_paths
-          show_theme_view_path = Rails.root.join('app', 'views', "themes", show_page_theme.to_s)
-          prepend_view_path(show_theme_view_path)
-          yield
-          # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-          # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
-          view_paths=(original_paths)
-          # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-        else
-          yield
-        end
+    # added to prepend the show theme views into the view_paths
+    def inject_show_theme_views
+      if show_page_theme && show_page_theme != 'default_show'
+        original_paths = view_paths
+        show_theme_view_path = Rails.root.join('app', 'views', "themes", show_page_theme.to_s)
+        prepend_view_path(show_theme_view_path)
+        yield
+        # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+        # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
+        view_paths=(original_paths)
+        # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+      else
+        yield
       end
+    end
   end
 end
 # rubocop:enable Metrics/ModuleLength
diff --git a/app/controllers/hyku/invitations_controller.rb b/app/controllers/hyku/invitations_controller.rb
index 2aa11fcac..e08ae7b1a 100644
--- a/app/controllers/hyku/invitations_controller.rb
+++ b/app/controllers/hyku/invitations_controller.rb
@@ -20,9 +20,7 @@ def create
       yield resource if block_given?
 
       # Override destination as this was a success either way
-      if is_flashing_format? && resource.invitation_sent_at
-        set_flash_message :notice, :send_instructions, email: resource.email
-      end
+      set_flash_message :notice, :send_instructions, email: resource.email if is_flashing_format? && resource.invitation_sent_at
       if method(:after_invite_path_for).arity == 1
         respond_with resource, location: after_invite_path_for(current_inviter)
       else
@@ -32,8 +30,8 @@ def create
 
     protected
 
-      def user_params
-        params.require(:user).permit(:email, :role)
-      end
+    def user_params
+      params.require(:user).permit(:email, :role)
+    end
   end
 end
diff --git a/app/controllers/hyku/registrations_controller.rb b/app/controllers/hyku/registrations_controller.rb
index fe9a9422a..758cf0afb 100644
--- a/app/controllers/hyku/registrations_controller.rb
+++ b/app/controllers/hyku/registrations_controller.rb
@@ -15,8 +15,8 @@ def create
 
     private
 
-      def configure_permitted_parameters
-        devise_parameter_sanitizer.permit(:sign_up, keys: [:display_name])
-      end
+    def configure_permitted_parameters
+      devise_parameter_sanitizer.permit(:sign_up, keys: [:display_name])
+    end
   end
 end
diff --git a/app/controllers/hyrax/admin/appearances_controller.rb b/app/controllers/hyrax/admin/appearances_controller.rb
index 9130b8b11..dbd0abf41 100644
--- a/app/controllers/hyrax/admin/appearances_controller.rb
+++ b/app/controllers/hyrax/admin/appearances_controller.rb
@@ -44,47 +44,47 @@ def update
 
       private
 
-        def update_params
-          params.require(:admin_appearance).permit(form_class.permitted_params)
-        end
+      def update_params
+        params.require(:admin_appearance).permit(form_class.permitted_params)
+      end
 
-        def require_permissions
-          authorize! :update, :appearance
-        end
+      def require_permissions
+        authorize! :update, :appearance
+      end
 
-        def add_breadcrumbs
-          add_breadcrumb t(:'hyrax.controls.home'), root_path
-          add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-          add_breadcrumb t(:'hyrax.admin.sidebar.configuration'), '#'
-          add_breadcrumb t(:'hyrax.admin.sidebar.appearance'), request.path
-        end
+      def add_breadcrumbs
+        add_breadcrumb t(:'hyrax.controls.home'), root_path
+        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
+        add_breadcrumb t(:'hyrax.admin.sidebar.configuration'), '#'
+        add_breadcrumb t(:'hyrax.admin.sidebar.appearance'), request.path
+      end
 
-        def load_home_theme_names
-          home_theme_names = []
-          @home_theme_information.each do |theme, value_hash|
-            value_hash.each do |key, value|
-              home_theme_names << [value, theme] if key == 'name'
-            end
+      def load_home_theme_names
+        home_theme_names = []
+        @home_theme_information.each do |theme, value_hash|
+          value_hash.each do |key, value|
+            home_theme_names << [value, theme] if key == 'name'
           end
-          home_theme_names
         end
+        home_theme_names
+      end
 
-        def load_show_theme_names
-          show_theme_names = []
-          @show_theme_information.each do |theme, value_hash|
-            value_hash.each do |key, value|
-              show_theme_names << [value, theme] if key == 'name'
-            end
+      def load_show_theme_names
+        show_theme_names = []
+        @show_theme_information.each do |theme, value_hash|
+          value_hash.each do |key, value|
+            show_theme_names << [value, theme] if key == 'name'
           end
-          show_theme_names
         end
+        show_theme_names
+      end
 
-        def load_search_themes
-          {
-            'List view' => 'list_view',
-            'Gallery view' => 'gallery_view'
-          }
-        end
+      def load_search_themes
+        {
+          'List view' => 'list_view',
+          'Gallery view' => 'gallery_view'
+        }
+      end
     end
   end
 end
diff --git a/app/controllers/hyrax/admin/workflow_roles_controller.rb b/app/controllers/hyrax/admin/workflow_roles_controller.rb
index 9e388f66e..a82fabcad 100644
--- a/app/controllers/hyrax/admin/workflow_roles_controller.rb
+++ b/app/controllers/hyrax/admin/workflow_roles_controller.rb
@@ -43,9 +43,9 @@ def create
 
       private
 
-        def require_permissions
-          authorize! :read, :admin_dashboard
-        end
+      def require_permissions
+        authorize! :read, :admin_dashboard
+      end
     end
   end
 end
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index a420f82d4..c88b44ac3 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -79,53 +79,53 @@ def after_deliver; end
 
     private
 
-      def build_contact_form
-        @contact_form = model_class.new(contact_form_params)
-      end
+    def build_contact_form
+      @contact_form = model_class.new(contact_form_params)
+    end
 
-      def contact_form_params
-        return {} unless params.key?(:contact_form)
-        params.require(:contact_form).permit(:contact_method, :category, :name, :email, :subject, :message)
-      end
+    def contact_form_params
+      return {} unless params.key?(:contact_form)
+      params.require(:contact_form).permit(:contact_method, :category, :name, :email, :subject, :message)
+    end
 
-      # OVERRIDE: return collections for theming
-      def collections(rows: 6)
-        builder = Hyrax::CollectionSearchBuilder.new(self)
-                                                .rows(rows)
-        response = repository.search(builder)
-        response.documents
-      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-        []
-      end
+    # OVERRIDE: return collections for theming
+    def collections(rows: 6)
+      builder = Hyrax::CollectionSearchBuilder.new(self)
+                                              .rows(rows)
+      response = repository.search(builder)
+      response.documents
+    rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+      []
+    end
 
-      # OVERRIDE: Adding to prepend the theme views into the view_paths
-      def inject_theme_views
-        if home_page_theme && home_page_theme != 'default_home'
-          original_paths = view_paths
-          home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
-          prepend_view_path(home_theme_view_path)
-          yield
-          # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-          # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
-          view_paths=(original_paths)
-          # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-        else
-          yield
-        end
+    # OVERRIDE: Adding to prepend the theme views into the view_paths
+    def inject_theme_views
+      if home_page_theme && home_page_theme != 'default_home'
+        original_paths = view_paths
+        home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
+        prepend_view_path(home_theme_view_path)
+        yield
+        # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+        # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
+        view_paths=(original_paths)
+        # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+      else
+        yield
       end
+    end
 
-      def setup_negative_captcha
-        @captcha = NegativeCaptcha.new(
-          # A secret key entered in environment.rb. 'rake secret' will give you a good one.
-          secret: ENV.fetch('NEGATIVE_CAPTCHA_SECRET', 'default-value-change-me'),
-          spinner: request.remote_ip,
-          # Whatever fields are in your form
-          fields: %i[name email subject message],
-          # If you wish to override the default CSS styles (position: absolute; left: -2000px;)
-          # used to position the fields off-screen
-          css: "display: none",
-          params: params
-        )
-      end
+    def setup_negative_captcha
+      @captcha = NegativeCaptcha.new(
+        # A secret key entered in environment.rb. 'rake secret' will give you a good one.
+        secret: ENV.fetch('NEGATIVE_CAPTCHA_SECRET', 'default-value-change-me'),
+        spinner: request.remote_ip,
+        # Whatever fields are in your form
+        fields: %i[name email subject message],
+        # If you wish to override the default CSS styles (position: absolute; left: -2000px;)
+        # used to position the fields off-screen
+        css: "display: none",
+        params: params
+      )
+    end
   end
 end
diff --git a/app/controllers/hyrax/dashboard/collections_controller.rb b/app/controllers/hyrax/dashboard/collections_controller.rb
index 762252645..67e9de1ec 100644
--- a/app/controllers/hyrax/dashboard/collections_controller.rb
+++ b/app/controllers/hyrax/dashboard/collections_controller.rb
@@ -46,8 +46,8 @@ class CollectionsController < Hyrax::My::CollectionsController
       self.membership_service_class = Collections::CollectionMemberSearchService
 
       load_and_authorize_resource except: [:index, :create],
-        instance_name: :collection,
-        class: Hyrax.config.collection_model
+                                  instance_name: :collection,
+                                  class: Hyrax.config.collection_model
 
       def deny_collection_access(exception)
         if exception.action == :edit
@@ -147,7 +147,7 @@ def update
       def process_branding
         process_banner_input
         process_logo_input
-        # TODO does this still work?
+        # TODO: does this still work?
         process_uploaded_thumbnail(params[:collection][:thumbnail_upload]) if params[:collection][:thumbnail_upload]
       end
 
@@ -215,7 +215,9 @@ def files
         work_with_no_files_thumbnail_path = ActionController::Base.helpers.image_path('work.png')
         response = repository.search(builder.where(params[:q]).query)
         # only return the works that have files, because these will be the only ones with a viable thumbnail
-        result = response.documents.reject { |document| document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) || document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path) }.map do |document|
+        result = response.documents.reject do |document|
+                   document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) || document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path)
+                 end .map do |document|
           { id: document["thumbnail_path_ss"].split('/').last.gsub(/\?.*/, ''), text: document["title_tesim"].first }
         end
         reset_thumbnail_option = {
@@ -276,14 +278,14 @@ def update_valkyrie_collection
         return after_update_errors(form_err_msg(form)) unless form.validate(collection_params)
 
         result = transactions['change_set.update_collection']
-          .with_step_args(
+                 .with_step_args(
             'collection_resource.save_collection_banner' => { update_banner_file_ids: params["banner_files"],
-              banner_unchanged_indicator: params["banner_unchanged"] },
+                                                              banner_unchanged_indicator: params["banner_unchanged"] },
             'collection_resource.save_collection_logo' => { update_logo_file_ids: params["logo_files"],
-              alttext_values: params["alttext"],
-              linkurl_values: params["linkurl"] }
+                                                            alttext_values: params["alttext"],
+                                                            linkurl_values: params["linkurl"] }
           )
-          .call(form)
+                 .call(form)
         @collection = result.value_or { return after_update_errors(result.failure.first) }
 
         process_member_changes
@@ -321,8 +323,8 @@ def collection_type
       def link_parent_collection(parent_id)
         child = collection.respond_to?(:valkyrie_resource) ? collection.valkyrie_resource : collection
         Hyrax::Collections::CollectionMemberService.add_member(collection_id: parent_id,
-          new_member: child,
-          user: current_user)
+                                                               new_member: child,
+                                                               user: current_user)
       end
 
       def uploaded_files(uploaded_file_ids)
@@ -473,9 +475,9 @@ def collection_params
           form_class.model_attributes(params[:collection])
         else
           params.permit(collection: {})[:collection]
-            .merge(params.permit(:collection_type_gid)
+                .merge(params.permit(:collection_type_gid)
               .with_defaults(collection_type_gid: default_collection_type_gid))
-            .merge(member_of_collection_ids: Array(params[:parent_id]))
+                .merge(member_of_collection_ids: Array(params[:parent_id]))
         end
       end
 
@@ -518,15 +520,15 @@ def add_members_to_collection(collection = nil, collection_id: nil)
 
         Hyrax::Collections::CollectionMemberService
           .add_members_by_ids(collection_id: collection_id,
-            new_member_ids: batch,
-            user: current_user)
+                              new_member_ids: batch,
+                              user: current_user)
       end
 
       def remove_members_from_collection
         Hyrax::Collections::CollectionMemberService
           .remove_members_by_ids(collection_id: @collection.id,
-            member_ids: batch,
-            user: current_user)
+                                 member_ids: batch,
+                                 user: current_user)
       end
 
       def move_members_between_collections
@@ -704,10 +706,10 @@ def process_uploaded_thumbnail(uploaded_file)
         dir_name = UploadedCollectionThumbnailPathService.upload_dir(@collection)
         saved_file = Rails.root.join(dir_name, uploaded_file.original_filename)
         # Create directory if it doesn't already exist
-        unless File.directory?(dir_name)
-          FileUtils.mkdir_p(dir_name)
-        else # clear contents
+        if File.directory?(dir_name) # clear contents
           delete_uploaded_thumbnail
+        else
+          FileUtils.mkdir_p(dir_name)
         end
         File.open(saved_file, 'wb') do |file|
           file.write(uploaded_file.read)
@@ -716,16 +718,16 @@ def process_uploaded_thumbnail(uploaded_file)
         # Save two versions of the image: one for homepage feature cards and one for regular thumbnail
         image.resize('500x900').format("jpg").write("#{dir_name}/#{@collection.id}_card.jpg")
         image.resize('150x300').format("jpg").write("#{dir_name}/#{@collection.id}_thumbnail.jpg")
-        File.chmod(0664,"#{dir_name}/#{@collection.id}_thumbnail.jpg")
-        File.chmod(0664,"#{dir_name}/#{@collection.id}_card.jpg")
+        File.chmod(0o664, "#{dir_name}/#{@collection.id}_thumbnail.jpg")
+        File.chmod(0o664, "#{dir_name}/#{@collection.id}_card.jpg")
       end
 
       ## OVERRIDE Hyrax 3.4.0 handle file locations
       def process_file_location(f)
-        if f.file_url =~ /^http/
+        if /^http/.match?(f.file_url)
           f.file.download!(f.file_url)
           f.file_url
-        elsif f.file_url =~ %r{^\/}
+        elsif %r{^\/}.match?(f.file_url)
           f.file.path
         else
           f.file_url
diff --git a/app/controllers/hyrax/featured_collection_lists_controller.rb b/app/controllers/hyrax/featured_collection_lists_controller.rb
index 29a9e3802..d34251735 100644
--- a/app/controllers/hyrax/featured_collection_lists_controller.rb
+++ b/app/controllers/hyrax/featured_collection_lists_controller.rb
@@ -13,8 +13,8 @@ def create
 
     private
 
-      def list_params
-        params.require(:featured_collection_list).permit(featured_collections_attributes: %i[id order])
-      end
+    def list_params
+      params.require(:featured_collection_list).permit(featured_collections_attributes: %i[id order])
+    end
   end
 end
diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
index b9130eb9e..4039a14a3 100644
--- a/app/controllers/hyrax/homepage_controller.rb
+++ b/app/controllers/hyrax/homepage_controller.rb
@@ -91,57 +91,57 @@ def all_collections
     # Added from Blacklight 6.23.0 to change url for facets on home page
     protected
 
-      # Default route to the search action (used e.g. in global partials). Override this method
-      # in a controller or in your ApplicationController to introduce custom logic for choosing
-      # which action the search form should use
-      def search_action_url(options = {})
-        # Rails 4.2 deprecated url helpers accepting string keys for 'controller' or 'action'
-        main_app.search_catalog_path(options)
-      end
+    # Default route to the search action (used e.g. in global partials). Override this method
+    # in a controller or in your ApplicationController to introduce custom logic for choosing
+    # which action the search form should use
+    def search_action_url(options = {})
+      # Rails 4.2 deprecated url helpers accepting string keys for 'controller' or 'action'
+      main_app.search_catalog_path(options)
+    end
 
     private
 
-      # Return 6 collections
-      def collections(rows: 6)
-        builder = Hyrax::CollectionSearchBuilder.new(self)
-                                                .rows(rows)
-        response = repository.search(builder)
-        # adding .sort_by to return collections in alphabetical order by title on the homepage
-        response.documents.sort_by(&:title)
-      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-        []
-      end
+    # Return 6 collections
+    def collections(rows: 6)
+      builder = Hyrax::CollectionSearchBuilder.new(self)
+                                              .rows(rows)
+      response = repository.search(builder)
+      # adding .sort_by to return collections in alphabetical order by title on the homepage
+      response.documents.sort_by(&:title)
+    rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+      []
+    end
 
-      def recent
-        # grab any recent documents
-        (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 6)
-      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-        @recent_documents = []
-      end
+    def recent
+      # grab any recent documents
+      (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 6)
+    rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+      @recent_documents = []
+    end
 
-      def ir_counts
-        @ir_counts = get_facet_field_response('resource_type_sim', {}, "f.resource_type_sim.facet.limit" => "-1")
-      end
+    def ir_counts
+      @ir_counts = get_facet_field_response('resource_type_sim', {}, "f.resource_type_sim.facet.limit" => "-1")
+    end
 
-      # COPIED from Hyrax::HomepageController
-      def sort_field
-        "date_uploaded_dtsi desc"
-      end
+    # COPIED from Hyrax::HomepageController
+    def sort_field
+      "date_uploaded_dtsi desc"
+    end
 
-      # Add this method to prepend the theme views into the view_paths
-      def inject_theme_views
-        if home_page_theme && home_page_theme != 'default_home'
-          original_paths = view_paths
-          home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
-          prepend_view_path(home_theme_view_path)
-          yield
-          # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-          # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
-          view_paths=(original_paths)
-          # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-        else
-          yield
-        end
+    # Add this method to prepend the theme views into the view_paths
+    def inject_theme_views
+      if home_page_theme && home_page_theme != 'default_home'
+        original_paths = view_paths
+        home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
+        prepend_view_path(home_theme_view_path)
+        yield
+        # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+        # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
+        view_paths=(original_paths)
+        # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+      else
+        yield
       end
+    end
   end
 end
diff --git a/app/controllers/hyrax/pages_controller.rb b/app/controllers/hyrax/pages_controller.rb
index cdfd8d0a7..2c07c8e99 100644
--- a/app/controllers/hyrax/pages_controller.rb
+++ b/app/controllers/hyrax/pages_controller.rb
@@ -68,49 +68,49 @@ def update
 
     private
 
-      def permitted_params
-        params.require(:content_block).permit(:about,
-                                              :agreement,
-                                              :help,
-                                              :terms)
-      end
+    def permitted_params
+      params.require(:content_block).permit(:about,
+                                            :agreement,
+                                            :help,
+                                            :terms)
+    end
 
-      # When a request comes to the controller, it will be for one and
-      # only one of the content blocks. Params always looks like:
-      #   {'about_page' => 'Here is an awesome about page!'}
-      # So reach into permitted params and pull out the first value.
-      def update_value_from_params
-        permitted_params.values.first
-      end
+    # When a request comes to the controller, it will be for one and
+    # only one of the content blocks. Params always looks like:
+    #   {'about_page' => 'Here is an awesome about page!'}
+    # So reach into permitted params and pull out the first value.
+    def update_value_from_params
+      permitted_params.values.first
+    end
 
-      def pages_layout
-        action_name == 'show' ? 'homepage' : 'hyrax/dashboard'
-      end
+    def pages_layout
+      action_name == 'show' ? 'homepage' : 'hyrax/dashboard'
+    end
 
-      # OVERRIDE: return collections for theming
-      def collections(rows: 6)
-        builder = Hyrax::CollectionSearchBuilder.new(self)
-                                                .rows(rows)
-        response = repository.search(builder)
-        response.documents
-      rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
-        []
-      end
+    # OVERRIDE: return collections for theming
+    def collections(rows: 6)
+      builder = Hyrax::CollectionSearchBuilder.new(self)
+                                              .rows(rows)
+      response = repository.search(builder)
+      response.documents
+    rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
+      []
+    end
 
-      # OVERRIDE: Adding to prepend the theme views into the view_paths
-      def inject_theme_views
-        if home_page_theme && home_page_theme != 'default_home'
-          original_paths = view_paths
-          home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
-          prepend_view_path(home_theme_view_path)
-          yield
-          # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-          # Do NOT change this method. This is an override of the view_paths= method and not a variable assignment.
-          view_paths=(original_paths)
-          # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-        else
-          yield
-        end
+    # OVERRIDE: Adding to prepend the theme views into the view_paths
+    def inject_theme_views
+      if home_page_theme && home_page_theme != 'default_home'
+        original_paths = view_paths
+        home_theme_view_path = Rails.root.join('app', 'views', "themes", home_page_theme.to_s)
+        prepend_view_path(home_theme_view_path)
+        yield
+        # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+        # Do NOT change this method. This is an override of the view_paths= method and not a variable assignment.
+        view_paths=(original_paths)
+        # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+      else
+        yield
       end
+    end
   end
 end
diff --git a/app/controllers/identity_providers_controller.rb b/app/controllers/identity_providers_controller.rb
index 28774a0bc..06cedfb20 100644
--- a/app/controllers/identity_providers_controller.rb
+++ b/app/controllers/identity_providers_controller.rb
@@ -72,27 +72,27 @@ def add_breadcrumbs
 
   private
 
-    # Use callbacks to share common setup or constraints between actions.
-    def set_identity_provider
-      @identity_provider = IdentityProvider.find(params[:id])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_identity_provider
+    @identity_provider = IdentityProvider.find(params[:id])
+  end
 
-    def ensure_admin!
-      authorize! :read, :admin_dashboard
-    end
+  def ensure_admin!
+    authorize! :read, :admin_dashboard
+  end
 
-    # Only allow a list of trusted parameters through.
-    def identity_provider_params
-      return @identity_provider_params if @identity_provider_params
-      @identity_provider_params = params.require(:identity_provider).permit(
-        :name,
-        :provider,
-        :options,
-        :logo_image,
-        :logo_image_text
-      )
-      @identity_provider_params['options'].presence &&
-        @identity_provider_params['options'] = JSON.parse(@identity_provider_params['options'])
-      @identity_provider_params
-    end
+  # Only allow a list of trusted parameters through.
+  def identity_provider_params
+    return @identity_provider_params if @identity_provider_params
+    @identity_provider_params = params.require(:identity_provider).permit(
+      :name,
+      :provider,
+      :options,
+      :logo_image,
+      :logo_image_text
+    )
+    @identity_provider_params['options'].presence &&
+      @identity_provider_params['options'] = JSON.parse(@identity_provider_params['options'])
+    @identity_provider_params
+  end
 end
diff --git a/app/controllers/labels_controller.rb b/app/controllers/labels_controller.rb
index 7252920bf..df13a1fba 100644
--- a/app/controllers/labels_controller.rb
+++ b/app/controllers/labels_controller.rb
@@ -23,10 +23,10 @@ def update
 
   private
 
-    # Never trust parameters from the scary internet, only allow the permitted parameters through.
-    def site_params
-      params.require(:site).permit(:application_name,
-                                   :institution_name,
-                                   :institution_name_full)
-    end
+  # Never trust parameters from the scary internet, only allow the permitted parameters through.
+  def site_params
+    params.require(:site).permit(:application_name,
+                                 :institution_name,
+                                 :institution_name_full)
+  end
 end
diff --git a/app/controllers/proprietor/accounts_controller.rb b/app/controllers/proprietor/accounts_controller.rb
index d21986cf1..9f3dd8f86 100644
--- a/app/controllers/proprietor/accounts_controller.rb
+++ b/app/controllers/proprietor/accounts_controller.rb
@@ -87,41 +87,41 @@ def destroy
 
     private
 
-      def ensure_admin!
-        authorize! :read, :admin_dashboard
-      end
+    def ensure_admin!
+      authorize! :read, :admin_dashboard
+    end
 
-      # Never trust parameters from the scary internet, only allow the permitted parameters through.
-      def edit_account_params
-        params.require(:account).permit(:name,
-                                        :cname,
-                                        :title,
-                                        :is_public,
-                                        :search_only,
-                                        *@account.live_settings.keys,
-                                        admin_emails: [],
-                                        full_account_cross_searches_attributes: [:id,
-                                                                                 :_destroy,
-                                                                                 :full_account_id,
-                                                                                 full_account_attributes: [:id]],
-                                        solr_endpoint_attributes: %i[id url],
-                                        fcrepo_endpoint_attributes: %i[id url base_path],
-                                        data_cite_endpoint_attributes: %i[mode prefix username password])
-      end
+    # Never trust parameters from the scary internet, only allow the permitted parameters through.
+    def edit_account_params
+      params.require(:account).permit(:name,
+                                      :cname,
+                                      :title,
+                                      :is_public,
+                                      :search_only,
+                                      *@account.live_settings.keys,
+                                      admin_emails: [],
+                                      full_account_cross_searches_attributes: [:id,
+                                                                               :_destroy,
+                                                                               :full_account_id,
+                                                                               full_account_attributes: [:id]],
+                                      solr_endpoint_attributes: %i[id url],
+                                      fcrepo_endpoint_attributes: %i[id url base_path],
+                                      data_cite_endpoint_attributes: %i[mode prefix username password])
+    end
 
-      def account_params
-        params.require(:account).permit(
-          :name,
-          :search_only,
-          admin_emails: [],
-          full_account_cross_searches_attributes: [:id, :_destroy, :full_account_id, full_account_attributes: [:id]]
-        )
-      end
+    def account_params
+      params.require(:account).permit(
+        :name,
+        :search_only,
+        admin_emails: [],
+        full_account_cross_searches_attributes: [:id, :_destroy, :full_account_id, full_account_attributes: [:id]]
+      )
+    end
 
-      def deleted_or_new(hash)
-        hash.detect do |_k, v|
-          ActiveModel::Type::Boolean.new.cast(v["_destroy"]) == true || v["id"].blank?
-        end
+    def deleted_or_new(hash)
+      hash.detect do |_k, v|
+        ActiveModel::Type::Boolean.new.cast(v["_destroy"]) == true || v["id"].blank?
       end
+    end
   end
 end
diff --git a/app/controllers/proprietor/users_controller.rb b/app/controllers/proprietor/users_controller.rb
index 1aa371c38..c8e160446 100644
--- a/app/controllers/proprietor/users_controller.rb
+++ b/app/controllers/proprietor/users_controller.rb
@@ -83,44 +83,44 @@ def destroy
 
     private
 
-      def ensure_admin!
-        authorize! :read, :admin_dashboard
-      end
+    def ensure_admin!
+      authorize! :read, :admin_dashboard
+    end
 
-      def user_params
-        # remove blank passwords
-        params[:user].delete(:password) if params[:user] && params[:user][:password].blank?
+    def user_params
+      # remove blank passwords
+      params[:user].delete(:password) if params[:user] && params[:user][:password].blank?
 
-        params.require(:user).permit(:email,
-                                     :password,
-                                     :is_superadmin,
-                                     :facebook_handle,
-                                     :twitter_handle,
-                                     :googleplus_handle,
-                                     :display_name,
-                                     :address,
-                                     :department,
-                                     :title,
-                                     :office,
-                                     :chat_id,
-                                     :website,
-                                     :affiliation,
-                                     :telephone,
-                                     :avatar,
-                                     :group_list,
-                                     :linkedin_handle,
-                                     :orcid,
-                                     :arkivo_token,
-                                     :arkivo_subscription,
-                                     :zotero_token,
-                                     :zotero_userid,
-                                     :preferred_locale,
-                                     role_ids: [])
-      end
+      params.require(:user).permit(:email,
+                                   :password,
+                                   :is_superadmin,
+                                   :facebook_handle,
+                                   :twitter_handle,
+                                   :googleplus_handle,
+                                   :display_name,
+                                   :address,
+                                   :department,
+                                   :title,
+                                   :office,
+                                   :chat_id,
+                                   :website,
+                                   :affiliation,
+                                   :telephone,
+                                   :avatar,
+                                   :group_list,
+                                   :linkedin_handle,
+                                   :orcid,
+                                   :arkivo_token,
+                                   :arkivo_subscription,
+                                   :zotero_token,
+                                   :zotero_userid,
+                                   :preferred_locale,
+                                   role_ids: [])
+    end
 
-      def find_user
-        @user ||= ::User.from_url_component(params[:id])
-        raise ActiveRecord::RecordNotFound unless @user
-      end
+    def find_user
+      @user ||= ::User.from_url_component(params[:id])
+      raise ActiveRecord::RecordNotFound unless @user
+    end
   end
 end
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index f3c2a64cd..473a7e95d 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -28,7 +28,7 @@ def update
 
   protected
 
-    def user_params
-      params.require(:user).permit(site_roles: [])
-    end
+  def user_params
+    params.require(:user).permit(site_roles: [])
+  end
 end
diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb
index 166f6390f..5dc8efe6b 100644
--- a/app/controllers/sites_controller.rb
+++ b/app/controllers/sites_controller.rb
@@ -19,36 +19,36 @@ def update
 
   private
 
-    def set_site
-      @site ||= Site.instance
-    end
+  def set_site
+    @site ||= Site.instance
+  end
 
-    def update_params
-      params.permit(:remove_banner_image,
-                    :remove_favicon,
-                    :remove_logo_image,
-                    :remove_directory_image,
-                    :remove_default_collection_image,
-                    :remove_default_work_image)
-    end
+  def update_params
+    params.permit(:remove_banner_image,
+                  :remove_favicon,
+                  :remove_logo_image,
+                  :remove_directory_image,
+                  :remove_default_collection_image,
+                  :remove_default_work_image)
+  end
 
-    def site_theme_params
-      params.require(:site).permit(:home_theme, :search_theme, :show_theme)
-    end
+  def site_theme_params
+    params.require(:site).permit(:home_theme, :search_theme, :show_theme)
+  end
 
-    REMOVE_TEXT_MAPS = {
-      "remove_logo_image"               => "logo_image_text",
-      "remove_banner_image"             => "banner_image_text",
-      "remove_directory_image"          => "directory_image_text",
-      "remove_default_collection_image" => "default_collection_image_text",
-      "remove_default_work_image"       => "default_work_image_text"
-    }.freeze
-
-    def remove_appearance_text(update_params)
-      image_text_keys = update_params.keys
-      image_text_keys.each do |image_text_key|
-        block = ContentBlock.find_by(name: REMOVE_TEXT_MAPS[image_text_key])
-        block.delete if block&.value.present?
-      end
+  REMOVE_TEXT_MAPS = {
+    "remove_logo_image" => "logo_image_text",
+    "remove_banner_image" => "banner_image_text",
+    "remove_directory_image" => "directory_image_text",
+    "remove_default_collection_image" => "default_collection_image_text",
+    "remove_default_work_image" => "default_work_image_text"
+  }.freeze
+
+  def remove_appearance_text(update_params)
+    image_text_keys = update_params.keys
+    image_text_keys.each do |image_text_key|
+      block = ContentBlock.find_by(name: REMOVE_TEXT_MAPS[image_text_key])
+      block.delete if block&.value.present?
     end
+  end
 end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index f5cff3c0f..0509c6e40 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -30,7 +30,7 @@ def callback
     alias saml callback
 
     def passthru
-      render status: 404, plain: 'Not found. Authentication passthru.'
+      render status: :not_found, plain: 'Not found. Authentication passthru.'
     end
 
     # def failure
diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index 56000bd98..49428d012 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -24,7 +24,7 @@ class Appearance
         #   @return [Hash<String, String>] there should be at least the key "body_font" and
         #           "headline_font"
         class_attribute :default_fonts, default: {
-          'body_font'     => 'Helvetica Neue, Helvetica, Arial, sans-serif;',
+          'body_font' => 'Helvetica Neue, Helvetica, Arial, sans-serif;',
           'headline_font' => 'Helvetica Neue, Helvetica, Arial, sans-serif;'
         }
 
@@ -33,22 +33,22 @@ class Appearance
         #   @return [Hash<String, String>]
         class_attribute :default_colors, default: {
           'header_and_footer_background_color' => '#3c3c3c',
-          'header_and_footer_text_color'       => '#dcdcdc',
-          'navbar_background_color'            => '#000000',
+          'header_and_footer_text_color' => '#dcdcdc',
+          'navbar_background_color' => '#000000',
           'navbar_link_background_hover_color' => '#ffffff',
-          'navbar_link_text_color'             => '#eeeeee',
-          'navbar_link_text_hover_color'       => '#eeeeee',
-          'link_color'                         => '#2e74b2',
-          'link_hover_color'                   => '#215480',
-          'footer_link_color'                  => '#ffebcd',
-          'footer_link_hover_color'            => '#ffffff',
-          'primary_button_hover_color'         => '#286090',
-          'default_button_background_color'    => '#ffffff',
-          'default_button_border_color'        => '#cccccc',
-          'default_button_text_color'          => '#333333',
+          'navbar_link_text_color' => '#eeeeee',
+          'navbar_link_text_hover_color' => '#eeeeee',
+          'link_color' => '#2e74b2',
+          'link_hover_color' => '#215480',
+          'footer_link_color' => '#ffebcd',
+          'footer_link_hover_color' => '#ffffff',
+          'primary_button_hover_color' => '#286090',
+          'default_button_background_color' => '#ffffff',
+          'default_button_border_color' => '#cccccc',
+          'default_button_text_color' => '#333333',
           # 'active_tabs_background_color'     => '#337ab7',
-          'facet_panel_background_color'       => '#f5f5f5',
-          'facet_panel_text_color'             => '#333333'
+          'facet_panel_background_color' => '#f5f5f5',
+          'facet_panel_text_color' => '#333333'
         }
         # @!endgroup Class Attributes
 
@@ -422,43 +422,43 @@ def font_headline_family
 
         private
 
-          def darken_color(hex_color, adjustment = 0.2)
-            amount = 1.0 - adjustment
-            hex_color = hex_color.delete('#')
-            rgb = hex_color.scan(/../).map { |color| (color.to_i(16) * amount).round }
-            rgb[0] = (rgb[0].to_i * amount).round
-            rgb[1] = (rgb[1].to_i * amount).round
-            rgb[2] = (rgb[2].to_i * amount).round
-            format("#%02x%02x%02x", *rgb)
-          end
+        def darken_color(hex_color, adjustment = 0.2)
+          amount = 1.0 - adjustment
+          hex_color = hex_color.delete('#')
+          rgb = hex_color.scan(/../).map { |color| (color.to_i(16) * amount).round }
+          rgb[0] = (rgb[0].to_i * amount).round
+          rgb[1] = (rgb[1].to_i * amount).round
+          rgb[2] = (rgb[2].to_i * amount).round
+          format("#%02x%02x%02x", *rgb)
+        end
 
-          def convert_to_rgba(hex_color, alpha = 0.5)
-            hex_color = hex_color.delete('#')
-            rgb = hex_color.scan(/../).map(&:hex)
-            "rgba(#{rgb[0]}, #{rgb[1]}, #{rgb[2]}, #{alpha})"
-          end
+        def convert_to_rgba(hex_color, alpha = 0.5)
+          hex_color = hex_color.delete('#')
+          rgb = hex_color.scan(/../).map(&:hex)
+          "rgba(#{rgb[0]}, #{rgb[1]}, #{rgb[2]}, #{alpha})"
+        end
 
-          def default_values
-            @default_values ||= default_fonts.merge(default_colors)
-          end
+        def default_values
+          @default_values ||= default_fonts.merge(default_colors)
+        end
 
-          def block_for(name, dynamic_default = nil)
-            ContentBlock.block_for(name: name, fallback_value: default_values[name] || dynamic_default)
-          end
+        def block_for(name, dynamic_default = nil)
+          ContentBlock.block_for(name: name, fallback_value: default_values[name] || dynamic_default)
+        end
 
-          # Persist a key/value tuple as a ContentBlock
-          # @param [Symbol] name the identifier for the ContentBlock
-          # @param [String] value the value to set
-          def update_block(name, value)
-            ContentBlock.update_block(name: name, value: value)
-          end
+        # Persist a key/value tuple as a ContentBlock
+        # @param [Symbol] name the identifier for the ContentBlock
+        # @param [String] value the value to set
+        def update_block(name, value)
+          ContentBlock.update_block(name: name, value: value)
+        end
 
-          def format_font_names(font_style)
-            # the fonts come with `Font Name:font-weight` - this removes the weight
-            parts = font_style.split(':')
-            # Google fonts use `+` in place of spaces. This fixes it for CSS.
-            parts[0].tr('+', ' ').html_safe
-          end
+        def format_font_names(font_style)
+          # the fonts come with `Font Name:font-weight` - this removes the weight
+          parts = font_style.split(':')
+          # Google fonts use `+` in place of spaces. This fixes it for CSS.
+          parts[0].tr('+', ' ').html_safe
+        end
       end
     end
   end
diff --git a/app/helpers/shared_search_helper.rb b/app/helpers/shared_search_helper.rb
index ef419f6cb..bc96c3cf6 100644
--- a/app/helpers/shared_search_helper.rb
+++ b/app/helpers/shared_search_helper.rb
@@ -22,15 +22,15 @@ def generate_work_url(model, request)
 
   private
 
-    def get_url(id:, request:, account_cname:, has_model:)
-      new_url = "#{request[:request_protocol]}#{account_cname || request[:request_host]}"
-      new_url += ":#{request[:request_port]}" if Rails.env.development? || Rails.env.test?
-      new_url += case has_model
-                 when "collections"
-                   "/#{has_model}/#{id}"
-                 else
-                   "/concern/#{has_model}/#{id}"
-                 end
-      new_url
-    end
+  def get_url(id:, request:, account_cname:, has_model:)
+    new_url = "#{request[:request_protocol]}#{account_cname || request[:request_host]}"
+    new_url += ":#{request[:request_port]}" if Rails.env.development? || Rails.env.test?
+    new_url += case has_model
+               when "collections"
+                 "/#{has_model}/#{id}"
+               else
+                 "/concern/#{has_model}/#{id}"
+               end
+    new_url
+  end
 end
diff --git a/app/jobs/cleanup_account_job.rb b/app/jobs/cleanup_account_job.rb
index 504436f0b..6dcc500e0 100644
--- a/app/jobs/cleanup_account_job.rb
+++ b/app/jobs/cleanup_account_job.rb
@@ -13,21 +13,21 @@ def perform(account)
 
   private
 
-    def cleanup_fedora(account)
-      account.fcrepo_endpoint.remove!
-    end
+  def cleanup_fedora(account)
+    account.fcrepo_endpoint.remove!
+  end
 
-    def cleanup_redis(account)
-      account.redis_endpoint.remove!
-    end
+  def cleanup_redis(account)
+    account.redis_endpoint.remove!
+  end
 
-    def cleanup_solr(account)
-      account.solr_endpoint.remove!
-    end
+  def cleanup_solr(account)
+    account.solr_endpoint.remove!
+  end
 
-    def cleanup_database(account)
-      Apartment::Tenant.drop(account.tenant)
-    rescue StandardError
-      nil # ignore if account.tenant missing
-    end
+  def cleanup_database(account)
+    Apartment::Tenant.drop(account.tenant)
+  rescue StandardError
+    nil # ignore if account.tenant missing
+  end
 end
diff --git a/app/jobs/create_solr_collection_job.rb b/app/jobs/create_solr_collection_job.rb
index 6d56486eb..536203795 100644
--- a/app/jobs/create_solr_collection_job.rb
+++ b/app/jobs/create_solr_collection_job.rb
@@ -50,84 +50,84 @@ def to_h
 
     private
 
-      def transform_entry(k, v)
-        case v
-        when Hash
-          v.map do |k1, v1|
-            ["#{transform_key(k)}.#{transform_key(k1)}", v1]
-          end
-        else
-          [transform_key(k), v]
+    def transform_entry(k, v)
+      case v
+      when Hash
+        v.map do |k1, v1|
+          ["#{transform_key(k)}.#{transform_key(k1)}", v1]
         end
+      else
+        [transform_key(k), v]
       end
+    end
 
-      def transform_key(k)
-        k.to_s.camelize(:lower)
-      end
+    def transform_key(k)
+      k.to_s.camelize(:lower)
+    end
   end
 
   private
 
-    def client
-      Blacklight.default_index.connection
-    end
+  def client
+    Blacklight.default_index.connection
+  end
 
-    def collection_options
-      CollectionOptions.new(account ? account.solr_collection_options : Account.solr_collection_options).to_h
-    end
+  def collection_options
+    CollectionOptions.new(account ? account.solr_collection_options : Account.solr_collection_options).to_h
+  end
 
-    def collection_exists?(name)
-      response = client.get '/solr/admin/collections', params: { action: 'LIST' }
-      collections = response['collections']
+  def collection_exists?(name)
+    response = client.get '/solr/admin/collections', params: { action: 'LIST' }
+    collections = response['collections']
 
-      collections.include? name
-    end
+    collections.include? name
+  end
 
-    def collection_url(name)
-      uri = URI(solr_url) + name
+  def collection_url(name)
+    uri = URI(solr_url) + name
 
-      uri.to_s
-    end
+    uri.to_s
+  end
 
-    def solr_url
-      @solr_url ||= ENV['SOLR_URL'] || solr_url_parts
-      @solr_url = @solr_url.ends_with?('/') ? @solr_url : "#{@solr_url}/"
-    end
+  def solr_url
+    @solr_url ||= ENV['SOLR_URL'] || solr_url_parts
+    @solr_url = @solr_url.ends_with?('/') ? @solr_url : "#{@solr_url}/"
+  end
 
-    def solr_url_parts
-      "http://#{ENV.fetch('SOLR_ADMIN_USER', 'admin')}:#{ENV.fetch('SOLR_ADMIN_PASSWORD', 'admin')}" \
-        "@#{ENV.fetch('SOLR_HOST', 'solr')}:#{ENV.fetch('SOLR_PORT', '8983')}/solr/"
-    end
+  def solr_url_parts
+    "http://#{ENV.fetch('SOLR_ADMIN_USER', 'admin')}:#{ENV.fetch('SOLR_ADMIN_PASSWORD', 'admin')}" \
+      "@#{ENV.fetch('SOLR_HOST', 'solr')}:#{ENV.fetch('SOLR_PORT', '8983')}/solr/"
+  end
 
-    def add_solr_endpoint_to_account(account, name)
-      account.create_solr_endpoint(url: collection_url(name), collection: name)
-    end
+  def add_solr_endpoint_to_account(account, name)
+    account.create_solr_endpoint(url: collection_url(name), collection: name)
+  end
 
-    def perform_for_normal_tenant(account, name)
-      unless collection_exists? name
-        client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATE',
-                                                                               name: name)
-      end
-      add_solr_endpoint_to_account(account, name)
+  def perform_for_normal_tenant(account, name)
+    unless collection_exists? name
+      client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATE',
+                                                                             name: name)
     end
+    add_solr_endpoint_to_account(account, name)
+  end
 
-    def perform_for_cross_search_tenant(account, name)
-      return if account.full_accounts.blank?
-      if account.saved_changes&.[]('created_at').present? || account.solr_endpoint.is_a?(NilSolrEndpoint)
-        create_shared_search_collection(account.full_accounts.map(&:tenant).uniq, name)
-        account.create_solr_endpoint(url: collection_url(name), collection: name)
-        account.save
-      else
-        solr_options = account.solr_endpoint.connection_options.dup
-        RemoveSolrCollectionJob.perform_now(name, solr_options, 'cross_search_tenant')
-        create_shared_search_collection(account.full_accounts.map(&:tenant).uniq, name)
-        account.solr_endpoint.update(url: collection_url(name), collection: name)
-      end
+  def perform_for_cross_search_tenant(account, name)
+    return if account.full_accounts.blank?
+    if account.saved_changes&.[]('created_at').present? || account.solr_endpoint.is_a?(NilSolrEndpoint)
+      create_shared_search_collection(account.full_accounts.map(&:tenant).uniq, name)
+      account.create_solr_endpoint(url: collection_url(name), collection: name)
+      account.save
+    else
+      solr_options = account.solr_endpoint.connection_options.dup
+      RemoveSolrCollectionJob.perform_now(name, solr_options, 'cross_search_tenant')
+      create_shared_search_collection(account.full_accounts.map(&:tenant).uniq, name)
+      account.solr_endpoint.update(url: collection_url(name), collection: name)
     end
+  end
 
-    def create_shared_search_collection(tenant_list, name)
-      return true if collection_exists?(name)
-      client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATEALIAS',
-                                                                             name: name, collections: tenant_list)
-    end
+  def create_shared_search_collection(tenant_list, name)
+    return true if collection_exists?(name)
+    client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATEALIAS',
+                                                                           name: name, collections: tenant_list)
+  end
 end
diff --git a/app/jobs/delete_old_guests_job.rb b/app/jobs/delete_old_guests_job.rb
index 5ca5e0a40..8af24d850 100644
--- a/app/jobs/delete_old_guests_job.rb
+++ b/app/jobs/delete_old_guests_job.rb
@@ -12,7 +12,7 @@ def perform
 
   private
 
-    def reenqueue
-      DeleteOldGuestsJob.set(wait_until: Date.tomorrow.midnight).perform_later
-    end
+  def reenqueue
+    DeleteOldGuestsJob.set(wait_until: Date.tomorrow.midnight).perform_later
+  end
 end
diff --git a/app/jobs/embargo_auto_expiry_job.rb b/app/jobs/embargo_auto_expiry_job.rb
index 1b7106eb4..7fe83c7d1 100644
--- a/app/jobs/embargo_auto_expiry_job.rb
+++ b/app/jobs/embargo_auto_expiry_job.rb
@@ -15,7 +15,7 @@ def perform(account)
 
   private
 
-    def reenqueue(account)
-      EmbargoAutoExpiryJob.set(wait_until: Date.tomorrow.midnight).perform_later(account)
-    end
+  def reenqueue(account)
+    EmbargoAutoExpiryJob.set(wait_until: Date.tomorrow.midnight).perform_later(account)
+  end
 end
diff --git a/app/jobs/import_work_from_purl_job.rb b/app/jobs/import_work_from_purl_job.rb
index c7dc351aa..9e410926f 100644
--- a/app/jobs/import_work_from_purl_job.rb
+++ b/app/jobs/import_work_from_purl_job.rb
@@ -35,63 +35,63 @@ def perform(user, druid, log)
 
   private
 
-    def process_attributes(attributes)
-      # We're pruning off :form_of_work, :record_origin, :created_attributes, :identifiers
-      attributes = attributes.slice(*attributes_to_keep)
-      # rename :location to :based_near
-      attributes[:based_near] = attributes.delete(:location)
+  def process_attributes(attributes)
+    # We're pruning off :form_of_work, :record_origin, :created_attributes, :identifiers
+    attributes = attributes.slice(*attributes_to_keep)
+    # rename :location to :based_near
+    attributes[:based_near] = attributes.delete(:location)
 
-      # rename :rights to :license
-      attributes[:license] = attributes.delete(:rights)
+    # rename :rights to :license
+    attributes[:license] = attributes.delete(:rights)
 
-      attributes[:collection][:collection_type] ||= Hyrax::CollectionType.find_or_create_default_collection_type
+    attributes[:collection][:collection_type] ||= Hyrax::CollectionType.find_or_create_default_collection_type
 
-      process_collection(attributes)
-      filenames = attributes.delete(:files)
-      attributes[:remote_files] = filenames.map do |name|
-        { url: "https://stacks.stanford.edu/file/druid:#{attributes[:id]}/#{name}",
-          file_name: name }
-      end
-
-      attributes
+    process_collection(attributes)
+    filenames = attributes.delete(:files)
+    attributes[:remote_files] = filenames.map do |name|
+      { url: "https://stacks.stanford.edu/file/druid:#{attributes[:id]}/#{name}",
+        file_name: name }
     end
 
-    class_attribute :attributes_to_keep
-    self.attributes_to_keep = %i[title
-                                 description
-                                 subject
-                                 language
-                                 resource_type
-                                 location
-                                 rights
-                                 visibility
-                                 id
-                                 collection
-                                 files
-                                 collection_type]
+    attributes
+  end
 
-    def process_collection(attributes)
-      # rename :collection to :member_of_collection_attributes
-      collection = attributes.delete(:collection)
+  class_attribute :attributes_to_keep
+  self.attributes_to_keep = %i[title
+                               description
+                               subject
+                               language
+                               resource_type
+                               location
+                               rights
+                               visibility
+                               id
+                               collection
+                               files
+                               collection_type]
 
-      # Workaround for ActiveFedora #1186
-      id = collection[:id]
-      begin
-        retries ||= 0
-        Collection.create!(collection) unless Collection.exists?(id)
-      rescue Ldp::Conflict => e
-        ## Another process has likely beat us to the punch. Wait a bit and try again.
-        sleep(3)
-        retry if (retries += 1) < 3
-        raise e
-      end
-      attributes[:member_of_collection_attributes] = [{ id: id }]
-    end
+  def process_collection(attributes)
+    # rename :collection to :member_of_collection_attributes
+    collection = attributes.delete(:collection)
 
-    # Override this method if you have a different rubric for choosing the model
-    # @param [Hash] attributes
-    # @return String the model to create
-    def model_to_create(_attributes)
-      GenericWork.model_name.name
+    # Workaround for ActiveFedora #1186
+    id = collection[:id]
+    begin
+      retries ||= 0
+      Collection.create!(collection) unless Collection.exists?(id)
+    rescue Ldp::Conflict => e
+      ## Another process has likely beat us to the punch. Wait a bit and try again.
+      sleep(3)
+      retry if (retries += 1) < 3
+      raise e
     end
+    attributes[:member_of_collection_attributes] = [{ id: id }]
+  end
+
+  # Override this method if you have a different rubric for choosing the model
+  # @param [Hash] attributes
+  # @return String the model to create
+  def model_to_create(_attributes)
+    GenericWork.model_name.name
+  end
 end
diff --git a/app/jobs/lease_auto_expiry_job.rb b/app/jobs/lease_auto_expiry_job.rb
index 16f6bcf9c..fe21273ed 100644
--- a/app/jobs/lease_auto_expiry_job.rb
+++ b/app/jobs/lease_auto_expiry_job.rb
@@ -15,7 +15,7 @@ def perform(account)
 
   private
 
-    def reenqueue(account)
-      LeaseAutoExpiryJob.set(wait_until: Date.tomorrow.midnight).perform_later(account)
-    end
+  def reenqueue(account)
+    LeaseAutoExpiryJob.set(wait_until: Date.tomorrow.midnight).perform_later(account)
+  end
 end
diff --git a/app/jobs/remove_solr_collection_job.rb b/app/jobs/remove_solr_collection_job.rb
index a93eebeb9..2efbf2843 100644
--- a/app/jobs/remove_solr_collection_job.rb
+++ b/app/jobs/remove_solr_collection_job.rb
@@ -15,8 +15,8 @@ def perform(collection, connection_options, tenant_type = 'normal')
 
   private
 
-    def solr_client(connection_options)
-      # We remove the adapter, otherwise RSolr 2 will try to use it as a Faraday middleware
-      RSolr.connect(connection_options.without('adapter'))
-    end
+  def solr_client(connection_options)
+    # We remove the adapter, otherwise RSolr 2 will try to use it as a Faraday middleware
+    RSolr.connect(connection_options.without('adapter'))
+  end
 end
diff --git a/app/mailers/hyku_mailer.rb b/app/mailers/hyku_mailer.rb
index 924a0834d..9539011d7 100644
--- a/app/mailers/hyku_mailer.rb
+++ b/app/mailers/hyku_mailer.rb
@@ -8,7 +8,7 @@ def default_url_options
 
   private
 
-    def host_for_tenant
-      Account.find_by(tenant: Apartment::Tenant.current)&.cname || Account.admin_host
-    end
+  def host_for_tenant
+    Account.find_by(tenant: Apartment::Tenant.current)&.cname || Account.admin_host
+  end
 end
diff --git a/app/models/concerns/account_cname.rb b/app/models/concerns/account_cname.rb
index 0306a1110..8c13d5630 100644
--- a/app/models/concerns/account_cname.rb
+++ b/app/models/concerns/account_cname.rb
@@ -12,7 +12,7 @@ module AccountCname
     # @raise [ArgumentError] if piece contains a trailing dot
     def default_cname(piece)
       return unless piece
-      raise ArgumentError, "param '#{piece}' must not contain trailing dots" if piece =~ /\.\Z/
+      raise ArgumentError, "param '#{piece}' must not contain trailing dots" if /\.\Z/.match?(piece)
       # rubocop:disable Style/FormatStringToken
       default_host = ENV.fetch('HYKU_DEFAULT_HOST', "%{tenant}.#{admin_host}")
       # rubocop:enable Style/FormatStringToken
@@ -51,7 +51,7 @@ def cname=(value)
 
   private
 
-    def default_cname(piece = name)
-      self.class.default_cname(piece)
-    end
+  def default_cname(piece = name)
+    self.class.default_cname(piece)
+  end
 end
diff --git a/app/models/concerns/account_settings.rb b/app/models/concerns/account_settings.rb
index 5cd2458c0..a0fa4eaba 100644
--- a/app/models/concerns/account_settings.rb
+++ b/app/models/concerns/account_settings.rb
@@ -112,80 +112,80 @@ def live_settings
 
   private
 
-    def set_type(value, to_type)
-      case to_type
-      when 'array'
-        value.is_a?(String) ? value.split(',') : Array.wrap(value)
-      when 'boolean'
-        ActiveModel::Type::Boolean.new.cast(value)
-      when 'hash'
-        value.is_a?(String) ? JSON.parse(value) : value
-      when 'string'
-        value.to_s
-      end
+  def set_type(value, to_type)
+    case to_type
+    when 'array'
+      value.is_a?(String) ? value.split(',') : Array.wrap(value)
+    when 'boolean'
+      ActiveModel::Type::Boolean.new.cast(value)
+    when 'hash'
+      value.is_a?(String) ? JSON.parse(value) : value
+    when 'string'
+      value.to_s
     end
+  end
 
-    def validate_email_format
-      return if settings['email_format'].blank?
-      settings['email_format'].each do |email|
-        errors.add(:email_format) unless email.match?(/@\S*\.\S*/)
-      end
+  def validate_email_format
+    return if settings['email_format'].blank?
+    settings['email_format'].each do |email|
+      errors.add(:email_format) unless email.match?(/@\S*\.\S*/)
     end
+  end
 
-    def validate_contact_emails
-      ['weekly_email_list', 'monthly_email_list', 'yearly_email_list'].each do |key|
-        next if settings[key].blank?
-        settings[key].each do |email|
-          errors.add(:"#{key}") unless email.match?(URI::MailTo::EMAIL_REGEXP)
-        end
+  def validate_contact_emails
+    ['weekly_email_list', 'monthly_email_list', 'yearly_email_list'].each do |key|
+      next if settings[key].blank?
+      settings[key].each do |email|
+        errors.add(:"#{key}") unless email.match?(URI::MailTo::EMAIL_REGEXP)
       end
     end
+  end
 
-    def initialize_settings
-      return true unless self.class.column_names.include?('settings')
-      set_smtp_settings
-      reload_library_config
-    end
+  def initialize_settings
+    return true unless self.class.column_names.include?('settings')
+    set_smtp_settings
+    reload_library_config
+  end
 
-    def set_smtp_settings
-      current_smtp_settings = settings&.[]("smtp_settings").presence || {}
-      self.smtp_settings = current_smtp_settings.with_indifferent_access.reverse_merge!(
-        PerTenantSmtpInterceptor.available_smtp_fields.each_with_object("").to_h
-      )
+  def set_smtp_settings
+    current_smtp_settings = settings&.[]("smtp_settings").presence || {}
+    self.smtp_settings = current_smtp_settings.with_indifferent_access.reverse_merge!(
+      PerTenantSmtpInterceptor.available_smtp_fields.each_with_object("").to_h
+    )
+  end
+
+  def reload_library_config
+    Hyrax.config do |config|
+      config.contact_email = contact_email
+      config.analytics = google_analytics_id.present?
+      config.google_analytics_id = google_analytics_id if google_analytics_id.present?
+      config.geonames_username = geonames_username
+      config.uploader[:maxFileSize] = file_size_limit
     end
 
-    def reload_library_config
-      Hyrax.config do |config|
-        config.contact_email = contact_email
-        config.analytics = google_analytics_id.present?
-        config.google_analytics_id = google_analytics_id if google_analytics_id.present?
-        config.geonames_username = geonames_username
-        config.uploader[:maxFileSize] = file_size_limit
-      end
+    Devise.mailer_sender = contact_email
 
-      Devise.mailer_sender = contact_email
-
-      if s3_bucket.present?
-        CarrierWave.configure do |config|
-          config.storage = :aws
-          config.aws_bucket = s3_bucket
-          config.aws_acl = 'bucket-owner-full-control'
-        end
-      elsif !file_acl
-        CarrierWave.configure do |config|
-          config.permissions = nil
-          config.directory_permissions = nil
-        end
-      else
-        CarrierWave.configure do |config|
-          config.storage = :file
-          config.permissions = 420
-          config.directory_permissions = 493
-        end
+    if s3_bucket.present?
+      CarrierWave.configure do |config|
+        config.storage = :aws
+        config.aws_bucket = s3_bucket
+        config.aws_acl = 'bucket-owner-full-control'
+      end
+    elsif !file_acl
+      CarrierWave.configure do |config|
+        config.permissions = nil
+        config.directory_permissions = nil
+      end
+    else
+      CarrierWave.configure do |config|
+        config.storage = :file
+        config.permissions = 420
+        config.directory_permissions = 493
       end
-
-      return unless ssl_configured
-      ActionMailer::Base.default_url_options ||= {}
-      ActionMailer::Base.default_url_options[:protocol] = 'https'
     end
+
+    return unless ssl_configured
+    ActionMailer::Base.default_url_options ||= {}
+    ActionMailer::Base.default_url_options[:protocol] = 'https'
+  end
 end
diff --git a/app/models/concerns/account_switch.rb b/app/models/concerns/account_switch.rb
index 7c5a02f00..80fd4c30a 100644
--- a/app/models/concerns/account_switch.rb
+++ b/app/models/concerns/account_switch.rb
@@ -10,7 +10,7 @@ def switch!(cname_or_name_or_account)
       account = if cname_or_name_or_account.is_a?(Account)
                   cname_or_name_or_account
                   # is it a domain name?
-                elsif cname_or_name_or_account =~ DOMAIN_REGEXP
+                elsif DOMAIN_REGEXP.match?(cname_or_name_or_account)
                   Account.joins(:domain_names).find_by(domain_names: {
                                                          is_active: true,
                                                          cname: Account.canonical_cname(cname_or_name_or_account)
diff --git a/app/models/featured_collection_list.rb b/app/models/featured_collection_list.rb
index 1de617815..394fb8069 100644
--- a/app/models/featured_collection_list.rb
+++ b/app/models/featured_collection_list.rb
@@ -30,24 +30,24 @@ def featured_collections
 
   private
 
-    def add_solr_document_to_collections
-      collection_presenters.each do |presenter|
-        collection_with_id(presenter.id).presenter = presenter
-      end
+  def add_solr_document_to_collections
+    collection_presenters.each do |presenter|
+      collection_with_id(presenter.id).presenter = presenter
     end
+  end
 
-    def ids
-      @collections.pluck(:collection_id)
-    end
+  def ids
+    @collections.pluck(:collection_id)
+  end
 
-    def collection_presenters
-      ability = nil
-      Hyrax::PresenterFactory.build_for(ids: ids,
-                                        presenter_class: Hyku::WorkShowPresenter,
-                                        presenter_args: ability)
-    end
+  def collection_presenters
+    ability = nil
+    Hyrax::PresenterFactory.build_for(ids: ids,
+                                      presenter_class: Hyku::WorkShowPresenter,
+                                      presenter_args: ability)
+  end
 
-    def collection_with_id(id)
-      @collections.find { |c| c.collection_id == id }
-    end
+  def collection_with_id(id)
+    @collections.find { |c| c.collection_id == id }
+  end
 end
diff --git a/app/models/hyrax/group.rb b/app/models/hyrax/group.rb
index bc33f2d73..9b3d95ab8 100644
--- a/app/models/hyrax/group.rb
+++ b/app/models/hyrax/group.rb
@@ -85,7 +85,7 @@ def default_group?
 
     def description_label
       label = description || I18n.t("hyku.admin.groups.description.#{name}")
-      return '' if label =~ /^translation missing:/
+      return '' if /^translation missing:/.match?(label)
 
       label
     end
@@ -98,22 +98,22 @@ def has_site_role?(role_name) # rubocop:disable Naming/PredicateName
 
     private
 
-      def can_destroy?
-        return false if default_group?
+    def can_destroy?
+      return false if default_group?
 
-        true
-      end
+      true
+    end
 
-      def remove_all_members
-        members.map { |m| m.remove_role(MEMBERSHIP_ROLE, self) }
-      end
+    def remove_all_members
+      members.map { |m| m.remove_role(MEMBERSHIP_ROLE, self) }
+    end
 
-      def sipity_agent
-        Sipity::Agent.find_by(proxy_for_id: name, proxy_for_type: self.class.name)
-      end
+    def sipity_agent
+      Sipity::Agent.find_by(proxy_for_id: name, proxy_for_type: self.class.name)
+    end
 
-      def create_sipity_agent!
-        Sipity::Agent.create!(proxy_for_id: name, proxy_for_type: self.class.name)
-      end
+    def create_sipity_agent!
+      Sipity::Agent.create!(proxy_for_id: name, proxy_for_type: self.class.name)
+    end
   end
 end
diff --git a/app/models/nil_fcrepo_endpoint.rb b/app/models/nil_fcrepo_endpoint.rb
index d72614517..d833c0f42 100644
--- a/app/models/nil_fcrepo_endpoint.rb
+++ b/app/models/nil_fcrepo_endpoint.rb
@@ -15,7 +15,7 @@ def base_path
 
   private
 
-    def options
-      { url: 'http://127.0.0.1:99999/nil_fcrepo_endpoint' }
-    end
+  def options
+    { url: 'http://127.0.0.1:99999/nil_fcrepo_endpoint' }
+  end
 end
diff --git a/app/models/nil_solr_endpoint.rb b/app/models/nil_solr_endpoint.rb
index 7a16634fc..9dd11f166 100644
--- a/app/models/nil_solr_endpoint.rb
+++ b/app/models/nil_solr_endpoint.rb
@@ -13,16 +13,16 @@ def url
 
   private
 
-    # Return an RSolr connection, that points at an invalid endpoint
-    # Note: We could have returned a NilRSolrConnection here, but Blacklight
-    # makes it's own RSolr connection, so we'd end up with an RSolr connection in
-    # blacklight anyway.
-    def connection
-      RSolr.connect(connection_options)
-    end
+  # Return an RSolr connection, that points at an invalid endpoint
+  # Note: We could have returned a NilRSolrConnection here, but Blacklight
+  # makes it's own RSolr connection, so we'd end up with an RSolr connection in
+  # blacklight anyway.
+  def connection
+    RSolr.connect(connection_options)
+  end
 
-    # Return options that will never return a valid connection.
-    def connection_options
-      { url: 'http://127.0.0.1:99999/nil_solr_endpoint' }
-    end
+  # Return options that will never return a valid connection.
+  def connection_options
+    { url: 'http://127.0.0.1:99999/nil_solr_endpoint' }
+  end
 end
diff --git a/app/models/redis_endpoint.rb b/app/models/redis_endpoint.rb
index b6899cf98..8003b9e6c 100644
--- a/app/models/redis_endpoint.rb
+++ b/app/models/redis_endpoint.rb
@@ -34,7 +34,7 @@ def remove!
 
   private
 
-    def redis_instance
-      Hyrax::RedisEventStore.instance
-    end
+  def redis_instance
+    Hyrax::RedisEventStore.instance
+  end
 end
diff --git a/app/models/role.rb b/app/models/role.rb
index 4b5c4eefd..f30b58e30 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -21,7 +21,7 @@ class Role < ApplicationRecord
 
   def description_label
     label = description || I18n.t("hyku.admin.roles.description.#{name}")
-    return '' if label =~ /^translation missing:/
+    return '' if /^translation missing:/.match?(label)
 
     label
   end
@@ -29,13 +29,13 @@ def description_label
   def set_sort_value
     self.sort_value = if name == 'admin'
                         0
-                      elsif name =~ /manager/
+                      elsif /manager/.match?(name)
                         1
-                      elsif name =~ /editor/
+                      elsif /editor/.match?(name)
                         2
-                      elsif name =~ /depositor/
+                      elsif /depositor/.match?(name)
                         3
-                      elsif name =~ /reader/
+                      elsif /reader/.match?(name)
                         4
                       else
                         99
diff --git a/app/models/site.rb b/app/models/site.rb
index 777bf1a0b..431315297 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -51,26 +51,26 @@ def admin_emails=(emails)
 
   private
 
-    # Add/invite admins via email address
-    # @param [Array<String>] Array of user emails
-    def add_admins_by_email(emails)
-      # For users that already have accounts, add to role immediately
-      existing_emails = User.where(email: emails).map do |u|
-        u.add_role :admin, self
-        u.email
-      end
-      # For new users, send invitation and add to role
-      (emails - existing_emails).each do |email|
-        u = User.invite!(email: email)
-        u.add_role :admin, self
-      end
+  # Add/invite admins via email address
+  # @param [Array<String>] Array of user emails
+  def add_admins_by_email(emails)
+    # For users that already have accounts, add to role immediately
+    existing_emails = User.where(email: emails).map do |u|
+      u.add_role :admin, self
+      u.email
+    end
+    # For new users, send invitation and add to role
+    (emails - existing_emails).each do |email|
+      u = User.invite!(email: email)
+      u.add_role :admin, self
     end
+  end
 
-    # Remove specific administrators
-    # @param [Array<String>] Array of user emails
-    def remove_admins_by_email(emails)
-      User.where(email: emails).find_each do |u|
-        u.remove_role :admin, self
-      end
+  # Remove specific administrators
+  # @param [Array<String>] Array of user emails
+  def remove_admins_by_email(emails)
+    User.where(email: emails).find_each do |u|
+      u.remove_role :admin, self
     end
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 3f27a488e..a6ef4151e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -22,7 +22,7 @@ def self.default_scope
     where(guest: false)
   end
 
-  scope :for_repository, -> {
+  scope :for_repository, lambda {
     joins(:roles)
   }
 
diff --git a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
index 6260e456a..7fa98752a 100644
--- a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
+++ b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
@@ -22,68 +22,68 @@ def request
 
       private
 
-        Request = Struct.new(:base_url, keyword_init: true)
+      Request = Struct.new(:base_url, keyword_init: true)
 
-        def image_content
-          return nil unless latest_file_id
-          url = Hyrax.config.iiif_image_url_builder.call(
-            latest_file_id,
-            request.base_url,
-            Hyrax.config.iiif_image_size_default,
-            solr_document.mime_type
-          )
+      def image_content
+        return nil unless latest_file_id
+        url = Hyrax.config.iiif_image_url_builder.call(
+          latest_file_id,
+          request.base_url,
+          Hyrax.config.iiif_image_size_default,
+          solr_document.mime_type
+        )
 
-          # Serving up only prezi 3
-          image_content_v3(url)
-        end
+        # Serving up only prezi 3
+        image_content_v3(url)
+      end
 
-        def video_display_content(_url, label = '')
-          width = solr_document.width&.try(:to_i) || 320
-          height = solr_document.height&.try(:to_i) || 240
-          duration = conformed_duration_in_seconds
-          IIIFManifest::V3::DisplayContent.new(
-            Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
-              solr_document.id,
-              label: label,
-              host: request.base_url
-            ),
+      def video_display_content(_url, label = '')
+        width = solr_document.width&.try(:to_i) || 320
+        height = solr_document.height&.try(:to_i) || 240
+        duration = conformed_duration_in_seconds
+        IIIFManifest::V3::DisplayContent.new(
+          Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
+            solr_document.id,
             label: label,
-            width: width,
-            height: height,
-            duration: duration,
-            type: 'Video',
-            format: solr_document.mime_type
-          )
-        end
+            host: request.base_url
+          ),
+          label: label,
+          width: width,
+          height: height,
+          duration: duration,
+          type: 'Video',
+          format: solr_document.mime_type
+        )
+      end
 
-        def audio_display_content(_url, label = '')
-          duration = conformed_duration_in_seconds
-          IIIFManifest::V3::DisplayContent.new(
-            Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
-              solr_document.id,
-              label: label,
-              host: request.base_url
-            ),
+      def audio_display_content(_url, label = '')
+        duration = conformed_duration_in_seconds
+        IIIFManifest::V3::DisplayContent.new(
+          Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
+            solr_document.id,
             label: label,
-            duration: duration,
-            type: 'Sound',
-            format: solr_document.mime_type
-          )
-        end
+            host: request.base_url
+          ),
+          label: label,
+          duration: duration,
+          type: 'Sound',
+          format: solr_document.mime_type
+        )
+      end
 
-        def conformed_duration_in_seconds
-          if Array(solr_document.duration)&.first&.count(':') == 3
-            # takes care of milliseconds like ["0:0:01:001"]
-            Time.zone.parse(Array(solr_document.duration).first.sub(/.*\K:/, '.')).seconds_since_midnight
-          elsif Array(solr_document.duration)&.first&.include?(':')
-            # if solr_document.duration evaluates to something like ["0:01:00"] which will get converted to seconds
-            Time.zone.parse(Array(solr_document.duration).first).seconds_since_midnight
-          else
-            # handles cases if solr_document.duration evaluates to something like ['25 s']
-            Array(solr_document.duration).first.try(:to_f)
-          end ||
-            400.0
-        end
+      def conformed_duration_in_seconds
+        if Array(solr_document.duration)&.first&.count(':') == 3
+          # takes care of milliseconds like ["0:0:01:001"]
+          Time.zone.parse(Array(solr_document.duration).first.sub(/.*\K:/, '.')).seconds_since_midnight
+        elsif Array(solr_document.duration)&.first&.include?(':')
+          # if solr_document.duration evaluates to something like ["0:01:00"] which will get converted to seconds
+          Time.zone.parse(Array(solr_document.duration).first).seconds_since_midnight
+        else
+          # handles cases if solr_document.duration evaluates to something like ['25 s']
+          Array(solr_document.duration).first.try(:to_f)
+        end ||
+          400.0
+      end
     end
   end
 end
diff --git a/app/presenters/hyku/admin/group/navigation_presenter.rb b/app/presenters/hyku/admin/group/navigation_presenter.rb
index 7afaf6a9c..99d31daf1 100644
--- a/app/presenters/hyku/admin/group/navigation_presenter.rb
+++ b/app/presenters/hyku/admin/group/navigation_presenter.rb
@@ -20,76 +20,76 @@ def tabs
 
         private
 
-          attr_reader :group_id, :params
+        attr_reader :group_id, :params
 
-          def edit_tab
-            Tab.new(
-              name: I18n.t('hyku.admin.groups.nav.attributes'),
-              controller: 'admin/groups',
-              action: 'edit',
-              path: Rails.application.routes.url_helpers.edit_admin_group_path(group_id),
-              context: params
-            )
-          end
+        def edit_tab
+          Tab.new(
+            name: I18n.t('hyku.admin.groups.nav.attributes'),
+            controller: 'admin/groups',
+            action: 'edit',
+            path: Rails.application.routes.url_helpers.edit_admin_group_path(group_id),
+            context: params
+          )
+        end
 
-          def members_tab
-            Tab.new(
-              name: I18n.t('hyku.admin.groups.nav.members'),
-              controller: 'admin/group_users',
-              action: 'index',
-              path: Rails.application.routes.url_helpers.admin_group_users_path(group_id),
-              context: params
-            )
-          end
+        def members_tab
+          Tab.new(
+            name: I18n.t('hyku.admin.groups.nav.members'),
+            controller: 'admin/group_users',
+            action: 'index',
+            path: Rails.application.routes.url_helpers.admin_group_users_path(group_id),
+            context: params
+          )
+        end
 
-          def roles_tab
-            Tab.new(
-              name: I18n.t('hyku.admin.groups.nav.roles'),
-              controller: 'admin/group_roles',
-              action: 'index',
-              path: Rails.application.routes.url_helpers.admin_group_roles_path(group_id),
-              context: params
-            )
-          end
+        def roles_tab
+          Tab.new(
+            name: I18n.t('hyku.admin.groups.nav.roles'),
+            controller: 'admin/group_roles',
+            action: 'index',
+            path: Rails.application.routes.url_helpers.admin_group_roles_path(group_id),
+            context: params
+          )
+        end
 
-          def remove_tab
-            Tab.new(
-              name: I18n.t('hyku.admin.groups.nav.delete'),
-              controller: 'admin/groups',
-              action: 'remove',
-              path: Rails.application.routes.url_helpers.remove_admin_group_path(group_id),
-              context: params
-            )
-          end
+        def remove_tab
+          Tab.new(
+            name: I18n.t('hyku.admin.groups.nav.delete'),
+            controller: 'admin/groups',
+            action: 'remove',
+            path: Rails.application.routes.url_helpers.remove_admin_group_path(group_id),
+            context: params
+          )
+        end
 
-          def group_id_key
-            return :id if params.key?(:id)
-            return :group_id if params.key?(:group_id)
-            :key_not_found
-          end
+        def group_id_key
+          return :id if params.key?(:id)
+          return :group_id if params.key?(:group_id)
+          :key_not_found
+        end
 
-          class Tab
-            ACTIVE_CSS_CLASS = 'active'
+        class Tab
+          ACTIVE_CSS_CLASS = 'active'
 
-            attr_reader :name, :path, :action
+          attr_reader :name, :path, :action
 
-            def initialize(name:, controller:, action:, path:, context:)
-              @name = name
-              @controller = controller
-              @action = action
-              @path = path
-              @context = context
-            end
+          def initialize(name:, controller:, action:, path:, context:)
+            @name = name
+            @controller = controller
+            @action = action
+            @path = path
+            @context = context
+          end
 
-            def css_class
-              return ACTIVE_CSS_CLASS if context.fetch(:controller) == controller && context.fetch(:action) == action
-              ''
-            end
+          def css_class
+            return ACTIVE_CSS_CLASS if context.fetch(:controller) == controller && context.fetch(:action) == action
+            ''
+          end
 
-            private
+          private
 
-              attr_reader :controller, :context
-          end
+          attr_reader :controller, :context
+        end
       end
     end
   end
diff --git a/app/presenters/hyku/collapsable_section_presenter.rb b/app/presenters/hyku/collapsable_section_presenter.rb
index f513b56a0..da0c2b100 100644
--- a/app/presenters/hyku/collapsable_section_presenter.rb
+++ b/app/presenters/hyku/collapsable_section_presenter.rb
@@ -15,17 +15,17 @@ def initialize(view_context:, text:, id:, icon_class:, open:, html_options: {})
 
     private
 
-      def button_tag
-        tag.a({ role: 'button',
-                class: "#{button_class}collapse-toggle",
-                data: { toggle: 'collapse' },
-                href: "##{id}",
-                onclick: "toggleCollapse(this)",
-                'aria-expanded' => open,
-                'aria-controls' => id }.merge(html_options)) do
-          safe_join([tag.span('', class: icon_class, 'aria-hidden': true),
-                     tag.span(text)], ' ')
-        end
+    def button_tag
+      tag.a({ role: 'button',
+              class: "#{button_class}collapse-toggle",
+              data: { toggle: 'collapse' },
+              href: "##{id}",
+              onclick: "toggleCollapse(this)",
+              'aria-expanded' => open,
+              'aria-controls' => id }.merge(html_options)) do
+        safe_join([tag.span('', class: icon_class, 'aria-hidden': true),
+                   tag.span(text)], ' ')
       end
+    end
   end
 end
diff --git a/app/presenters/hyku/work_show_presenter.rb b/app/presenters/hyku/work_show_presenter.rb
index 12427bc41..a734a52fb 100644
--- a/app/presenters/hyku/work_show_presenter.rb
+++ b/app/presenters/hyku/work_show_presenter.rb
@@ -46,9 +46,7 @@ def display_unfeature_collection_link?
 
     def collection_featured?
       # only look this up if it's not boolean; ||= won't work here
-      if @collection_featured.nil?
-        @collection_featured = FeaturedCollection.where(collection_id: solr_document.id).exists?
-      end
+      @collection_featured = FeaturedCollection.where(collection_id: solr_document.id).exists? if @collection_featured.nil?
       @collection_featured
     end
 
@@ -68,23 +66,23 @@ def iiif_viewer?
 
     private
 
-      def iiif_media?(presenter: representative_presenter)
-        presenter.image? || presenter.video? || presenter.audio? || presenter.pdf?
-      end
+    def iiif_media?(presenter: representative_presenter)
+      presenter.image? || presenter.video? || presenter.audio? || presenter.pdf?
+    end
 
-      def members_include_viewable?
-        file_set_presenters.any? do |presenter|
-          iiif_media?(presenter: presenter) && current_ability.can?(:read, presenter.id)
-        end
+    def members_include_viewable?
+      file_set_presenters.any? do |presenter|
+        iiif_media?(presenter: presenter) && current_ability.can?(:read, presenter.id)
       end
+    end
 
-      def extract_from_identifier(rgx)
-        if solr_document['identifier_tesim'].present?
-          ref = solr_document['identifier_tesim'].map do |str|
-            str.scan(rgx)
-          end
+    def extract_from_identifier(rgx)
+      if solr_document['identifier_tesim'].present?
+        ref = solr_document['identifier_tesim'].map do |str|
+          str.scan(rgx)
         end
-        ref
       end
+      ref
+    end
   end
 end
diff --git a/app/presenters/hyrax/admin/users_presenter.rb b/app/presenters/hyrax/admin/users_presenter.rb
index 17d2fc0ba..8d49fd538 100644
--- a/app/presenters/hyrax/admin/users_presenter.rb
+++ b/app/presenters/hyrax/admin/users_presenter.rb
@@ -34,10 +34,10 @@ def show_last_access?
 
       private
 
-        # Returns a list of users excluding the system users and guest_users
-        def search
-          ::User.registered.for_repository.without_system_accounts.uniq
-        end
+      # Returns a list of users excluding the system users and guest_users
+      def search
+        ::User.registered.for_repository.without_system_accounts.uniq
+      end
     end
   end
 end
diff --git a/app/presenters/hyrax/collection_presenter_decorator.rb b/app/presenters/hyrax/collection_presenter_decorator.rb
index c348e5888..3c27b7c4e 100644
--- a/app/presenters/hyrax/collection_presenter_decorator.rb
+++ b/app/presenters/hyrax/collection_presenter_decorator.rb
@@ -49,19 +49,11 @@ def [](key)
     # @return String the access label (e.g. Manage, Deposit, View)
     def managed_access
       # OVERRIDE: Change check for manage access from :edit to :destroy
-      if current_ability.can?(:destroy, solr_document)
-        return I18n.t('hyrax.dashboard.my.collection_list.managed_access.manage')
-      end
+      return I18n.t('hyrax.dashboard.my.collection_list.managed_access.manage') if current_ability.can?(:destroy, solr_document)
       # OVERRIDE: Add label for Edit access
-      if current_ability.can?(:edit, solr_document)
-        return I18n.t('hyrax.dashboard.my.collection_list.managed_access.edit')
-      end
-      if current_ability.can?(:deposit, solr_document)
-        return I18n.t('hyrax.dashboard.my.collection_list.managed_access.deposit')
-      end
-      if current_ability.can?(:read, solr_document)
-        return I18n.t('hyrax.dashboard.my.collection_list.managed_access.view')
-      end
+      return I18n.t('hyrax.dashboard.my.collection_list.managed_access.edit') if current_ability.can?(:edit, solr_document)
+      return I18n.t('hyrax.dashboard.my.collection_list.managed_access.deposit') if current_ability.can?(:deposit, solr_document)
+      return I18n.t('hyrax.dashboard.my.collection_list.managed_access.view') if current_ability.can?(:read, solr_document)
       ''
     end
 
@@ -106,9 +98,7 @@ def display_unfeature_collection_link?
 
     def collection_featured?
       # only look this up if it's not boolean; ||= won't work here
-      if @collection_featured.nil?
-        @collection_featured = FeaturedCollection.where(collection_id: solr_document.id).exists?
-      end
+      @collection_featured = FeaturedCollection.where(collection_id: solr_document.id).exists? if @collection_featured.nil?
       @collection_featured
     end
 
diff --git a/app/presenters/hyrax/homepage_presenter.rb b/app/presenters/hyrax/homepage_presenter.rb
index 76fe4bf49..2351f1195 100644
--- a/app/presenters/hyrax/homepage_presenter.rb
+++ b/app/presenters/hyrax/homepage_presenter.rb
@@ -66,9 +66,9 @@ def display_recently_uploaded?
 
     private
 
-      def user_unregistered?
-        current_ability.current_user.new_record? ||
-          current_ability.current_user.guest?
-      end
+    def user_unregistered?
+      current_ability.current_user.new_record? ||
+        current_ability.current_user.guest?
+    end
   end
 end
diff --git a/app/services/create_account.rb b/app/services/create_account.rb
index 1ce61f94e..d756c17dc 100644
--- a/app/services/create_account.rb
+++ b/app/services/create_account.rb
@@ -53,7 +53,7 @@ def create_defaults
   def fillin_translations
     collection_types = Hyrax::CollectionType.all
     collection_types.each do |c|
-      next unless c.title =~ /^translation missing/
+      next unless /^translation missing/.match?(c.title)
       oldtitle = c.title
       c.title = I18n.t(c.title.gsub("translation missing: en.", ''))
       c.save
@@ -87,7 +87,7 @@ def schedule_recurring_jobs
 
   private
 
-    def initialize_account_data
-      Site.update(account: account)
-    end
+  def initialize_account_data
+    Site.update(account: account)
+  end
 end
diff --git a/app/services/group_aware_role_checker.rb b/app/services/group_aware_role_checker.rb
index 76b7752bc..d366e46a8 100644
--- a/app/services/group_aware_role_checker.rb
+++ b/app/services/group_aware_role_checker.rb
@@ -12,16 +12,16 @@ module GroupAwareRoleChecker
 
   private
 
-    # Check for the presence of the passed role_name in the User's Roles and
-    # the User's Hyrax::Group's Roles.
-    def has_group_aware_role?(role_name) # rubocop:disable Naming/PredicateName
-      return false if current_user.new_record?
-      return true if current_user.has_role?(role_name, Site.instance)
+  # Check for the presence of the passed role_name in the User's Roles and
+  # the User's Hyrax::Group's Roles.
+  def has_group_aware_role?(role_name) # rubocop:disable Naming/PredicateName
+    return false if current_user.new_record?
+    return true if current_user.has_role?(role_name, Site.instance)
 
-      current_user.hyrax_groups.each do |group|
-        return true if group.has_site_role?(role_name)
-      end
-
-      false
+    current_user.hyrax_groups.each do |group|
+      return true if group.has_site_role?(role_name)
     end
+
+    false
+  end
 end
diff --git a/app/services/hyrax/manifest_builder_service_decorator.rb b/app/services/hyrax/manifest_builder_service_decorator.rb
index 218420566..fdfe796ab 100644
--- a/app/services/hyrax/manifest_builder_service_decorator.rb
+++ b/app/services/hyrax/manifest_builder_service_decorator.rb
@@ -4,22 +4,22 @@ module Hyrax
   module ManifestBuilderServiceDecorator
     private
 
-      ##
-      # @return [Hash<Array>] the Hash to be used by "label" to change `&amp;`	to `&`
-      # @see #loof
-      def sanitize_value(text)
-        return loof(text) unless text.is_a?(Hash)
-        text[text.keys.first] = text.values.flatten.map { |value| loof(value) }
-        text
-      end
+    ##
+    # @return [Hash<Array>] the Hash to be used by "label" to change `&amp;`	to `&`
+    # @see #loof
+    def sanitize_value(text)
+      return loof(text) unless text.is_a?(Hash)
+      text[text.keys.first] = text.values.flatten.map { |value| loof(value) }
+      text
+    end
 
-      ##
-      # @return [String] the String that gets unescaped since Loofah is too aggressive for example
-      #   it changes to `&` to `&amp;` which will be displayed in the Universal Viewer and manifest
-      # @see #sanitize_value
-      def loof(text)
-        CGI.unescapeHTML(Loofah.fragment(text.to_s).scrub!(:prune).to_s)
-      end
+    ##
+    # @return [String] the String that gets unescaped since Loofah is too aggressive for example
+    #   it changes to `&` to `&amp;` which will be displayed in the Universal Viewer and manifest
+    # @see #sanitize_value
+    def loof(text)
+      CGI.unescapeHTML(Loofah.fragment(text.to_s).scrub!(:prune).to_s)
+    end
   end
 end
 
diff --git a/app/services/hyrax/thumbnail_path_service.rb b/app/services/hyrax/thumbnail_path_service.rb
index cccadc9a5..af3851f72 100644
--- a/app/services/hyrax/thumbnail_path_service.rb
+++ b/app/services/hyrax/thumbnail_path_service.rb
@@ -18,54 +18,54 @@ def call(object)
 
       private
 
-        def return_path(thumb)
-          if audio?(thumb)
-            audio_image
-          elsif thumbnail?(thumb)
-            thumbnail_path(thumb)
-          else
-            default_image
-          end
+      def return_path(thumb)
+        if audio?(thumb)
+          audio_image
+        elsif thumbnail?(thumb)
+          thumbnail_path(thumb)
+        else
+          default_image
         end
+      end
 
-        def audio?(thumb)
-          service = thumb.respond_to?(:audio?) ? thumb : Hyrax::FileSetTypeService.new(file_set: thumb)
-          service.audio?
-        end
+      def audio?(thumb)
+        service = thumb.respond_to?(:audio?) ? thumb : Hyrax::FileSetTypeService.new(file_set: thumb)
+        service.audio?
+      end
 
-        def fetch_thumbnail(object)
-          return object if object.thumbnail_id == object.id
-          Hyrax.query_service.find_by(id: object.thumbnail_id)
-        rescue Valkyrie::Persistence::ObjectNotFoundError, Hyrax::ObjectNotFoundError
-          Rails.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
-          nil
-        end
+      def fetch_thumbnail(object)
+        return object if object.thumbnail_id == object.id
+        Hyrax.query_service.find_by(id: object.thumbnail_id)
+      rescue Valkyrie::Persistence::ObjectNotFoundError, Hyrax::ObjectNotFoundError
+        Rails.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
+        nil
+      end
 
-        # @return the network path to the thumbnail
-        # @param [FileSet] thumbnail the object that is the thumbnail
-        def thumbnail_path(thumbnail)
-          Hyrax::Engine.routes.url_helpers.download_path(thumbnail.id,
-                                                         file: 'thumbnail')
-        end
+      # @return the network path to the thumbnail
+      # @param [FileSet] thumbnail the object that is the thumbnail
+      def thumbnail_path(thumbnail)
+        Hyrax::Engine.routes.url_helpers.download_path(thumbnail.id,
+                                                       file: 'thumbnail')
+      end
 
-        def default_image
-          Site.instance.default_work_image&.url || ActionController::Base.helpers.image_path('default.png')
-        end
+      def default_image
+        Site.instance.default_work_image&.url || ActionController::Base.helpers.image_path('default.png')
+      end
 
-        def audio_image
-          ActionController::Base.helpers.image_path 'audio.png'
-        end
+      def audio_image
+        ActionController::Base.helpers.image_path 'audio.png'
+      end
 
-        # @return true if there a file on disk for this object, otherwise false
-        # @param [FileSet] thumb - the object that is the thumbnail
-        def thumbnail?(thumb)
-          File.exist?(thumbnail_filepath(thumb))
-        end
+      # @return true if there a file on disk for this object, otherwise false
+      # @param [FileSet] thumb - the object that is the thumbnail
+      def thumbnail?(thumb)
+        File.exist?(thumbnail_filepath(thumb))
+      end
 
-        # @param [FileSet] thumb - the object that is the thumbnail
-        def thumbnail_filepath(thumb)
-          Hyrax::DerivativePath.derivative_path_for_reference(thumb, 'thumbnail')
-        end
+      # @param [FileSet] thumb - the object that is the thumbnail
+      def thumbnail_filepath(thumb)
+        Hyrax::DerivativePath.derivative_path_for_reference(thumb, 'thumbnail')
+      end
     end
   end
 end
diff --git a/app/services/hyrax/workflow/permission_grantor.rb b/app/services/hyrax/workflow/permission_grantor.rb
index ed93c054a..1efc530eb 100644
--- a/app/services/hyrax/workflow/permission_grantor.rb
+++ b/app/services/hyrax/workflow/permission_grantor.rb
@@ -36,64 +36,64 @@ def call
 
       private
 
-        # Force creation of registered roles if they don't exist
-        def register_default_sipity_roles!
-          Sipity::Role[Hyrax::RoleRegistry::MANAGING]
-          Sipity::Role[Hyrax::RoleRegistry::APPROVING]
-          Sipity::Role[Hyrax::RoleRegistry::DEPOSITING]
-        end
+      # Force creation of registered roles if they don't exist
+      def register_default_sipity_roles!
+        Sipity::Role[Hyrax::RoleRegistry::MANAGING]
+        Sipity::Role[Hyrax::RoleRegistry::APPROVING]
+        Sipity::Role[Hyrax::RoleRegistry::DEPOSITING]
+      end
 
-        def grant_all_workflow_roles_to_creating_user_and_admins!
-          # The admin group should always receive workflow roles
-          workflow_agents = [Hyrax::Group.find_by!(name: ::Ability.admin_group_name)]
-          # The default admin set does not have a creating user
-          workflow_agents << creating_user if creating_user
-          workflow_agents |= Hyrax::Group.select { |g| g.has_site_role?(:admin) }.tap do |agent_list|
-            ::User.find_each do |u|
-              agent_list << u if u.has_role?(:admin, Site.instance)
-            end
+      def grant_all_workflow_roles_to_creating_user_and_admins!
+        # The admin group should always receive workflow roles
+        workflow_agents = [Hyrax::Group.find_by!(name: ::Ability.admin_group_name)]
+        # The default admin set does not have a creating user
+        workflow_agents << creating_user if creating_user
+        workflow_agents |= Hyrax::Group.select { |g| g.has_site_role?(:admin) }.tap do |agent_list|
+          ::User.find_each do |u|
+            agent_list << u if u.has_role?(:admin, Site.instance)
           end
-
-          grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: nil)
         end
 
-        def grant_workflow_roles_to_editors!
-          editor_sipity_roles = [Hyrax::RoleRegistry::APPROVING, Hyrax::RoleRegistry::DEPOSITING]
-          workflow_agents = Hyrax::Group.select { |g| g.has_site_role?(:work_editor) }.tap do |agent_list|
-            ::User.find_each do |u|
-              agent_list << u if u.has_role?(:work_editor, Site.instance)
-            end
-          end
+        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: nil)
+      end
 
-          grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: editor_sipity_roles)
+      def grant_workflow_roles_to_editors!
+        editor_sipity_roles = [Hyrax::RoleRegistry::APPROVING, Hyrax::RoleRegistry::DEPOSITING]
+        workflow_agents = Hyrax::Group.select { |g| g.has_site_role?(:work_editor) }.tap do |agent_list|
+          ::User.find_each do |u|
+            agent_list << u if u.has_role?(:work_editor, Site.instance)
+          end
         end
 
-        def grant_workflow_roles_to_depositors!
-          depositor_sipity_role = [Hyrax::RoleRegistry::DEPOSITING]
-          workflow_agents = Hyrax::Group.select { |g| g.has_site_role?(:work_depositor) }.tap do |agent_list|
-            ::User.find_each do |u|
-              agent_list << u if u.has_role?(:work_depositor, Site.instance)
-            end
-          end
+        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: editor_sipity_roles)
+      end
 
-          grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: depositor_sipity_role)
+      def grant_workflow_roles_to_depositors!
+        depositor_sipity_role = [Hyrax::RoleRegistry::DEPOSITING]
+        workflow_agents = Hyrax::Group.select { |g| g.has_site_role?(:work_depositor) }.tap do |agent_list|
+          ::User.find_each do |u|
+            agent_list << u if u.has_role?(:work_depositor, Site.instance)
+          end
         end
 
-        def grant_workflow_roles!(workflow_agents:, role_filters:)
-          role_set = if role_filters.present?
-                       Sipity::Role.select { |role| role_filters.include?(role.name) }
-                     else
-                       Sipity::Role.all
-                     end
+        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: depositor_sipity_role)
+      end
+
+      def grant_workflow_roles!(workflow_agents:, role_filters:)
+        role_set = if role_filters.present?
+                     Sipity::Role.select { |role| role_filters.include?(role.name) }
+                   else
+                     Sipity::Role.all
+                   end
 
-          permission_template.available_workflows.each do |workflow|
-            role_set.each do |role|
-              Hyrax::Workflow::PermissionGenerator.call(roles: role,
-                                                        workflow: workflow,
-                                                        agents: workflow_agents)
-            end
+        permission_template.available_workflows.each do |workflow|
+          role_set.each do |role|
+            Hyrax::Workflow::PermissionGenerator.call(roles: role,
+                                                      workflow: workflow,
+                                                      agents: workflow_agents)
           end
         end
+      end
     end
   end
 end
diff --git a/app/services/roles_service.rb b/app/services/roles_service.rb
index 7b28747ad..4c93997ec 100644
--- a/app/services/roles_service.rb
+++ b/app/services/roles_service.rb
@@ -77,9 +77,7 @@ def create_default_roles!
 
     def create_default_hyrax_groups_with_roles!
       # Prevent Hyrax::Groups from being created in the public schema
-      if Site.instance.is_a?(NilSite)
-        return '`AccountElevator.switch!` into an Account before creating default Hyrax::Groups'
-      end
+      return '`AccountElevator.switch!` into an Account before creating default Hyrax::Groups' if Site.instance.is_a?(NilSite)
 
       default_hyrax_groups_with_roles =
         DEFAULT_HYRAX_GROUPS_WITH_ATTRIBUTES.deep_merge(DEFAULT_ROLES_FOR_DEFAULT_HYRAX_GROUPS)
diff --git a/bin/extract_mods_to_spreadsheet b/bin/extract_mods_to_spreadsheet
index 302cbaf5f..822c783b6 100755
--- a/bin/extract_mods_to_spreadsheet
+++ b/bin/extract_mods_to_spreadsheet
@@ -28,9 +28,9 @@ puts 'Starting import...'
 # Assumption: filename will contain the druid.  Example:
 #   hyku-metadata/GSE/druid_wg827ks1643/data/metadata/descMetadata.xml
 data = Dir.glob("#{base_path}/**/descMetadata.xml").map do |filename|
-         id = filename.gsub(%r{.*/druid_(\w+)/.*}, '\1')
-         {id: [id], type: ['ETD']}.merge(Importer::ModsParser.new(filename).attributes)
-       end
+  id = filename.gsub(%r{.*/druid_(\w+)/.*}, '\1')
+  { id: [id], type: ['ETD'] }.merge(Importer::ModsParser.new(filename).attributes)
+end
 
 # Process the contributor into a flat field and drop 'notes_attributes' and 'collection'
 data.each do |record|
@@ -51,8 +51,8 @@ end
 uniq_headers = headers.map(&:keys).flatten.uniq
 
 # How many columns does each field take up. Look for the widest one.
-cols_for_attribute = uniq_headers.each_with_object({}) do |k, h|
-  h[k] = headers.map{ |header| header[k] }.max
+cols_for_attribute = uniq_headers.index_with do |k|
+  headers.map { |header| header[k] }.max
 end
 
 # Discard fields that aren't used.
diff --git a/bin/git-cleanup b/bin/git-cleanup
index cd9390421..0b1fc6a35 100755
--- a/bin/git-cleanup
+++ b/bin/git-cleanup
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-%x{git fetch -ap}
-branches = %x{git branch --merged main}.split("\n").collect {|b| b.gsub('*', '').strip}
+`git fetch -ap`
+branches = `git branch --merged main`.split("\n").collect { |b| b.delete('*').strip }
 
 branches -= ['staging', 'main']
 
 branches.each do |branch|
-  puts %x{git branch -d #{branch}}
+  puts `git branch -d #{branch}`
 end
diff --git a/bin/graph b/bin/graph
index ee0ef589a..6ff6fa1e3 100644
--- a/bin/graph
+++ b/bin/graph
@@ -5,9 +5,9 @@
 #
 # Example: bin/graph one_step_mediated_deposit
 #
-# This script requires that you have Graphviz installed and the 
+# This script requires that you have Graphviz installed and the
 # ruby-graphviz gem.
-# 
+#
 # gem install 'ruby-graphviz'
 #
 #
@@ -31,9 +31,7 @@ unless workflow
   exit(1)
 end
 
-
 class GraphWriter
-
   attr_reader :workflow, :nodes, :initial_state
 
   def initialize(workflow)
@@ -42,7 +40,7 @@ class GraphWriter
 
   # Create a new graph
   def graph
-    @g ||= GraphViz.new(:G, :type => :digraph)
+    @g ||= GraphViz.new(:G, type: :digraph)
   end
 
   def attach_nodes
@@ -54,14 +52,14 @@ class GraphWriter
   end
 
   def write_edge(initial, terminal, label)
-    graph.add_edges( nodes[initial], nodes[terminal], label: label)
+    graph.add_edges(nodes[initial], nodes[terminal], label: label)
   end
 
   def attach_edges
     # Create edges
     workflow.workflow_actions.each do |wa|
       terminal = wa.resulting_workflow_state_id
-      if wa.workflow_state_actions.count == 0 
+      if wa.workflow_state_actions.count == 0
         # Initial action
         write_edge(initial_state.id, terminal, wa.name)
       end
@@ -88,4 +86,3 @@ class GraphWriter
 end
 
 GraphWriter.new(workflow).write
-
diff --git a/bin/import_from_purl b/bin/import_from_purl
index 23ce3b38d..9b6b214d0 100755
--- a/bin/import_from_purl
+++ b/bin/import_from_purl
@@ -47,7 +47,7 @@ def druids(druid_file)
   count = 0
   File.foreach(druid_file) do |line|
     # Split in two parts on the first comma
-    (element, _) = line.split(/,/, 2)
+    (element,) = line.split(/,/, 2)
     # remove any namespacing
     if md = /(druid:)?(.*)/.match(element)
       yield(md[2])
diff --git a/bin/import_mods_files b/bin/import_mods_files
index 1bff5db78..7398057c8 100755
--- a/bin/import_mods_files
+++ b/bin/import_mods_files
@@ -39,7 +39,6 @@ def load_rails
   puts 'Starting import...'
 end
 
-
 def main(hostname, mods_directory, imagepath)
   validate_hostname!(hostname)
   validate_mods_directory!(mods_directory)
@@ -56,5 +55,4 @@ def usage
   $stderr.puts "Usage: #{$PROGRAM_NAME} <hostname> <mods_directory> <image directory>"
 end
 
-
 main(ARGV[0], ARGV[1], ARGV[2])
diff --git a/bin/web b/bin/web
index 4d53319bc..2fd50cdf5 100755
--- a/bin/web
+++ b/bin/web
@@ -1,6 +1,4 @@
 #!/usr/local/bin/ruby
-if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] && !ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].empty?
-  %x{echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12}
-end
+`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
 
 exec "bundle exec puma -v -b tcp://0.0.0.0:3000"
diff --git a/bin/worker b/bin/worker
index 7698b346e..1ab592264 100755
--- a/bin/worker
+++ b/bin/worker
@@ -1,9 +1,7 @@
 #!/usr/local/bin/ruby
-if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] && !ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].empty?
-  %x{echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12}
-end
+`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
 
-if ENV['DATABASE_URL'] && !ENV['DATABASE_URL'].empty?
+if ENV['DATABASE_URL'].present?
   ENV['DATABASE_URL'] = ENV['DATABASE_URL'].gsub('pool=5', 'pool=30')
 else
   puts 'DATABASE_URL not set, no pool change needed'
diff --git a/config/application.rb b/config/application.rb
index 3b4f85fcb..d6356bc09 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -48,14 +48,15 @@ class Application < Rails::Application
     #
     #   This is a value that you want to set in the before_initialize block.
     class_attribute :user_devise_parameters, instance_accessor: false, default: [
-                      :database_authenticatable,
-                      :invitable,
-                      :registerable,
-                      :recoverable,
-                      :rememberable,
-                      :trackable,
-                      :validatable,
-                      :omniauthable, { omniauth_providers: %i[saml openid_connect cas] }]
+      :database_authenticatable,
+      :invitable,
+      :registerable,
+      :recoverable,
+      :rememberable,
+      :trackable,
+      :validatable,
+      :omniauthable, { omniauth_providers: %i[saml openid_connect cas] }
+    ]
 
     # @!endgroup Class Attributes
 
@@ -99,13 +100,12 @@ def self.path_for(relative_path)
       Rails.application.configure do
         process_jobs = ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_ELASTIC_JOBS', false))
         config.active_elastic_job.process_jobs = process_jobs
-        config.active_elastic_job.aws_credentials = lambda { Aws::InstanceProfileCredentials.new }
+        config.active_elastic_job.aws_credentials = -> { Aws::InstanceProfileCredentials.new }
         config.active_elastic_job.secret_key_base = Rails.application.secrets[:secret_key_base]
       end
     end
 
     config.to_prepare do
-
       # By default plain text files are not processed for text extraction.  In adding
       # Adventist::TextFileTextExtractionService to the beginning of the services array we are
       # enabling text extraction from plain text files.
@@ -146,7 +146,7 @@ def self.path_for(relative_path)
         Rails.application.configure do
           process_jobs = ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYKU_ELASTIC_JOBS', false))
           config.active_elastic_job.process_jobs = process_jobs
-          config.active_elastic_job.aws_credentials = lambda { Aws::InstanceProfileCredentials.new }
+          config.active_elastic_job.aws_credentials = -> { Aws::InstanceProfileCredentials.new }
           config.active_elastic_job.secret_key_base = Rails.application.secrets[:secret_key_base]
         end
       end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c6cf36d04..448ece68d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -4,12 +4,11 @@
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
-    config.cache_classes = !!Sidekiq.server?
-  else
-    config.cache_classes = false
-  end
-
+  config.cache_classes = if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
+                           !!Sidekiq.server?
+                         else
+                           false
+                         end
 
   # Do not eager load code on boot.
   config.eager_load = false
@@ -63,7 +62,7 @@
     config.logger = ActiveSupport::TaggedLogging.new(logger)
   end
 
-  config.active_job.queue_adapter     = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
+  config.active_job.queue_adapter = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 249a5507b..b6cdf3770 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -19,7 +19,7 @@
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
   config.public_file_server.headers = {
     'Cache-Control' => 'public, s-maxage=31536000, maxage=15552000',
-    'Expires' => "#{1.year.from_now.to_formatted_s(:rfc822)}"
+    'Expires' => 1.year.from_now.to_formatted_s(:rfc822).to_s
   }
   config.middleware.insert_before ActionDispatch::Static, NoCacheMiddleware, [/dashboard\/collections\/.*\/edit/, /uploaded_collection_thumbnails/]
   # Compress JavaScripts and CSS.
@@ -51,14 +51,14 @@
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  config.log_tags = [ :request_id ]
+  config.log_tags = [:request_id]
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   require 'active_job/queue_adapters/better_active_elastic_job_adapter'
-  config.active_job.queue_adapter     = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
+  config.active_job.queue_adapter = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
   # config.active_job.queue_name_prefix = "hyku_#{Rails.env}"
 
   if ENV['SMTP_ENABLED'].present? && ENV['SMTP_ENABLED'].to_s == 'true'
diff --git a/config/initializers/0db_created.rb b/config/initializers/0db_created.rb
index 8564f0161..ffd0e463c 100644
--- a/config/initializers/0db_created.rb
+++ b/config/initializers/0db_created.rb
@@ -1,3 +1,5 @@
 def db_created?
-  ::ActiveRecord::Base.connection_pool.with_connection(&:active?) rescue false
+  ::ActiveRecord::Base.connection_pool.with_connection(&:active?)
+rescue
+  false
 end
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 53934a77b..6acc1fd12 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -9,15 +9,14 @@
   # Apartment Configuration
   #
   Apartment.configure do |config|
-
     # Add any models that you do not want to be multi-tenanted, but remain in the global (public) namespace.
     # A typical example would be a Customer or Tenant model that stores each Tenant's information.
-    config.excluded_models = %w{ Account AccountCrossSearch DomainName Endpoint User UserStat SolrEndpoint FcrepoEndpoint RedisEndpoint GoodJob::Execution GoodJob::Job GoodJob::Process }
+    config.excluded_models = %w[Account AccountCrossSearch DomainName Endpoint User UserStat SolrEndpoint FcrepoEndpoint RedisEndpoint GoodJob::Execution GoodJob::Job GoodJob::Process]
 
     # In order to migrate all of your Tenants you need to provide a list of Tenant names to Apartment.
     # You can make this dynamic by providing a Proc object to be called on migrations.
     # This object should yield an array of strings representing each Tenant name.
-    config.tenant_names = lambda { Account.pluck :tenant }
+    config.tenant_names = -> { Account.pluck :tenant }
 
     #
     # ==> PostgreSQL only options
@@ -41,20 +40,18 @@
     # config.persistent_schemas = %w{ hstore }
     config.persistent_schemas = ['shared_extensions']
 
-
     # <== PostgreSQL only options
     #
-
   end
 
   Rails.application.config.after_initialize do
     # Callbacks from ActiveSupport::Callback: receives ZERO information about object/event.
     # Instead receives an [Apartment::Adapters::PostgresqlSchemaAdapter]
     # Therefore cannot be used as effectively as ActiveRecord hooks.
-    Apartment::Tenant.adapter.class.set_callback :switch, :after, ->() do
+    Apartment::Tenant.adapter.class.set_callback :switch, :after, lambda {
       account = Account.find_by(tenant: current)
       account.switch! if account
-    end
+    }
   end
 
   Rails.application.config.middleware.insert_before Warden::Manager, AccountElevator
diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb
index 1f2d38b28..035ad0f5a 100644
--- a/config/initializers/bulkrax.rb
+++ b/config/initializers/bulkrax.rb
@@ -53,7 +53,6 @@
     #   e.g. to exclude date
     #   config.field_mappings["Bulkrax::OaiDcParser"]["date"] = { from: ["date"], excluded: true  }
 
-
     default_field_mapping = {
       'abstract' => { from: ['abstract'], split: true },
       'alternative_title' => { from: ['alternative_title'], split: /\s*[|]\s*/ },
@@ -75,7 +74,7 @@
       'parents' => { from: ['parents'], related_parents_field_mapping: true },
       'publisher' => { from: ['publisher'], split: true },
       'related_url' => { from: ['related_url'], split: /\s* [|]\s*/ },
-      'remote_files' => { from: ['remote_files'], split: /\s*[|]\s*/},
+      'remote_files' => { from: ['remote_files'], split: /\s*[|]\s*/ },
       'resource_type' => { from: ['resource_type'], split: true },
       'rights_notes' => { from: ['rights_notes'], split: true },
       'source' => { from: ['source'], split: true },
@@ -84,24 +83,24 @@
     }
 
     config.field_mappings["Bulkrax::BagitParser"] = default_field_mapping.merge({
-      # add or remove custom mappings for this parser here
-    })
+                                                                                  # add or remove custom mappings for this parser here
+                                                                                })
 
     config.field_mappings["Bulkrax::CsvParser"] = default_field_mapping.merge({
-      # add or remove custom mappings for this parser here
-    })
+                                                                                # add or remove custom mappings for this parser here
+                                                                              })
 
     config.field_mappings["Bulkrax::OaiDcParser"] = default_field_mapping.merge({
-      # add or remove custom mappings for this parser here
-    })
+                                                                                  # add or remove custom mappings for this parser here
+                                                                                })
 
     config.field_mappings["Bulkrax::OaiQualifiedDcParser"] = default_field_mapping.merge({
-      # add or remove custom mappings for this parser here
-    })
+                                                                                           # add or remove custom mappings for this parser here
+                                                                                         })
 
     config.field_mappings["Bulkrax::XmlParser"] = default_field_mapping.merge({
-      # add or remove custom mappings for this parser here
-    })
+                                                                                # add or remove custom mappings for this parser here
+                                                                              })
 
     # To duplicate a set of mappings from one parser to another
     #   config.field_mappings["Bulkrax::OaiOmekaParser"] = {}
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 6658b94b0..1d86f3c3c 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -298,9 +298,9 @@
   identity_provider_id_regex = /\d+/
 
   [:cas, :openid_connect, :saml].each do |provider|
-    path_prefix =  "/users/auth/#{provider}"
+    path_prefix = "/users/auth/#{provider}"
     handler = OmniAuth::MultiProvider::Handler.new(path_prefix: path_prefix,
-      identity_provider_id_regex: identity_provider_id_regex,
+                                                   identity_provider_id_regex: identity_provider_id_regex,
       &dynamic_options_generator)
     static_options = { path_prefix: path_prefix }
 
diff --git a/config/initializers/file_set_derivatives_overrides.rb b/config/initializers/file_set_derivatives_overrides.rb
index af88c5318..ace70d032 100644
--- a/config/initializers/file_set_derivatives_overrides.rb
+++ b/config/initializers/file_set_derivatives_overrides.rb
@@ -4,7 +4,7 @@
 Hyrax::FileSetDerivativesService.class_eval do
   # @see https://github.com/samvera/hydra-derivatives/blob/main/lib/hydra/derivatives/processors/video/config.rb#L59
   DEFAULT_VIDEO_SIZE = '320x240'
-  
+
   # OVERRIDE: increase size of thumbnails for better viewing in Neutral theme home page
   def create_pdf_derivatives(filename)
     Hydra::Derivatives::PdfDerivatives.create(filename,
@@ -56,4 +56,4 @@ def create_video_derivatives(filename)
                                                           { label: 'mp4', format: 'mp4',
                                                             url: derivative_url('mp4') }])
   end
-end
\ No newline at end of file
+end
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 1269df850..6cd21a831 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -113,17 +113,17 @@
 
   # Temporary path to hold uploads before they are ingested into FCrepo.
   # This must be a lambda that returns a Pathname
-  config.upload_path = ->() do
+  config.upload_path = lambda {
     if Site.account&.s3_bucket
       "uploads/#{Apartment::Tenant.current}"
     else
       ENV['HYRAX_UPLOAD_PATH'].present? ? Pathname.new(File.join(ENV['HYRAX_UPLOAD_PATH'], Apartment::Tenant.current)) : Rails.root.join('public', 'uploads', Apartment::Tenant.current)
     end
-  end
+  }
 
   # Location on local file system where derivatives will be stored.
   # If you use a multi-server architecture, this MUST be a shared volume.
-  config.derivatives_path = ENV['HYRAX_DERIVATIVES_PATH'].present? ? ENV['HYRAX_DERIVATIVES_PATH'] :  File.join(Rails.root, 'tmp', 'derivatives')
+  config.derivatives_path = ENV['HYRAX_DERIVATIVES_PATH'].presence || File.join(Rails.root, 'tmp', 'derivatives')
 
   # Should schema.org microdata be displayed?
   # config.display_microdata = true
@@ -196,9 +196,7 @@
 Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority')
 
 # set bulkrax default work type to first curation_concern if it isn't already set
-if ENV.fetch('HYKU_BULKRAX_ENABLED', 'true') == 'true' && Bulkrax.default_work_type.blank?
-  Bulkrax.default_work_type = Hyrax.config.curation_concerns.first.to_s
-end
+Bulkrax.default_work_type = Hyrax.config.curation_concerns.first.to_s if ENV.fetch('HYKU_BULKRAX_ENABLED', 'true') == 'true' && Bulkrax.default_work_type.blank?
 
 Hyrax::IiifAv.config.iiif_av_viewer = :universal_viewer
 
diff --git a/config/initializers/mailboxer.rb b/config/initializers/mailboxer.rb
index 39bcf7b7d..f244e1996 100644
--- a/config/initializers/mailboxer.rb
+++ b/config/initializers/mailboxer.rb
@@ -1,21 +1,20 @@
 Mailboxer.setup do |config|
-
-  #Configures if you application uses or not email sending for Notifications and Messages
+  # Configures if you application uses or not email sending for Notifications and Messages
   config.uses_emails = true
 
-  #Configures the default from for emails sent for Messages and Notifications
+  # Configures the default from for emails sent for Messages and Notifications
   config.default_from = "no-reply@mailboxer.com"
 
-  #Configures the methods needed by mailboxer
+  # Configures the methods needed by mailboxer
   config.email_method = :mailboxer_email
   config.name_method = :name
 
-  #Configures if you use or not a search engine and which one you are using
-  #Supported engines: [:solr,:sphinx]
+  # Configures if you use or not a search engine and which one you are using
+  # Supported engines: [:solr,:sphinx]
   config.search_enabled = false
   config.search_engine = :solr
 
-  #Configures maximum length of the message subject and body
+  # Configures maximum length of the message subject and body
   config.subject_max_length = 255
-  config.body_max_length = 32000
+  config.body_max_length = 32_000
 end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 5894028a1..022642dff 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -5,4 +5,4 @@
 Mime::Type.register "application/n-triples", :nt
 Mime::Type.register "application/ld+json", :jsonld
 Mime::Type.register "text/turtle", :ttl
-Mime::Type.register 'application/x-endnote-refer', :endnote
\ No newline at end of file
+Mime::Type.register 'application/x-endnote-refer', :endnote
diff --git a/config/initializers/rolify.rb b/config/initializers/rolify.rb
index 71de17cad..b56270b50 100644
--- a/config/initializers/rolify.rb
+++ b/config/initializers/rolify.rb
@@ -1,2 +1,2 @@
 Rolify.configure do |config|
-end
\ No newline at end of file
+end
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 6e88cb0e5..8f26be3c3 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -171,7 +171,6 @@
   config.wrappers :inline,
     class: :input,
     hint_class: 'hint', error_class: 'field_with_errors' do |b|
-
     # mix in special behavior using `use :component`
     b.use :html5
     # b.use :placeholder
diff --git a/config/routes.rb b/config/routes.rb
index b3132ebde..cf42c9caa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,9 +2,7 @@
 
 # OVERRIDE Hyrax 2.9.0 to add featured collection routes
 
-if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
-  require 'sidekiq/web'
-end
+require 'sidekiq/web' if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
 
 Rails.application.routes.draw do # rubocop:disable Metrics/BlockLength
   resources :identity_providers
@@ -18,8 +16,8 @@
   authenticate :user, ->(u) { u.is_superadmin || u.is_admin } do
     queue = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')
     case queue
-      when 'sidekiq'
-        mount Sidekiq::Web => '/jobs'
+    when 'sidekiq'
+      mount Sidekiq::Web => '/jobs'
     when 'good_job'
       mount GoodJob::Engine => '/jobs'
     end
@@ -52,8 +50,8 @@
   root 'hyrax/homepage#index'
 
   devise_for :users, skip: [:omniauth_callbacks], controllers: { invitations: 'hyku/invitations',
-                                    registrations: 'hyku/registrations',
-                                    omniauth_callbacks: 'users/omniauth_callbacks' }
+                                                                 registrations: 'hyku/registrations',
+                                                                 omniauth_callbacks: 'users/omniauth_callbacks' }
   as :user do
     resources :single_signon, only: [:index]
 
diff --git a/config/spring.rb b/config/spring.rb
index c9119b40c..9fa7863f9 100644
--- a/config/spring.rb
+++ b/config/spring.rb
@@ -1,6 +1,6 @@
-%w(
+%w[
   .ruby-version
   .rbenv-vars
   tmp/restart.txt
   tmp/caching-dev.txt
-).each { |path| Spring.watch(path) }
+].each { |path| Spring.watch(path) }
diff --git a/lib/active_job_tenant.rb b/lib/active_job_tenant.rb
index ad99f3b35..1a79e6491 100644
--- a/lib/active_job_tenant.rb
+++ b/lib/active_job_tenant.rb
@@ -42,19 +42,19 @@ def perform_now
 
   private
 
-    delegate :non_tenant_job?, to: :class
+  delegate :non_tenant_job?, to: :class
 
-    def current_account
-      @current_account ||= Account.find_by(tenant: current_tenant)
-    end
+  def current_account
+    @current_account ||= Account.find_by(tenant: current_tenant)
+  end
 
-    def current_tenant
-      tenant || Apartment::Tenant.current
-    end
+  def current_tenant
+    tenant || Apartment::Tenant.current
+  end
 
-    def switch
-      Apartment::Tenant.switch(current_tenant) do
-        yield
-      end
+  def switch
+    Apartment::Tenant.switch(current_tenant) do
+      yield
     end
+  end
 end
diff --git a/lib/hydra/derivatives/processors/image_decorator.rb b/lib/hydra/derivatives/processors/image_decorator.rb
index 6c4d610af..4d58b0d8f 100644
--- a/lib/hydra/derivatives/processors/image_decorator.rb
+++ b/lib/hydra/derivatives/processors/image_decorator.rb
@@ -8,18 +8,18 @@ module Processors
       module ImageDecorator
         protected
 
-          # When resizing images, it is necessary to flatten any layers, otherwise the background
-          # may be completely black. This happens especially with PDFs. See https://github.com/samvera/hydra-derivatives/issues/110
-          def create_resized_image
-            create_image do |xfrm|
-              if size
-                xfrm.combine_options do |i|
-                  i.flatten
-                  i.resize(size)
-                end
+        # When resizing images, it is necessary to flatten any layers, otherwise the background
+        # may be completely black. This happens especially with PDFs. See https://github.com/samvera/hydra-derivatives/issues/110
+        def create_resized_image
+          create_image do |xfrm|
+            if size
+              xfrm.combine_options do |i|
+                i.flatten
+                i.resize(size)
               end
             end
           end
+        end
       end
     end
   end
diff --git a/lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb b/lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb
index 990bd1409..71918666c 100644
--- a/lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb
+++ b/lib/iiif_manifest/v3/manifest_builder/canvas_builder_decorator.rb
@@ -8,9 +8,7 @@ module ManifestBuilderDecorator
       module CanvasBuilderDecorator
         def apply_record_properties
           super
-          canvas.label = if record.to_s.present?
-                           ManifestBuilder.language_map(record['parent_title_tesim']&.first || record.to_s)
-                         end
+          canvas.label = (ManifestBuilder.language_map(record['parent_title_tesim']&.first || record.to_s) if record.to_s.present?)
         end
       end
     end
diff --git a/lib/importer/csv_importer.rb b/lib/importer/csv_importer.rb
index 3f2905fd3..97ae96aae 100644
--- a/lib/importer/csv_importer.rb
+++ b/lib/importer/csv_importer.rb
@@ -27,27 +27,27 @@ def import_all
 
     private
 
-      def parser
-        CSVParser.new(@metadata_file)
-      end
+    def parser
+      CSVParser.new(@metadata_file)
+    end
 
-      # @return [Class] the model class to be used
-      def factory_class(model)
-        return model if model.is_a?(Class)
-        if model.empty?
-          warn 'ERROR: No model was specified'
-          exit(1) # rubocop:disable Rails/Exit
-        end
-        return Factory.for(model.to_s) if model.respond_to?(:to_s)
-        raise "Unrecognized model type: #{model.class}"
+    # @return [Class] the model class to be used
+    def factory_class(model)
+      return model if model.is_a?(Class)
+      if model.empty?
+        warn 'ERROR: No model was specified'
+        exit(1) # rubocop:disable Rails/Exit
       end
+      return Factory.for(model.to_s) if model.respond_to?(:to_s)
+      raise "Unrecognized model type: #{model.class}"
+    end
 
-      # Build a factory to create the objects in fedora.
-      # @param [Hash<Symbol => String>] attributes
-      # @option attributes [String] :type overrides model for a single object
-      # @note remaining attributes are passed to factory constructor
-      def create_fedora_objects(attributes)
-        factory_class(attributes.delete(:type) || @model).new(attributes, @files_directory).run
-      end
+    # Build a factory to create the objects in fedora.
+    # @param [Hash<Symbol => String>] attributes
+    # @option attributes [String] :type overrides model for a single object
+    # @note remaining attributes are passed to factory constructor
+    def create_fedora_objects(attributes)
+      factory_class(attributes.delete(:type) || @model).new(attributes, @files_directory).run
+    end
   end
 end
diff --git a/lib/importer/csv_parser.rb b/lib/importer/csv_parser.rb
index 96941486a..fa15dd7c0 100644
--- a/lib/importer/csv_parser.rb
+++ b/lib/importer/csv_parser.rb
@@ -24,130 +24,128 @@ def each(&_block)
 
     private
 
-      # Match headers like "lc_subject_type"
-      def type_header_pattern
-        /\A.*_type\Z/
-      end
+    # Match headers like "lc_subject_type"
+    def type_header_pattern
+      /\A.*_type\Z/
+    end
 
-      def validate_headers(row)
-        row.compact!
-        difference = (row - valid_headers)
+    def validate_headers(row)
+      row.compact!
+      difference = (row - valid_headers)
 
-        # Allow headers with the pattern *_type to specify the
-        # record type for a local authority.
-        # e.g. For an author, author_type might be 'Person'.
-        difference.delete_if { |h| h.match(type_header_pattern) }
+      # Allow headers with the pattern *_type to specify the
+      # record type for a local authority.
+      # e.g. For an author, author_type might be 'Person'.
+      difference.delete_if { |h| h.match(type_header_pattern) }
 
-        raise "Invalid headers: #{difference.join(', ')}" if difference.present?
+      raise "Invalid headers: #{difference.join(', ')}" if difference.present?
 
-        validate_header_pairs(row)
-        row
-      end
+      validate_header_pairs(row)
+      row
+    end
 
-      # If you have a header like lc_subject_type, the next
-      # header must be the corresponding field (e.g. lc_subject)
-      def validate_header_pairs(row)
-        errors = []
-        row.each_with_index do |header, i|
-          next if header == 'resource_type'
-          next unless header.match(type_header_pattern)
-          next_header = row[i + 1]
-          field_name = header.gsub('_type', '')
-          if next_header != field_name
-            errors << "Invalid headers: '#{header}' column must be immediately followed by '#{field_name}' column."
-          end
-        end
-        raise errors.join(', ') if errors.present?
+    # If you have a header like lc_subject_type, the next
+    # header must be the corresponding field (e.g. lc_subject)
+    def validate_header_pairs(row)
+      errors = []
+      row.each_with_index do |header, i|
+        next if header == 'resource_type'
+        next unless header.match(type_header_pattern)
+        next_header = row[i + 1]
+        field_name = header.gsub('_type', '')
+        errors << "Invalid headers: '#{header}' column must be immediately followed by '#{field_name}' column." if next_header != field_name
       end
+      raise errors.join(', ') if errors.present?
+    end
 
-      def valid_headers
-        GenericWork.attribute_names + %w[id type file] + collection_headers
-      end
+    def valid_headers
+      GenericWork.attribute_names + %w[id type file] + collection_headers
+    end
 
-      def collection_headers
-        %w[collection_id collection_title collection_accession_number]
-      end
+    def collection_headers
+      %w[collection_id collection_title collection_accession_number]
+    end
 
-      def attributes(headers, row)
-        {}.tap do |processed|
-          headers.each_with_index do |header, index|
-            extract_field(header, row[index], processed)
-          end
+    def attributes(headers, row)
+      {}.tap do |processed|
+        headers.each_with_index do |header, index|
+          extract_field(header, row[index], processed)
         end
       end
+    end
 
-      def extract_field(header, val, processed)
-        return unless val
-        case header
-        when 'type', 'id'
-          # type and id are singular
-          processed[header.to_sym] = val
-        when /^(created|issued|date_copyrighted|date_valid)_(.*)$/
-          key = "#{Regexp.last_match(1)}_attributes".to_sym
-          # TODO: this only handles one date of each type
-          processed[key] ||= [{}]
-          update_date(processed[key].first, Regexp.last_match(2), val)
-        when 'resource_type'
-          extract_multi_value_field(header, val, processed)
-        when type_header_pattern
+    def extract_field(header, val, processed)
+      return unless val
+      case header
+      when 'type', 'id'
+        # type and id are singular
+        processed[header.to_sym] = val
+      when /^(created|issued|date_copyrighted|date_valid)_(.*)$/
+        key = "#{Regexp.last_match(1)}_attributes".to_sym
+        # TODO: this only handles one date of each type
+        processed[key] ||= [{}]
+        update_date(processed[key].first, Regexp.last_match(2), val)
+      when 'resource_type'
+        extract_multi_value_field(header, val, processed)
+      when type_header_pattern
+        update_typed_field(header, val, processed)
+      when /^contributor$/
+        update_contributor(header, val, processed)
+      when /^collection_(.*)$/
+        processed[:collection] ||= {}
+        update_collection(processed[:collection], Regexp.last_match(1), val)
+      else
+        last_entry = Array(processed[header.to_sym]).last
+        if last_entry.is_a?(Hash) && !last_entry[:name]
           update_typed_field(header, val, processed)
-        when /^contributor$/
-          update_contributor(header, val, processed)
-        when /^collection_(.*)$/
-          processed[:collection] ||= {}
-          update_collection(processed[:collection], Regexp.last_match(1), val)
         else
-          last_entry = Array(processed[header.to_sym]).last
-          if last_entry.is_a?(Hash) && !last_entry[:name]
-            update_typed_field(header, val, processed)
-          else
-            extract_multi_value_field(header, val, processed)
-          end
+          extract_multi_value_field(header, val, processed)
         end
       end
+    end
 
-      # Faking a typed field for now.
-      # TODO: support other types of contributors
-      def update_contributor(header, val, processed)
-        key = header.to_sym
-        processed[key] ||= []
-        processed[key] << { name: [val.strip] }
-      end
+    # Faking a typed field for now.
+    # TODO: support other types of contributors
+    def update_contributor(header, val, processed)
+      key = header.to_sym
+      processed[key] ||= []
+      processed[key] << { name: [val.strip] }
+    end
 
-      def extract_multi_value_field(header, val, processed, key = nil)
-        key ||= header.to_sym
-        processed[key] ||= []
-        val = val.strip
-        # Workaround for https://jira.duraspace.org/browse/FCREPO-2038
-        val.delete!("\r")
-        processed[key] << (looks_like_uri?(val) ? RDF::URI(val) : val)
-      end
+    def extract_multi_value_field(header, val, processed, key = nil)
+      key ||= header.to_sym
+      processed[key] ||= []
+      val = val.strip
+      # Workaround for https://jira.duraspace.org/browse/FCREPO-2038
+      val.delete!("\r")
+      processed[key] << (looks_like_uri?(val) ? RDF::URI(val) : val)
+    end
 
-      def looks_like_uri?(str)
-        str =~ %r{^https?://}
-      end
+    def looks_like_uri?(str)
+      str =~ %r{^https?://}
+    end
 
-      # Fields that have an associated *_type column
-      def update_typed_field(header, val, processed)
-        if header.match(type_header_pattern)
-          stripped_header = header.gsub('_type', '')
-          processed[stripped_header.to_sym] ||= []
-          processed[stripped_header.to_sym] << { type: val }
-        else
-          fields = Array(processed[header.to_sym])
-          fields.last[:name] = val
-        end
+    # Fields that have an associated *_type column
+    def update_typed_field(header, val, processed)
+      if header.match(type_header_pattern)
+        stripped_header = header.gsub('_type', '')
+        processed[stripped_header.to_sym] ||= []
+        processed[stripped_header.to_sym] << { type: val }
+      else
+        fields = Array(processed[header.to_sym])
+        fields.last[:name] = val
       end
+    end
 
-      def update_collection(collection, field, val)
-        val = [val] unless %w[admin_policy_id id].include? field
-        collection[field.to_sym] = val
-      end
+    def update_collection(collection, field, val)
+      val = [val] unless %w[admin_policy_id id].include? field
+      collection[field.to_sym] = val
+    end
 
-      def update_date(date, field, val)
-        date[field.to_sym] ||= []
-        date[field.to_sym] << val
-      end
+    def update_date(date, field, val)
+      date[field.to_sym] ||= []
+      date[field.to_sym] << val
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end
diff --git a/lib/importer/factory/object_factory.rb b/lib/importer/factory/object_factory.rb
index 228cfe322..2fa0bd1ed 100644
--- a/lib/importer/factory/object_factory.rb
+++ b/lib/importer/factory/object_factory.rb
@@ -94,64 +94,64 @@ def log_updated(obj)
 
       private
 
-        # @param [Hash] attrs the attributes to put in the environment
-        # @return [Hyrax::Actors::Environment]
-        def environment(attrs)
-          Hyrax::Actors::Environment.new(@object, Ability.new(User.batch_user), attrs)
-        end
+      # @param [Hash] attrs the attributes to put in the environment
+      # @return [Hyrax::Actors::Environment]
+      def environment(attrs)
+        Hyrax::Actors::Environment.new(@object, Ability.new(User.batch_user), attrs)
+      end
 
-        def work_actor
-          Hyrax::CurationConcern.actor
-        end
+      def work_actor
+        Hyrax::CurationConcern.actor
+      end
 
-        def create_collection(attrs)
-          @object.attributes = attrs
-          @object.apply_depositor_metadata(User.batch_user)
-          @object.save!
-        end
+      def create_collection(attrs)
+        @object.attributes = attrs
+        @object.apply_depositor_metadata(User.batch_user)
+        @object.save!
+      end
 
-        # Override if we need to map the attributes from the parser in
-        # a way that is compatible with how the factory needs them.
-        def transform_attributes
-          StringLiteralProcessor.process(attributes.slice(*permitted_attributes))
-                                .merge(file_attributes)
-        end
+      # Override if we need to map the attributes from the parser in
+      # a way that is compatible with how the factory needs them.
+      def transform_attributes
+        StringLiteralProcessor.process(attributes.slice(*permitted_attributes))
+                              .merge(file_attributes)
+      end
 
-        # Find existing file or upload new file. This assumes a Work will have unique file titles;
-        # could filter by URIs instead (slower).
-        # When an uploaded_file already exists we do not want to pass its id in `file_attributes`
-        # otherwise it gets reuploaded by `work_actor`.
-        def upload_ids
-          work_files_titles = object.file_sets.map(&:title) if object.present? && object.file_sets.present?
-          work_files_titles&.include?(attributes[:file]) ? [] : [import_file(file_paths.first)]
-        end
+      # Find existing file or upload new file. This assumes a Work will have unique file titles;
+      # could filter by URIs instead (slower).
+      # When an uploaded_file already exists we do not want to pass its id in `file_attributes`
+      # otherwise it gets reuploaded by `work_actor`.
+      def upload_ids
+        work_files_titles = object.file_sets.map(&:title) if object.present? && object.file_sets.present?
+        work_files_titles&.include?(attributes[:file]) ? [] : [import_file(file_paths.first)]
+      end
 
-        def file_attributes
-          hash = {}
-          hash[:uploaded_files] = upload_ids if files_directory.present? && attributes[:file].present?
-          hash[:remote_files] = attributes[:remote_files] if attributes[:remote_files].present?
-          hash
-        end
+      def file_attributes
+        hash = {}
+        hash[:uploaded_files] = upload_ids if files_directory.present? && attributes[:file].present?
+        hash[:remote_files] = attributes[:remote_files] if attributes[:remote_files].present?
+        hash
+      end
 
-        def file_paths
-          attributes[:file]&.map { |file_name| File.join(files_directory, file_name) }
-        end
+      def file_paths
+        attributes[:file]&.map { |file_name| File.join(files_directory, file_name) }
+      end
 
-        def import_file(path)
-          u = Hyrax::UploadedFile.new
-          u.user_id = User.find_by_user_key(User.batch_user_key).id if User.find_by_user_key(User.batch_user_key)
-          u.file = CarrierWave::SanitizedFile.new(path)
-          u.save
-          u.id
-        end
+      def import_file(path)
+        u = Hyrax::UploadedFile.new
+        u.user_id = User.find_by_user_key(User.batch_user_key).id if User.find_by_user_key(User.batch_user_key)
+        u.file = CarrierWave::SanitizedFile.new(path)
+        u.save
+        u.id
+      end
 
-        ## TO DO: handle invalid file in CSV
-        ## currently the importer stops if no file corresponding to a given file_name is found
+      ## TO DO: handle invalid file in CSV
+      ## currently the importer stops if no file corresponding to a given file_name is found
 
-        # Regardless of what the MODS Parser gives us, these are the properties we are prepared to accept.
-        def permitted_attributes
-          klass.properties.keys.map(&:to_sym) + %i[id edit_users edit_groups read_groups visibility]
-        end
+      # Regardless of what the MODS Parser gives us, these are the properties we are prepared to accept.
+      def permitted_attributes
+        klass.properties.keys.map(&:to_sym) + %i[id edit_users edit_groups read_groups visibility]
+      end
     end
   end
 end
diff --git a/lib/importer/factory/with_associated_collection.rb b/lib/importer/factory/with_associated_collection.rb
index cea1a2cf2..fe9c1f4c5 100644
--- a/lib/importer/factory/with_associated_collection.rb
+++ b/lib/importer/factory/with_associated_collection.rb
@@ -21,9 +21,9 @@ def update_attributes
 
       private
 
-        def collection
-          CollectionFactory.new(attributes.fetch(:collection)).find_or_create
-        end
+      def collection
+        CollectionFactory.new(attributes.fetch(:collection)).find_or_create
+      end
     end
   end
 end
diff --git a/lib/importer/mods_parser.rb b/lib/importer/mods_parser.rb
index 6dcc97152..93714d217 100644
--- a/lib/importer/mods_parser.rb
+++ b/lib/importer/mods_parser.rb
@@ -241,71 +241,71 @@ def notes
 
     private
 
-      def build_date(node)
-        finish = finish_point(node)
-        start = start_point(node)
-        dates = [{ start: start.map(&:text), finish: finish.map(&:text), label: date_label(node),
-                   start_qualifier: qualifier(start), finish_qualifier: qualifier(finish) }]
-        dates.delete_if { |date| date.values.all?(&:blank?) }
-        dates
-      end
+    def build_date(node)
+      finish = finish_point(node)
+      start = start_point(node)
+      dates = [{ start: start.map(&:text), finish: finish.map(&:text), label: date_label(node),
+                 start_qualifier: qualifier(start), finish_qualifier: qualifier(finish) }]
+      dates.delete_if { |date| date.values.all?(&:blank?) }
+      dates
+    end
 
-      def qualifier(nodes)
-        nodes.map { |node| node.attributes['qualifier'].try(:value) }.compact
-      end
+    def qualifier(nodes)
+      nodes.map { |node| node.attributes['qualifier'].try(:value) }.compact
+    end
 
-      def finish_point(node)
-        node.css('[point="end"]')
-      end
+    def finish_point(node)
+      node.css('[point="end"]')
+    end
 
-      def start_point(node)
-        node.css("[encoding]:not([point='end'])")
-      end
+    def start_point(node)
+      node.css("[encoding]:not([point='end'])")
+    end
 
-      def date_label(node)
-        node.css(':not([encoding])').map(&:text)
-      end
+    def date_label(node)
+      node.css(':not([encoding])').map(&:text)
+    end
 
-      def untyped_title
-        mods.xpath('/mods:mods/mods:titleInfo[not(@type)]/mods:title', NAMESPACES).map(&:text)
-      end
+    def untyped_title
+      mods.xpath('/mods:mods/mods:titleInfo[not(@type)]/mods:title', NAMESPACES).map(&:text)
+    end
 
-      def alt_title
-        Array(mods.xpath('//mods:titleInfo[@type]', NAMESPACES)).flat_map do |node|
-          type = node.attributes['type'].text
-          alternative = 'alternative'
+    def alt_title
+      Array(mods.xpath('//mods:titleInfo[@type]', NAMESPACES)).flat_map do |node|
+        type = node.attributes['type'].text
+        alternative = 'alternative'
 
-          node.title.map do |title|
-            value = title.text
-            warn_title_transform(type, value) unless type == alternative
-            value
-          end
+        node.title.map do |title|
+          value = title.text
+          warn_title_transform(type, value) unless type == alternative
+          value
         end
       end
+    end
 
-      def warn_title_tranform(type, value)
-        Rails.logger.warn "Transformtion: \"#{type} title\" will be stored as \"alternative title\": #{value}"
-      end
+    def warn_title_tranform(type, value)
+      Rails.logger.warn "Transformtion: \"#{type} title\" will be stored as \"alternative title\": #{value}"
+    end
 
-      def prepend_timestamp(text)
-        "#{Time.now.utc.to_s(:iso8601)} #{text}"
-      end
+    def prepend_timestamp(text)
+      "#{Time.now.utc.to_s(:iso8601)} #{text}"
+    end
 
-      def strip_whitespace(text)
-        text.tr("\n", ' ').delete("\t")
-      end
+    def strip_whitespace(text)
+      text.tr("\n", ' ').delete("\t")
+    end
 
-      def subject
-        query = '//mods:subject/mods:name/@valueURI|//mods:subject/mods:topic/@valueURI'
-        uris = mods.xpath(query, NAMESPACES).map { |uri| RDF::URI.new(uri) }
-        return uris unless uris.empty?
-        mods.subject.map do |sub|
-          text = sub.css('name namePart').text
-          secondary = sub.css('topic,genre').text
-          text += " -- #{secondary}" if secondary.present?
-          text
-        end
+    def subject
+      query = '//mods:subject/mods:name/@valueURI|//mods:subject/mods:topic/@valueURI'
+      uris = mods.xpath(query, NAMESPACES).map { |uri| RDF::URI.new(uri) }
+      return uris unless uris.empty?
+      mods.subject.map do |sub|
+        text = sub.css('name namePart').text
+        secondary = sub.css('topic,genre').text
+        text += " -- #{secondary}" if secondary.present?
+        text
       end
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end
diff --git a/lib/stanford/importer/mods_parser.rb b/lib/stanford/importer/mods_parser.rb
index ca9ca47c1..7d61b74de 100644
--- a/lib/stanford/importer/mods_parser.rb
+++ b/lib/stanford/importer/mods_parser.rb
@@ -30,14 +30,14 @@ def collection_id
 
       private
 
-        def identifier
-          id = File.basename(filename, '.mods').sub(/\Adruid_/, '')
-          { identifier: Array.wrap(id), id: id }
-        end
+      def identifier
+        id = File.basename(filename, '.mods').sub(/\Adruid_/, '')
+        { identifier: Array.wrap(id), id: id }
+      end
 
-        def open_access
-          { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
-        end
+      def open_access
+        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+      end
     end
   end
 end
diff --git a/lib/stanford/importer/purl_parser.rb b/lib/stanford/importer/purl_parser.rb
index 4fe36417e..314b32dcf 100644
--- a/lib/stanford/importer/purl_parser.rb
+++ b/lib/stanford/importer/purl_parser.rb
@@ -159,17 +159,17 @@ def collection_id
 
       private
 
-        def untyped_title
-          oai.xpath('./dc:title', DC_NS).map(&:text)
-        end
+      def untyped_title
+        oai.xpath('./dc:title', DC_NS).map(&:text)
+      end
 
-        def prepend_timestamp(text)
-          "#{Time.now.utc.to_s(:iso8601)} #{text}"
-        end
+      def prepend_timestamp(text)
+        "#{Time.now.utc.to_s(:iso8601)} #{text}"
+      end
 
-        def subject
-          oai.xpath('./dc:subject', DC_NS).map(&:text)
-        end
+      def subject
+        oai.xpath('./dc:subject', DC_NS).map(&:text)
+      end
     end
     # rubocop:enable Metrics/ClassLength
   end
diff --git a/lib/stanford/importer/purl_retriever.rb b/lib/stanford/importer/purl_retriever.rb
index 9977d2a85..373d5f7bb 100644
--- a/lib/stanford/importer/purl_retriever.rb
+++ b/lib/stanford/importer/purl_retriever.rb
@@ -17,16 +17,16 @@ def get
 
       private
 
-        def path
-          "/#{@druid}.xml"
-        end
+      def path
+        "/#{@druid}.xml"
+      end
 
-        def conn
-          @conn ||= Faraday.new(url: 'https://purl.stanford.edu') do |faraday|
-            faraday.adapter :httpclient
-            faraday.use Faraday::Response::RaiseError # raise exceptions on 40x, 50x responses
-          end
+      def conn
+        @conn ||= Faraday.new(url: 'https://purl.stanford.edu') do |faraday|
+          faraday.adapter :httpclient
+          faraday.use Faraday::Response::RaiseError # raise exceptions on 40x, 50x responses
         end
+      end
     end
   end
 end
diff --git a/spec/factories/admin_sets.rb b/spec/factories/admin_sets.rb
index fc084b80c..96cde0a62 100644
--- a/spec/factories/admin_sets.rb
+++ b/spec/factories/admin_sets.rb
@@ -16,9 +16,7 @@
         attributes[:manage_groups] = [Ability.admin_group_name]
         attributes[:deposit_groups] = ['work_editor', 'work_depositor']
         attributes[:view_groups] = ['work_editor']
-        if evaluator.with_permission_template.respond_to?(:merge)
-          attributes = evaluator.with_permission_template.merge(attributes)
-        end
+        attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
         # There is a unique constraint on permission_templates.source_id; I don't want to
         # create a permission template if one already exists for this admin_set
         create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: admin_set.id)
diff --git a/spec/factories/collection_types.rb b/spec/factories/collection_types.rb
index 85cb0b3c3..7211b5e0d 100644
--- a/spec/factories/collection_types.rb
+++ b/spec/factories/collection_types.rb
@@ -117,9 +117,7 @@
 
     # Workaround for upstream issue https://github.com/samvera/hyrax/issues/3136
     before(:create) do |collection_type|
-      if collection_type.title =~ /^translation missing/
-        collection_type.title = I18n.t(collection_type.title.gsub("translation missing: en.", ''))
-      end
+      collection_type.title = I18n.t(collection_type.title.gsub("translation missing: en.", '')) if /^translation missing/.match?(collection_type.title)
     end
   end
 
@@ -128,9 +126,7 @@
 
     # Workaround for upstream issue https://github.com/samvera/hyrax/issues/3136
     before(:create) do |collection_type|
-      if collection_type.title =~ /^translation missing/
-        collection_type.title = I18n.t(collection_type.title.gsub("translation missing: en.", ''))
-      end
+      collection_type.title = I18n.t(collection_type.title.gsub("translation missing: en.", '')) if /^translation missing/.match?(collection_type.title)
     end
   end
 end
diff --git a/spec/factories/collections.rb b/spec/factories/collections.rb
index 61583ed9a..ab4ed9e42 100644
--- a/spec/factories/collections.rb
+++ b/spec/factories/collections.rb
@@ -206,9 +206,7 @@
 
     before(:create) do |collection, evaluator|
       # force create a permission template if it doesn't exist for the newly created collection
-      unless evaluator.with_permission_template
-        CollectionLwFactoryHelper.process_with_permission_template(collection, evaluator, true)
-      end
+      CollectionLwFactoryHelper.process_with_permission_template(collection, evaluator, true) unless evaluator.with_permission_template
     end
 
     after(:create) do |collection, _evaluator|
@@ -279,9 +277,7 @@
       if evaluator.with_permission_template
         attributes = { source_id: collection.id }
         attributes[:manage_users] = [evaluator.user]
-        if evaluator.with_permission_template.respond_to?(:merge)
-          attributes = evaluator.with_permission_template.merge(attributes)
-        end
+        attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
         create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: collection.id)
       end
     end
@@ -384,12 +380,8 @@ def self.process_with_permission_template(collection, evaluator, force = false)
       # OVERRIDE: add default group PermissionTemplateAccess for collection roles
       attributes[:manage_groups] = group_managers(evaluator.with_permission_template)
       attributes[:view_groups] = group_viewers(evaluator.with_permission_template)
-      if evaluator.with_permission_template.respond_to?(:merge)
-        attributes = evaluator.with_permission_template.merge(attributes)
-      end
-      unless Hyrax::PermissionTemplate.find_by(source_id: collection.id) # rubocop:disable Style/GuardClause
-        FactoryBot.create(:permission_template, attributes)
-      end
+      attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
+      FactoryBot.create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: collection.id) # rubocop:disable Style/GuardClause
     end
 
     # Process the with_nesting_attributes transient property such that...
diff --git a/spec/factories/permission_templates.rb b/spec/factories/permission_templates.rb
index 5112ef46c..6d02a4312 100644
--- a/spec/factories/permission_templates.rb
+++ b/spec/factories/permission_templates.rb
@@ -49,24 +49,12 @@
         workflow = create(:workflow, active: true, permission_template: permission_template)
         create(:workflow_action, workflow: workflow) # Need to create a single action that can be taken
       end
-      if evaluator.manage_users.present?
-        AccessHelper.create_access(permission_template, 'user', :manage, evaluator.manage_users)
-      end
-      if evaluator.manage_groups.present?
-        AccessHelper.create_access(permission_template, 'group', :manage, evaluator.manage_groups)
-      end
-      if evaluator.deposit_users.present?
-        AccessHelper.create_access(permission_template, 'user', :deposit, evaluator.deposit_users)
-      end
-      if evaluator.deposit_groups.present?
-        AccessHelper.create_access(permission_template, 'group', :deposit, evaluator.deposit_groups)
-      end
-      if evaluator.view_users.present?
-        AccessHelper.create_access(permission_template, 'user', :view, evaluator.view_users)
-      end
-      if evaluator.view_groups.present?
-        AccessHelper.create_access(permission_template, 'group', :view, evaluator.view_groups)
-      end
+      AccessHelper.create_access(permission_template, 'user', :manage, evaluator.manage_users) if evaluator.manage_users.present?
+      AccessHelper.create_access(permission_template, 'group', :manage, evaluator.manage_groups) if evaluator.manage_groups.present?
+      AccessHelper.create_access(permission_template, 'user', :deposit, evaluator.deposit_users) if evaluator.deposit_users.present?
+      AccessHelper.create_access(permission_template, 'group', :deposit, evaluator.deposit_groups) if evaluator.deposit_groups.present?
+      AccessHelper.create_access(permission_template, 'user', :view, evaluator.view_users) if evaluator.view_users.present?
+      AccessHelper.create_access(permission_template, 'group', :view, evaluator.view_groups) if evaluator.view_groups.present?
     end
 
     transient do
diff --git a/spec/lib/importer/csv_importer_spec.rb b/spec/lib/importer/csv_importer_spec.rb
index 249704e17..5a7f699d3 100644
--- a/spec/lib/importer/csv_importer_spec.rb
+++ b/spec/lib/importer/csv_importer_spec.rb
@@ -11,7 +11,7 @@
     let(:fallback_class) { Class.new { def initialize(_argx, _argy); end } }
     let(:factory) { double(run: true) }
 
-    # note: 2 rows do not specify type, 17 do
+    # NOTE: 2 rows do not specify type, 17 do
     it 'creates new works' do
       expect(fallback_class).to receive(:new)
         .with(any_args).and_return(factory).twice
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 3f8e94c07..915081436 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -339,7 +339,7 @@
       it 'solr_endpoint' do
         account2 = described_class.new(name: 'other', solr_endpoint: endpoint)
         expect { account2.save }.to raise_error(ActiveRecord::RecordNotUnique)
-        # Note: this is different than just populating account2.errors, because it is a FK
+        # NOTE: this is different than just populating account2.errors, because it is a FK
       end
     end
   end
diff --git a/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb b/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
index 79fbf40e6..a6839c78d 100644
--- a/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
+++ b/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
@@ -21,7 +21,7 @@
     end
 
     it 'has the edit tab marked as active' do
-      expect(subject.select { |tab| tab.css_class == active_css_class && tab.action == action }.count).to be(1)
+      expect(subject.count { |tab| tab.css_class == active_css_class && tab.action == action }).to be(1)
     end
   end
 
@@ -37,7 +37,7 @@
     end
 
     it 'has the members tab marked as active' do
-      expect(subject.select { |tab| tab.css_class == active_css_class && tab.action == action }.count).to be(1)
+      expect(subject.count { |tab| tab.css_class == active_css_class && tab.action == action }).to be(1)
     end
   end
 
@@ -53,7 +53,7 @@
     end
 
     it 'has the roles tab marked as active' do
-      expect(subject.select { |tab| tab.css_class == active_css_class && tab.action == action }.count).to be(1)
+      expect(subject.count { |tab| tab.css_class == active_css_class && tab.action == action }).to be(1)
     end
   end
 
@@ -69,7 +69,7 @@
     end
 
     it 'has the remove tab marked as active' do
-      expect(subject.select { |tab| tab.css_class == active_css_class && tab.action == action }.count).to be(1)
+      expect(subject.count { |tab| tab.css_class == active_css_class && tab.action == action }).to be(1)
     end
   end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index efc9ff4e9..33c069b56 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -170,11 +170,9 @@
   end
 
   config.after do
-    begin
-      DatabaseCleaner.clean
-    rescue NoMethodError
-      'This can happen which the database is gone, which depends on load order of tests'
-    end
+    DatabaseCleaner.clean
+  rescue NoMethodError
+    'This can happen which the database is gone, which depends on load order of tests'
   end
 end
 
diff --git a/spec/views/account_sign_up/new.html.erb_spec.rb b/spec/views/account_sign_up/new.html.erb_spec.rb
index 917b0c5c9..ec7282d4d 100644
--- a/spec/views/account_sign_up/new.html.erb_spec.rb
+++ b/spec/views/account_sign_up/new.html.erb_spec.rb
@@ -4,7 +4,7 @@
   before do
     assign(:account, Account.new(
                        name: "MyString"
-    ))
+                     ))
   end
 
   it "renders new account form" do
diff --git a/spec/views/proprietor/accounts/new.html.erb_spec.rb b/spec/views/proprietor/accounts/new.html.erb_spec.rb
index cda7c343e..f61bd90e4 100644
--- a/spec/views/proprietor/accounts/new.html.erb_spec.rb
+++ b/spec/views/proprietor/accounts/new.html.erb_spec.rb
@@ -4,7 +4,7 @@
   before do
     assign(:account, Account.new(
                        name: "MyString"
-    ))
+                     ))
   end
 
   it "renders new account form" do
diff --git a/spec/views/proprietor/users/new.html.erb_spec.rb b/spec/views/proprietor/users/new.html.erb_spec.rb
index 3c071651b..a7b6d3732 100644
--- a/spec/views/proprietor/users/new.html.erb_spec.rb
+++ b/spec/views/proprietor/users/new.html.erb_spec.rb
@@ -28,7 +28,7 @@
                     zotero_token: "",
                     zotero_userid: "MyString",
                     preferred_locale: "MyString"
-    ))
+                  ))
   end
 
   it "renders new proprietor_user form" do
diff --git a/spec/views/proprietor/users/show.html.erb_spec.rb b/spec/views/proprietor/users/show.html.erb_spec.rb
index a1a8e6a1d..bbcfe9df7 100644
--- a/spec/views/proprietor/users/show.html.erb_spec.rb
+++ b/spec/views/proprietor/users/show.html.erb_spec.rb
@@ -28,7 +28,7 @@
                             zotero_token: "",
                             zotero_userid: "Zotero Userid",
                             preferred_locale: "Preferred Locale"
-    ))
+                          ))
   end
 
   it "renders attributes in <p>" do

From 6859d739cfd0684622819a703fe2856443759d8d Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 13 Dec 2023 15:23:35 -0800
Subject: [PATCH 068/126] =?UTF-8?q?=F0=9F=A7=B9=20Autocorrect=20frozen=20s?=
 =?UTF-8?q?tring=20literals?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```sh
rubocop --only Style/FrozenStringLiteralComment -A
```
---
 Rakefile                                                  | 2 ++
 app/controllers/hyrax/dashboard/collections_controller.rb | 2 ++
 bin/bundle                                                | 2 ++
 bin/extract_mods_to_spreadsheet                           | 2 ++
 bin/git-cleanup                                           | 1 +
 bin/graph                                                 | 1 +
 bin/import_from_csv                                       | 1 +
 bin/import_from_purl                                      | 1 +
 bin/import_mods_files                                     | 1 +
 bin/rails                                                 | 1 +
 bin/rake                                                  | 1 +
 bin/setup                                                 | 1 +
 bin/spring                                                | 1 +
 bin/update                                                | 1 +
 bin/web                                                   | 1 +
 bin/worker                                                | 1 +
 config/application.rb                                     | 1 +
 config/boot.rb                                            | 1 +
 config/environment.rb                                     | 1 +
 config/environments/development.rb                        | 1 +
 config/environments/production.rb                         | 1 +
 config/environments/test.rb                               | 1 +
 config/initializers/0db_created.rb                        | 1 +
 config/initializers/active_fedora_override.rb             | 1 +
 config/initializers/apartment.rb                          | 1 +
 config/initializers/apartment_activejob.rb                | 1 +
 config/initializers/application_controller_renderer.rb    | 1 +
 config/initializers/assets.rb                             | 1 +
 config/initializers/backtrace_silencers.rb                | 1 +
 config/initializers/clamav.rb                             | 1 +
 config/initializers/cookies_serializer.rb                 | 1 +
 config/initializers/devise.rb                             | 1 +
 config/initializers/file_set_derivatives_overrides.rb     | 1 +
 config/initializers/filter_parameter_logging.rb           | 1 +
 config/initializers/hydra_config.rb                       | 1 +
 config/initializers/hyrax.rb                              | 1 +
 config/initializers/iiif_print.rb                         | 1 +
 config/initializers/inflections.rb                        | 1 +
 config/initializers/mailboxer.rb                          | 1 +
 config/initializers/mime_types.rb                         | 1 +
 config/initializers/mini_magick.rb                        | 1 +
 config/initializers/new_framework_defaults.rb             | 1 +
 config/initializers/redis_config.rb                       | 1 +
 config/initializers/riiif.rb                              | 1 +
 config/initializers/rolify.rb                             | 1 +
 config/initializers/secure_headers.rb                     | 1 +
 config/initializers/session_store.rb                      | 1 +
 config/initializers/sidekiq.rb                            | 1 +
 config/initializers/simple_form.rb                        | 1 +
 config/initializers/simple_form_bootstrap.rb              | 2 ++
 config/initializers/stats_admin.rb                        | 2 ++
 config/initializers/version.rb                            | 4 +++-
 config/initializers/wrap_parameters.rb                    | 2 ++
 config/puma.rb                                            | 1 +
 config/spring.rb                                          | 1 +
 lib/tasks/rubocop.rake                                    | 1 +
 56 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index f55260d5d..8f8cb932c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
diff --git a/app/controllers/hyrax/dashboard/collections_controller.rb b/app/controllers/hyrax/dashboard/collections_controller.rb
index 67e9de1ec..613a34a8a 100644
--- a/app/controllers/hyrax/dashboard/collections_controller.rb
+++ b/app/controllers/hyrax/dashboard/collections_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # OVERRIDE Hyrax v3.4.2
 # - Fix file upload in logo and banner
 # - Use work titles for collection thumbnail select & to add an option to reset to the default thumbnail
diff --git a/bin/bundle b/bin/bundle
index 66e9889e8..282e7d515 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #!/usr/bin/env ruby
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/extract_mods_to_spreadsheet b/bin/extract_mods_to_spreadsheet
index 822c783b6..7998f57e8 100755
--- a/bin/extract_mods_to_spreadsheet
+++ b/bin/extract_mods_to_spreadsheet
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #!/usr/bin/env ruby
 
 # this script is intented to produce a sample spreadsheet from
diff --git a/bin/git-cleanup b/bin/git-cleanup
index 0b1fc6a35..42fda0768 100755
--- a/bin/git-cleanup
+++ b/bin/git-cleanup
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 `git fetch -ap`
 branches = `git branch --merged main`.split("\n").collect { |b| b.delete('*').strip }
 
diff --git a/bin/graph b/bin/graph
index 6ff6fa1e3..939279f7e 100644
--- a/bin/graph
+++ b/bin/graph
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # This script creates png images to visualize a Hyrax workflow
 # Usage: bin/graph <workflow_name>
diff --git a/bin/import_from_csv b/bin/import_from_csv
index f3fd50dbc..fb4faf3a0 100755
--- a/bin/import_from_csv
+++ b/bin/import_from_csv
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 def validate_hostname!(hostname)
   return if hostname
diff --git a/bin/import_from_purl b/bin/import_from_purl
index 9b6b214d0..4e0c00463 100755
--- a/bin/import_from_purl
+++ b/bin/import_from_purl
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 def validate_hostname!(hostname)
   return if hostname
diff --git a/bin/import_mods_files b/bin/import_mods_files
index 7398057c8..dd8cacdfa 100755
--- a/bin/import_mods_files
+++ b/bin/import_mods_files
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 def validate_hostname!(hostname)
   return if hostname
diff --git a/bin/rails b/bin/rails
index 073966023..dd027b406 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index 17240489f..609af7470 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run
diff --git a/bin/setup b/bin/setup
index e620b4dad..ffca742a1 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require 'pathname'
 require 'fileutils'
 include FileUtils
diff --git a/bin/spring b/bin/spring
index 7fe232c3a..99c5cacd8 100755
--- a/bin/spring
+++ b/bin/spring
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # This file loads spring without using Bundler, in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
diff --git a/bin/update b/bin/update
index a8e4462f2..3f81e5496 100755
--- a/bin/update
+++ b/bin/update
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require 'pathname'
 require 'fileutils'
 include FileUtils
diff --git a/bin/web b/bin/web
index 2fd50cdf5..46e648166 100755
--- a/bin/web
+++ b/bin/web
@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
+# frozen_string_literal: true
 `echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
 
 exec "bundle exec puma -v -b tcp://0.0.0.0:3000"
diff --git a/bin/worker b/bin/worker
index 1ab592264..b3cb34ce5 100755
--- a/bin/worker
+++ b/bin/worker
@@ -1,4 +1,5 @@
 #!/usr/local/bin/ruby
+# frozen_string_literal: true
 `echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
 
 if ENV['DATABASE_URL'].present?
diff --git a/config/application.rb b/config/application.rb
index d6356bc09..b8a43824d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'boot'
 require_relative '../app/middleware/no_cache_middleware'
 
diff --git a/config/boot.rb b/config/boot.rb
index 30f5120df..9be337a42 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index 426333bb4..12ea62f88 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Load the Rails application.
 require_relative 'application'
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 448ece68d..2f2bf2195 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b6cdf3770..e57bb998e 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 30587ef6d..416a71c86 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
diff --git a/config/initializers/0db_created.rb b/config/initializers/0db_created.rb
index ffd0e463c..8f4e56f85 100644
--- a/config/initializers/0db_created.rb
+++ b/config/initializers/0db_created.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 def db_created?
   ::ActiveRecord::Base.connection_pool.with_connection(&:active?)
 rescue
diff --git a/config/initializers/active_fedora_override.rb b/config/initializers/active_fedora_override.rb
index 58ec7fe04..e595997ae 100644
--- a/config/initializers/active_fedora_override.rb
+++ b/config/initializers/active_fedora_override.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Based on https://github.com/samvera/hyrax/issues/4581#issuecomment-843085122
 
 # Monkey-patch to short circuit ActiveModel::Dirty which attempts to load the whole master files ordered list when calling nodes_will_change!
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 6acc1fd12..e294580f0 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 if ENV['DB_ADAPTER'] != 'nulldb' && db_created?
   # You can have Apartment route to the appropriate Tenant by adding some Rack middleware.
   # Apartment can support many different "Elevators" that can take care of this routing to your data.
diff --git a/config/initializers/apartment_activejob.rb b/config/initializers/apartment_activejob.rb
index 6f2b410cf..9073c7400 100644
--- a/config/initializers/apartment_activejob.rb
+++ b/config/initializers/apartment_activejob.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_job'
 require 'active_job_tenant'
 
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
index 51639b67a..315ac48a9 100644
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # ApplicationController.renderer.defaults.merge!(
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 01ef3e663..9287bcd33 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 59385cdf3..d0f0d3b5d 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/clamav.rb b/config/initializers/clamav.rb
index 7cd26d6a2..7dcb60d7e 100644
--- a/config/initializers/clamav.rb
+++ b/config/initializers/clamav.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 ClamAV.instance.loaddb if defined? ClamAV
diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 5a6a32d37..2a7295959 100644
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Specify a serializer for the signed and encrypted cookie jars.
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 1d86f3c3c..cc50f1782 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
diff --git a/config/initializers/file_set_derivatives_overrides.rb b/config/initializers/file_set_derivatives_overrides.rb
index ace70d032..7ae9c0ade 100644
--- a/config/initializers/file_set_derivatives_overrides.rb
+++ b/config/initializers/file_set_derivatives_overrides.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file contains overrides to Hyrax::FileSetDerivativesService to increase the size of thumbnails
 
 # Hyrax v3.5.0
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 4a994e1e7..b7fe1231f 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
diff --git a/config/initializers/hydra_config.rb b/config/initializers/hydra_config.rb
index 35f9eccd6..42f406838 100644
--- a/config/initializers/hydra_config.rb
+++ b/config/initializers/hydra_config.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # windows doesn't properly require hydra-head (from the gemfile), so we need to require it explicitly here:
 require 'hydra/head' unless defined? Hydra
 
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 6cd21a831..6147b7b1f 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Set nested indexer to graph by default. Remove after Hyrax 4.0 upgrade
 ENV['HYRAX_USE_SOLR_GRAPH_NESTING'].present? || ENV['HYRAX_USE_SOLR_GRAPH_NESTING'] = "true"
 
diff --git a/config/initializers/iiif_print.rb b/config/initializers/iiif_print.rb
index c97d5bd58..b1b90418e 100644
--- a/config/initializers/iiif_print.rb
+++ b/config/initializers/iiif_print.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 IiifPrint.config do |config|
   # NOTE: WorkTypes and models are used synonymously here.
   # Add models to be excluded from search so the user
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index ac033bf9d..aa7435fbc 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections
diff --git a/config/initializers/mailboxer.rb b/config/initializers/mailboxer.rb
index f244e1996..b27f6d083 100644
--- a/config/initializers/mailboxer.rb
+++ b/config/initializers/mailboxer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Mailboxer.setup do |config|
   # Configures if you application uses or not email sending for Notifications and Messages
   config.uses_emails = true
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 022642dff..ec9f6f595 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
diff --git a/config/initializers/mini_magick.rb b/config/initializers/mini_magick.rb
index 4d73ff079..7fc113a30 100644
--- a/config/initializers/mini_magick.rb
+++ b/config/initializers/mini_magick.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'mini_magick'
 
 MiniMagick.configure do |config|
diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb
index 5c4156533..2543be7c8 100644
--- a/config/initializers/new_framework_defaults.rb
+++ b/config/initializers/new_framework_defaults.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 5.0 upgrade.
diff --git a/config/initializers/redis_config.rb b/config/initializers/redis_config.rb
index 19f95c33d..c1b32817e 100644
--- a/config/initializers/redis_config.rb
+++ b/config/initializers/redis_config.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 config = YAML.load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
 sentinels = config[:sentinel] && config[:sentinel][:host].present? ? { sentinels: [config[:sentinel]] } : {}
 redis_config = config.except(:sentinel).merge(thread_safe: true).merge(sentinels)
diff --git a/config/initializers/riiif.rb b/config/initializers/riiif.rb
index 9b7328ee2..9ff19b8ab 100644
--- a/config/initializers/riiif.rb
+++ b/config/initializers/riiif.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Riiif::Image.file_resolver = Riiif::HTTPFileResolver.new
 Riiif::Image.info_service = lambda do |id, _file|
   # id will look like a path to a pcdm:file
diff --git a/config/initializers/rolify.rb b/config/initializers/rolify.rb
index b56270b50..91ab2eaf7 100644
--- a/config/initializers/rolify.rb
+++ b/config/initializers/rolify.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 Rolify.configure do |config|
 end
diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index bda68ab4d..b0bb7b3e2 100644
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 SecureHeaders::Configuration.default do |config|
   config.cookies = {
     secure: ActiveRecord::Type::Boolean.new.cast(ENV.fetch('HYKU_SSL_CONFIGURED', false)) || SecureHeaders::OPT_OUT,
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index d7b7ec0c7..1075162f0 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_hyku_session'
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index dc3a30bae..71c430cf5 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
 
   config = YAML.load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 8f26be3c3..8b07d836e 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # NOTE: This is a modified version of simple_form's default config file.
 #       The only changes were to move the input to after the hint and error.
 
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index c5ee0408d..3098be131 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # NOTE: This is a modified version of simple_form's default config file.
 #       The only changes were to move the inputs to after the hints and errors.
 
diff --git a/config/initializers/stats_admin.rb b/config/initializers/stats_admin.rb
index 3b6767fb1..b7871feb0 100644
--- a/config/initializers/stats_admin.rb
+++ b/config/initializers/stats_admin.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- coding: utf-8 -*-
 module Hyrax
   class StatsAdmin
diff --git a/config/initializers/version.rb b/config/initializers/version.rb
index 65a71d0df..899b92b14 100644
--- a/config/initializers/version.rb
+++ b/config/initializers/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hyku
-  VERSION = '5.1.0'.freeze
+  VERSION = '5.1.0'
 end
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index bbfc3961b..2f3c0db47 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which
diff --git a/config/puma.rb b/config/puma.rb
index c7f311f81..14a0f440a 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
diff --git a/config/spring.rb b/config/spring.rb
index 9fa7863f9..240be63ab 100644
--- a/config/spring.rb
+++ b/config/spring.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 %w[
   .ruby-version
   .rbenv-vars
diff --git a/lib/tasks/rubocop.rake b/lib/tasks/rubocop.rake
index 64e964e6d..86de3ac8d 100644
--- a/lib/tasks/rubocop.rake
+++ b/lib/tasks/rubocop.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'rubocop/rake_task'
 

From 59626ef4dffb145b2ebf9de2673aac30b629b080 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 13 Dec 2023 16:12:57 -0800
Subject: [PATCH 069/126] =?UTF-8?q?=F0=9F=A7=B9=20Rubocop'd=20lengths=20an?=
 =?UTF-8?q?d=20other=20low=20hanging=20fruit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Various length metrics were disabled in this commit.  Also other various
cops that were easy to fix.
---
 app/controllers/catalog_controller.rb             |  2 ++
 .../concerns/hyrax/works_controller_behavior.rb   |  2 ++
 app/controllers/hyku/invitations_controller.rb    |  2 ++
 app/controllers/hyrax/contact_form_controller.rb  |  2 ++
 .../hyrax/dashboard/collections_controller.rb     | 15 +++++++++++----
 app/controllers/hyrax/homepage_controller.rb      |  2 ++
 app/controllers/proprietor/users_controller.rb    |  2 ++
 app/forms/hyrax/forms/admin/appearance.rb         |  2 ++
 app/models/account.rb                             |  2 ++
 app/models/concerns/account_settings.rb           |  6 ++++++
 app/models/concerns/account_switch.rb             |  4 +++-
 .../concerns/hyrax/ability/collection_ability.rb  |  6 ++++++
 .../hyrax/ability/solr_document_ability.rb        |  2 ++
 app/models/content_block.rb                       |  2 ++
 .../hyrax/iiif_av/displays_content_decorator.rb   |  2 ++
 .../hyrax/collection_types/create_service.rb      |  2 ++
 app/services/hyrax/workflow/permission_query.rb   | 12 +++++++-----
 app/services/roles_service.rb                     |  8 ++++++++
 config/application.rb                             |  4 ++--
 config/environments/development.rb                |  5 ++++-
 config/environments/production.rb                 |  3 +++
 config/initializers/bulkrax.rb                    |  2 ++
 config/initializers/devise.rb                     |  2 ++
 .../file_set_derivatives_overrides.rb             |  2 ++
 config/initializers/hyrax.rb                      |  4 +++-
 config/initializers/redis_config.rb               |  2 +-
 config/initializers/sidekiq.rb                    |  2 +-
 config/initializers/simple_form_bootstrap.rb      |  2 ++
 lib/importer/csv_parser.rb                        |  3 +++
 lib/importer/factory/object_factory.rb            |  2 ++
 lib/importer/mods_parser.rb                       |  2 ++
 .../provider/metadata_format/hyku_dublin_core.rb  |  4 ++++
 lib/oai/provider/model_decorator.rb               |  2 ++
 .../custom_queries/find_ids_by_model_decorator.rb |  3 ++-
 34 files changed, 102 insertions(+), 17 deletions(-)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index ebbb4bf82..ca0ce0738 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ClassLength, Metrics/BlockLength
 class CatalogController < ApplicationController
   include BlacklightAdvancedSearch::Controller
   include BlacklightRangeLimit::ControllerOverride
@@ -449,3 +450,4 @@ def show
     render json: @document.to_h
   end
 end
+# rubocop:enable Metrics/ClassLength, Metrics/BlockLength
diff --git a/app/controllers/concerns/hyrax/works_controller_behavior.rb b/app/controllers/concerns/hyrax/works_controller_behavior.rb
index a8f9fa914..8408d7eca 100644
--- a/app/controllers/concerns/hyrax/works_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/works_controller_behavior.rb
@@ -333,6 +333,7 @@ def decide_layout
     #   hopefully this can be refactored to be more reusable.
     #
     # Add uploaded_files to the parameters received by the actor.
+    # rubocop:disable Metrics/MethodLength
     def attributes_for_actor
       raw_params = params[hash_key_for_curation_concern]
       attributes = if raw_params
@@ -360,6 +361,7 @@ def attributes_for_actor
                                     browse_everything_urls
       attributes
     end
+    # rubocop:enable Metrics/MethodLength
 
     def after_create_response
       respond_to do |wants|
diff --git a/app/controllers/hyku/invitations_controller.rb b/app/controllers/hyku/invitations_controller.rb
index e08ae7b1a..68fe8d21e 100644
--- a/app/controllers/hyku/invitations_controller.rb
+++ b/app/controllers/hyku/invitations_controller.rb
@@ -10,6 +10,7 @@ def after_invite_path_for(_resource)
 
     # override the standard invite so that accounts are added properly
     # if they already exist on another tenant and invited if they do not
+    # rubocop:disable Metrics/AbcSize
     def create
       authorize! :grant_admin_role, User if params[:user][:role] == ::RolesService::ADMIN_ROLE
       self.resource = User.find_by(email: params[:user][:email]) || invite_resource
@@ -27,6 +28,7 @@ def create
         respond_with resource, location: after_invite_path_for(current_inviter, resource)
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     protected
 
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index c88b44ac3..e520429e5 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -46,6 +46,7 @@ def new
       @announcement_text = ContentBlock.for(:announcement)
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def create
       # not spam, form is valid, and captcha is valid
       @captcha.values[:category] = params[:contact_form][:category]
@@ -65,6 +66,7 @@ def create
     rescue RuntimeError => exception
       handle_create_exception(exception)
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def handle_create_exception(exception)
       logger.error("Contact form failed to send: #{exception.inspect}")
diff --git a/app/controllers/hyrax/dashboard/collections_controller.rb b/app/controllers/hyrax/dashboard/collections_controller.rb
index 613a34a8a..072caf38b 100644
--- a/app/controllers/hyrax/dashboard/collections_controller.rb
+++ b/app/controllers/hyrax/dashboard/collections_controller.rb
@@ -86,7 +86,7 @@ def edit
         form
         collection_type
         # Gets original filename of an uploaded thumbnail. See #update
-        if ::SolrDocument.find(@collection.id).thumbnail_path.include? "uploaded_collection_thumbnails" and uploaded_thumbnail?
+        if ::SolrDocument.find(@collection.id).thumbnail_path.include? "uploaded_collection_thumbnails" && uploaded_thumbnail?
           @thumbnail_filename = File.basename(uploaded_thumbnail_files.reject { |f| File.basename(f).include? @collection.id }.first)
         end
       end
@@ -209,17 +209,21 @@ def collection
       # Renders a JSON response with a list of files in this collection
       # This is used by the edit form to populate the thumbnail_id dropdown
       # OVERRIDE: Hyrax 2.9 to use work titles for collection thumbnail select & to add an option to reset to the default thumbnail
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def files
         params[:q] = '' unless params[:q]
         builder = Hyrax::CollectionMemberSearchBuilder.new(scope: self, collection: collection, search_includes_models: :works)
-        # get the default work image because we do not want to show any works in this dropdown that only have the default work image. this indicates that they have no files attached, and will throw an error if selected.
+        # get the default work image because we do not want to show any works in this
+        # dropdown that only have the default work image. this indicates that they have
+        # no files attached, and will throw an error if selected.
         default_work_thumbnail_path = Site.instance.default_work_image&.url.presence || ActionController::Base.helpers.image_path('default.png')
         work_with_no_files_thumbnail_path = ActionController::Base.helpers.image_path('work.png')
         response = repository.search(builder.where(params[:q]).query)
         # only return the works that have files, because these will be the only ones with a viable thumbnail
         result = response.documents.reject do |document|
-                   document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) || document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path)
-                 end .map do |document|
+                   document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) ||
+                     document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path)
+                 end.map do |document|
           { id: document["thumbnail_path_ss"].split('/').last.gsub(/\?.*/, ''), text: document["title_tesim"].first }
         end
         reset_thumbnail_option = {
@@ -229,6 +233,7 @@ def files
         result << reset_thumbnail_option
         render json: result
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       private
 
@@ -704,6 +709,7 @@ def after_update_errors(errors) # for valkyrie
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def process_uploaded_thumbnail(uploaded_file)
         dir_name = UploadedCollectionThumbnailPathService.upload_dir(@collection)
         saved_file = Rails.root.join(dir_name, uploaded_file.original_filename)
@@ -723,6 +729,7 @@ def process_uploaded_thumbnail(uploaded_file)
         File.chmod(0o664, "#{dir_name}/#{@collection.id}_thumbnail.jpg")
         File.chmod(0o664, "#{dir_name}/#{@collection.id}_card.jpg")
       end
+      # rubocop:enable Metrics/MethodLength
 
       ## OVERRIDE Hyrax 3.4.0 handle file locations
       def process_file_location(f)
diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
index 4039a14a3..67b0690f2 100644
--- a/app/controllers/hyrax/homepage_controller.rb
+++ b/app/controllers/hyrax/homepage_controller.rb
@@ -44,6 +44,7 @@ def search_builder_class
     layout 'homepage'
     helper Hyrax::ContentBlockHelper
 
+    # rubocop:disable Metrics/MethodLength
     def index
       # BEGIN copy Hyrax prime's Hyrax::HomepageController#index
       @presenter = presenter_class.new(current_ability, collections)
@@ -77,6 +78,7 @@ def index
         document_export_formats(format)
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def browserconfig; end
 
diff --git a/app/controllers/proprietor/users_controller.rb b/app/controllers/proprietor/users_controller.rb
index c8e160446..bcd44e7a5 100644
--- a/app/controllers/proprietor/users_controller.rb
+++ b/app/controllers/proprietor/users_controller.rb
@@ -87,6 +87,7 @@ def ensure_admin!
       authorize! :read, :admin_dashboard
     end
 
+    # rubocop:disable Metrics/MethodLength
     def user_params
       # remove blank passwords
       params[:user].delete(:password) if params[:user] && params[:user][:password].blank?
@@ -117,6 +118,7 @@ def user_params
                                    :preferred_locale,
                                    role_ids: [])
     end
+    # rubocop:enable Metrics/MethodLength
 
     def find_user
       @user ||= ::User.from_url_component(params[:id])
diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index 49428d012..da3b2802d 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -371,6 +371,7 @@ def update!
         end
 
         # A list of parameters that are related to customizations
+        # rubocop:disable Metrics/MethodLength
         def self.customization_params
           %i[
             body_font
@@ -400,6 +401,7 @@ def self.customization_params
             default_work_image_text
           ]
         end
+        # rubocop:enable Metrics/MethodLength
 
         def font_import_body_url
           body = body_font.split('|').first.to_s.tr(" ", "+")
diff --git a/app/models/account.rb b/app/models/account.rb
index 449795ac3..eef2a9571 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # Customer organization account
+# rubocop:disable Metrics/ClassLength
 class Account < ApplicationRecord
   include AccountEndpoints
   include AccountSettings
@@ -144,3 +145,4 @@ def cache_api?
     cache_api
   end
 end
+# rubocop:enable Metrics/ClassLength
diff --git a/app/models/concerns/account_settings.rb b/app/models/concerns/account_settings.rb
index a0fa4eaba..dcba12122 100644
--- a/app/models/concerns/account_settings.rb
+++ b/app/models/concerns/account_settings.rb
@@ -3,6 +3,7 @@
 # All settings have a presedence order as follows
 # Per Tenant Setting > ENV['HYKU_SETTING_NAME'] > ENV['HYRAX_SETTING_NAME'] > default
 
+# rubocop:disable Metrics/ModuleLength
 module AccountSettings
   extend ActiveSupport::Concern
   # rubocop:disable Metrics/BlockLength
@@ -79,6 +80,7 @@ def setting(name, args)
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def solr_collection_options
       {
         async: nil,
@@ -99,6 +101,7 @@ def solr_collection_options
         snitch: nil
       }
     end
+    # rubocop:disable Metrics/MethodLength
   end
   # rubocop:enable Metrics/BlockLength
 
@@ -154,6 +157,7 @@ def set_smtp_settings
     )
   end
 
+  # rubocop:disable Metrics/AbcSize
   def reload_library_config
     Hyrax.config do |config|
       config.contact_email = contact_email
@@ -188,4 +192,6 @@ def reload_library_config
     ActionMailer::Base.default_url_options ||= {}
     ActionMailer::Base.default_url_options[:protocol] = 'https'
   end
+  # rubocop:enable Metrics/AbcSize
 end
+# rubocop:enable Metrics/ModuleLength
diff --git a/app/models/concerns/account_switch.rb b/app/models/concerns/account_switch.rb
index 80fd4c30a..75e46077f 100644
--- a/app/models/concerns/account_switch.rb
+++ b/app/models/concerns/account_switch.rb
@@ -3,9 +3,10 @@
 module AccountSwitch
   extend ActiveSupport::Concern
 
-  DOMAIN_REGEXP = %r{^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,8}(:[0-9]{1,5})?(/.*)?$}ix
+  DOMAIN_REGEXP = %r{^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,8}(:[0-9]{1,5})?(/.*)?$}ix.freeze
 
   class_methods do
+    # rubocop:disable Metrics/MethodLength
     def switch!(cname_or_name_or_account)
       account = if cname_or_name_or_account.is_a?(Account)
                   cname_or_name_or_account
@@ -26,6 +27,7 @@ def switch!(cname_or_name_or_account)
         Rails.logger.info "It looks like we're in single tenant mode. No tenant found for #{cname_or_name_or_account}"
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 
   def switch!(cname_or_name_or_account)
diff --git a/app/models/concerns/hyrax/ability/collection_ability.rb b/app/models/concerns/hyrax/ability/collection_ability.rb
index 3af46e0c2..4f208b412 100644
--- a/app/models/concerns/hyrax/ability/collection_ability.rb
+++ b/app/models/concerns/hyrax/ability/collection_ability.rb
@@ -3,10 +3,13 @@
 # OVERRIDE Hyrax v3.4.2 Alter abilities for Groups with Roles feature
 module Hyrax
   module Ability
+    # rubocop:disable Metrics/ModuleLength
     module CollectionAbility
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/BlockLength
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
       def collection_abilities
         models = [Hyrax::PcdmCollection, Hyrax.config.collection_class].uniq
         if admin?
@@ -157,6 +160,9 @@ def collection_roles
       # rubocop:enable Metrics/MethodLength
       # rubocop:enable Metrics/BlockLength
       # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end
diff --git a/app/models/concerns/hyrax/ability/solr_document_ability.rb b/app/models/concerns/hyrax/ability/solr_document_ability.rb
index 2196f28bd..b3e5616e4 100644
--- a/app/models/concerns/hyrax/ability/solr_document_ability.rb
+++ b/app/models/concerns/hyrax/ability/solr_document_ability.rb
@@ -4,6 +4,7 @@
 module Hyrax
   module Ability
     module SolrDocumentAbility
+      # rubocop:disable Metrics/MethodLength
       def solr_document_abilities
         if admin?
           can [:manage], ::SolrDocument
@@ -27,6 +28,7 @@ def solr_document_abilities
           end
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end
diff --git a/app/models/content_block.rb b/app/models/content_block.rb
index 5b383f192..5cf86b992 100644
--- a/app/models/content_block.rb
+++ b/app/models/content_block.rb
@@ -2,6 +2,7 @@
 
 # OVERRIDE Hyrax v3.4.0 to add home_text to registry
 # and getter/setter methods - Adding themes
+# rubocop:disable Metrics/ClassLength
 class ContentBlock < ApplicationRecord
   # The keys in this registry are "public" names for collaborator
   # objects, and the values are reserved names of ContentBlock
@@ -159,3 +160,4 @@ def default_terms_text
     end
   end
 end
+# rubocop:enable Metrics/ClassLength
diff --git a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
index 7fa98752a..a3368e897 100644
--- a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
+++ b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
@@ -37,6 +37,7 @@ def image_content
         image_content_v3(url)
       end
 
+      # rubocop:disable Metrics/MethodLength
       def video_display_content(_url, label = '')
         width = solr_document.width&.try(:to_i) || 320
         height = solr_document.height&.try(:to_i) || 240
@@ -55,6 +56,7 @@ def video_display_content(_url, label = '')
           format: solr_document.mime_type
         )
       end
+      # rubocop:enable Metrics/MethodLength
 
       def audio_display_content(_url, label = '')
         duration = conformed_duration_in_seconds
diff --git a/app/services/hyrax/collection_types/create_service.rb b/app/services/hyrax/collection_types/create_service.rb
index 07891f9b3..16955ac6a 100644
--- a/app/services/hyrax/collection_types/create_service.rb
+++ b/app/services/hyrax/collection_types/create_service.rb
@@ -208,6 +208,7 @@ def self.create_user_collection_type
       #   The same values can be retrieved directly from a passed in ability.
       #   If calling from Abilities, pass the ability.
       #   If you try to get the ability from the user, you end up in an infinite loop.
+      # rubocop:disable Metrics/MethodLength
       def self.add_default_participants(collection_type_id)
         return unless collection_type_id
         default_participants = [{ agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
@@ -233,6 +234,7 @@ def self.add_default_participants(collection_type_id)
                                   end
         add_participants(collection_type_id, default_participants)
       end
+      # rubocop:enable Metrics/MethodLength
 
       ##
       # @api public
diff --git a/app/services/hyrax/workflow/permission_query.rb b/app/services/hyrax/workflow/permission_query.rb
index 8ac3f2ecd..6673c46b7 100644
--- a/app/services/hyrax/workflow/permission_query.rb
+++ b/app/services/hyrax/workflow/permission_query.rb
@@ -73,7 +73,7 @@ def scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
       # @param role [Object] that can be converted into a Sipity::Role
       # @return [ActiveRecord::Relation<Sipity::Agent>] augmented with
       #
-      def scope_agents_associated_with_entity_and_role(entity:, role:) # rubocop:disable Metrics/AbcSize
+      def scope_agents_associated_with_entity_and_role(entity:, role:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         entity = Sipity::Entity(entity)
         role = Sipity::Role(role)
 
@@ -196,7 +196,7 @@ def scope_processing_agents_for(user:)
       #
       # @return [ActiveRecord::Relation<Sipity::Entity>]
       #
-      def scope_entities_for_the_user(user:) # rubocop:disable Metrics/AbcSize
+      def scope_entities_for_the_user(user:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         entities = Sipity::Entity.arel_table
         workflow_state_actions = Sipity::WorkflowStateAction.arel_table
         workflow_states = Sipity::WorkflowState.arel_table
@@ -251,7 +251,7 @@ def scope_entities_for_the_user(user:) # rubocop:disable Metrics/AbcSize
       # @param entity an object that can be converted into a Sipity::Entity
       # @return [ActiveRecord::Relation<User>]
       #
-      def scope_users_for_entity_and_roles(entity:, roles:) # rubocop:disable Metrics/AbcSize
+      def scope_users_for_entity_and_roles(entity:, roles:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         entity = Sipity::Entity(entity)
         role_ids = Array.wrap(roles).map { |role| Sipity::Role(role).id }
         user_polymorphic_type = ::User.base_class
@@ -347,7 +347,7 @@ def scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
       # @param user [User]
       # @param entity an object that can be converted into a Sipity::Entity
       # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
-      def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:)
+      def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:) # rubocop:disable Metrics/MethodLength
         entity = Sipity::Entity(entity)
         agent_scope = scope_processing_agents_for(user: user)
 
@@ -366,6 +366,7 @@ def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:)
           )
         )
       end
+      # rubocop:enable Metrics/MethodLength
 
       # @api private
       #
@@ -386,7 +387,7 @@ def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:)
       # @param entity an object that can be converted into a Sipity::Entity
       # @return [ActiveRecord::Relation<Sipity::WorkflowStateAction>]
       #
-      def scope_permitted_entity_workflow_state_actions(user:, entity:)
+      def scope_permitted_entity_workflow_state_actions(user:, entity:) # rubocop:disable Metrics/MethodLength
         entity = Sipity::Entity(entity)
         workflow_state_actions = Sipity::WorkflowStateAction
         permissions = Sipity::WorkflowStateActionPermission
@@ -408,6 +409,7 @@ def scope_permitted_entity_workflow_state_actions(user:, entity:)
           )
         )
       end
+      # rubocop:enable Metrics/MethodLength
 
       # @api public
       #
diff --git a/app/services/roles_service.rb b/app/services/roles_service.rb
index 4c93997ec..49c670aa0 100644
--- a/app/services/roles_service.rb
+++ b/app/services/roles_service.rb
@@ -98,6 +98,7 @@ def create_default_hyrax_groups_with_roles!
     # Because each collection role has some level of access to every Collection within a tenant,
     # creating a Hyrax::PermissionTemplateAccess record (combined with Ability#user_groups)
     # means all Collections will show up in Blacklight / Solr queries.
+    # rubocop:disable Metrics/MethodLength
     def create_collection_accesses!
       Collection.find_each do |c|
         pt = Hyrax::PermissionTemplate.find_or_create_by!(source_id: c.id)
@@ -130,9 +131,11 @@ def create_collection_accesses!
         c.reset_access_controls! if pt.access_grants.count != original_access_grants_count
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Creating a Hyrax::PermissionTemplateAccess record (combined with Ability#user_groups)
     # will allow Works in all AdminSets to show up in Blacklight / Solr queries.
+    # rubocop:disable Metrics/MethodLength
     def create_admin_set_accesses!
       AdminSet.find_each do |as|
         pt = Hyrax::PermissionTemplate.find_or_create_by!(source_id: as.id)
@@ -165,6 +168,7 @@ def create_admin_set_accesses!
         as.reset_access_controls! if pt.access_grants.count != original_access_grants_count
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Because some of the collection roles have access to every Collection within a tenant, create a
     # Hyrax::CollectionTypeParticipant record for them on every Hyrax::CollectionType (except the AdminSet)
@@ -247,6 +251,7 @@ def prune_stale_guest_users
       end
     end
 
+    # rubocop:disable Metrics/MethodLength
     def seed_superadmin!
       return 'Seed data should not be used in the production environment' if Rails.env.production? || Rails.env.staging?
 
@@ -270,7 +275,9 @@ def seed_superadmin!
 
       user
     end
+    # rubocop:enable Metrics/MethodLength
 
+    # rubocop:disable Metrics/MethodLength
     def seed_qa_users!
       return 'Seed data should not be used in the production environment' if Rails.env.production? || Rails.env.staging?
 
@@ -298,5 +305,6 @@ def seed_qa_users!
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end
diff --git a/config/application.rb b/config/application.rb
index b8a43824d..060f1df9b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -63,10 +63,10 @@ class Application < Rails::Application
 
     # Add this line to load the lib folder first because we need
     # IiifPrint::SplitPdfs::AdventistPagesToJpgsSplitter
-    config.autoload_paths.unshift("#{Rails.root}/lib")
+    config.autoload_paths.unshift(Rails.root.join('lib'))
 
     # Add the middleware directory to the eager load paths
-    config.eager_load_paths << "#{Rails.root}/app/middleware"
+    config.eager_load_paths << Rails.root.join('app', 'middleware')
 
     ##
     # @api public
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 2f2bf2195..48d781838 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+
+# rubocop:disable Metrics/BlockLength
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -18,7 +20,7 @@
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  if Rails.root.join('tmp/caching-dev.txt').exist?
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
@@ -72,3 +74,4 @@
   # adding `.` wildcard to allow for subdomains
   config.hosts << "." + ENV['HYKU_ADMIN_HOST']
 end
+# rubocop:enable Metrics/BlockLength
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e57bb998e..9a3560f79 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+
+# rubocop:disable Metrics/BlockLength
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -114,3 +116,4 @@
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 end
+# rubocop:enable Metrics/BlockLength
diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb
index 035ad0f5a..c5525762d 100644
--- a/config/initializers/bulkrax.rb
+++ b/config/initializers/bulkrax.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 if ENV.fetch('HYKU_BULKRAX_ENABLED', 'true') == 'true'
+  # rubocop:disable Metrics/BlockLength
   Bulkrax.setup do |config|
     # Add local parsers
     # config.parsers += [
@@ -109,6 +110,7 @@
     # Properties that should not be used in imports/exports. They are reserved for use by Hyrax.
     # config.reserved_properties += ['my_field']
   end
+  # rubocop:enable Metrics/BlockLength
 
   Bulkrax::CreateRelationshipsJob.update_child_records_works_file_sets = true
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index cc50f1782..eb1ed09f6 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
+# rubocop:disable Metrics/BlockLength
 Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
@@ -331,3 +332,4 @@
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
 end
+# rubocop:enable Metrics/BlockLength
diff --git a/config/initializers/file_set_derivatives_overrides.rb b/config/initializers/file_set_derivatives_overrides.rb
index 7ae9c0ade..2ed39c172 100644
--- a/config/initializers/file_set_derivatives_overrides.rb
+++ b/config/initializers/file_set_derivatives_overrides.rb
@@ -2,6 +2,7 @@
 # This file contains overrides to Hyrax::FileSetDerivativesService to increase the size of thumbnails
 
 # Hyrax v3.5.0
+# rubocop:disable Metrics/BlockLength
 Hyrax::FileSetDerivativesService.class_eval do
   # @see https://github.com/samvera/hydra-derivatives/blob/main/lib/hydra/derivatives/processors/video/config.rb#L59
   DEFAULT_VIDEO_SIZE = '320x240'
@@ -58,3 +59,4 @@ def create_video_derivatives(filename)
                                                             url: derivative_url('mp4') }])
   end
 end
+# rubocop:enable Metrics/BlockLength
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 6147b7b1f..f8eced815 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -2,6 +2,7 @@
 # Set nested indexer to graph by default. Remove after Hyrax 4.0 upgrade
 ENV['HYRAX_USE_SOLR_GRAPH_NESTING'].present? || ENV['HYRAX_USE_SOLR_GRAPH_NESTING'] = "true"
 
+# rubocop:disable Metrics/BlockLength
 Hyrax.config do |config|
   config.register_curation_concern :generic_work
   # Injected via `rails g hyrax:work Image`
@@ -124,7 +125,7 @@
 
   # Location on local file system where derivatives will be stored.
   # If you use a multi-server architecture, this MUST be a shared volume.
-  config.derivatives_path = ENV['HYRAX_DERIVATIVES_PATH'].presence || File.join(Rails.root, 'tmp', 'derivatives')
+  config.derivatives_path = ENV['HYRAX_DERIVATIVES_PATH'].presence || Rails.root.join('tmp', 'derivatives').to_s
 
   # Should schema.org microdata be displayed?
   # config.display_microdata = true
@@ -189,6 +190,7 @@
     uri.sub(/\Ahttp:/, 'https:')
   end
 end
+# rubocop:enable Metrics/BlockLength
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
 
diff --git a/config/initializers/redis_config.rb b/config/initializers/redis_config.rb
index c1b32817e..772ddd2be 100644
--- a/config/initializers/redis_config.rb
+++ b/config/initializers/redis_config.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-config = YAML.load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
+config = YAML.safe_load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
 sentinels = config[:sentinel] && config[:sentinel][:host].present? ? { sentinels: [config[:sentinel]] } : {}
 redis_config = config.except(:sentinel).merge(thread_safe: true).merge(sentinels)
 require 'redis'
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 71c430cf5..1da002934 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 if ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq') == 'sidekiq'
 
-  config = YAML.load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
+  config = YAML.safe_load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
   redis_config = config.merge(thread_safe: true)
 
   Sidekiq.configure_server do |s|
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index 3098be131..25b4187d9 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -5,6 +5,7 @@
 
 # Use this setup block to configure all options available in SimpleForm.
 
+# rubocop:disable Metrics/BlockLength
 SimpleForm.setup do |config|
   config.error_notification_class = 'alert alert-danger'
   config.button_class = 'btn btn-default'
@@ -150,3 +151,4 @@
     time: :multi_select
   }
 end
+# rubocop:enable Metrics/BlockLength
diff --git a/lib/importer/csv_parser.rb b/lib/importer/csv_parser.rb
index fa15dd7c0..b992d3ab5 100644
--- a/lib/importer/csv_parser.rb
+++ b/lib/importer/csv_parser.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Importer
+  # rubocop:disable Metrics/ClassLength
   class CSVParser
     include Enumerable
 
@@ -74,6 +75,7 @@ def attributes(headers, row)
       end
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
     def extract_field(header, val, processed)
       return unless val
       case header
@@ -103,6 +105,7 @@ def extract_field(header, val, processed)
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity
 
     # Faking a typed field for now.
     # TODO: support other types of contributors
diff --git a/lib/importer/factory/object_factory.rb b/lib/importer/factory/object_factory.rb
index 2fa0bd1ed..1a1bbab92 100644
--- a/lib/importer/factory/object_factory.rb
+++ b/lib/importer/factory/object_factory.rb
@@ -3,6 +3,7 @@
 require 'importer/log_subscriber'
 module Importer
   module Factory
+    # rubocop:disable Metrics/ClassLength
     class ObjectFactory
       extend ActiveModel::Callbacks
       define_model_callbacks :save, :create
@@ -153,5 +154,6 @@ def permitted_attributes
         klass.properties.keys.map(&:to_sym) + %i[id edit_users edit_groups read_groups visibility]
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end
diff --git a/lib/importer/mods_parser.rb b/lib/importer/mods_parser.rb
index 93714d217..34c62cccb 100644
--- a/lib/importer/mods_parser.rb
+++ b/lib/importer/mods_parser.rb
@@ -79,6 +79,7 @@ def common_attributes
         .merge(relations)
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def description
       {
         title: untyped_title,
@@ -97,6 +98,7 @@ def description
         description_standard: mods.record_info.descriptionStandard.map(&:text)
       }
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     def language
       mods.language.languageTerm.map do |term|
diff --git a/lib/oai/provider/metadata_format/hyku_dublin_core.rb b/lib/oai/provider/metadata_format/hyku_dublin_core.rb
index f4c0bde37..e6a996397 100644
--- a/lib/oai/provider/metadata_format/hyku_dublin_core.rb
+++ b/lib/oai/provider/metadata_format/hyku_dublin_core.rb
@@ -21,6 +21,7 @@ def initialize
         end
 
         # Override to strip namespace and header out
+        # rubocop:disable Metrics/MethodLength
         def encode(model, record)
           xml = Builder::XmlMarkup.new
           map = model.respond_to?("map_#{prefix}") ? model.send("map_#{prefix}") : {}
@@ -41,7 +42,9 @@ def encode(model, record)
           end
           xml.target!
         end
+        # rubocop:enable Metrics/MethodLength
 
+        # rubocop:disable Metrics/MethodLength
         def add_public_file_urls(xml, record)
           return if record[:file_set_ids_ssim].blank?
 
@@ -61,6 +64,7 @@ def add_public_file_urls(xml, record)
             xml.tag! 'file_url', file_download_path
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def header_specification
           {
diff --git a/lib/oai/provider/model_decorator.rb b/lib/oai/provider/model_decorator.rb
index f84e239fb..25835b0d7 100644
--- a/lib/oai/provider/model_decorator.rb
+++ b/lib/oai/provider/model_decorator.rb
@@ -4,6 +4,7 @@ module OAI
   module Provider
     module ModelDecorator
       # Map Qualified Dublin Core (Terms) fields to PALNI/PALCI fields
+      # rubocop:disable Metrics/MethodLength
       def map_oai_hyku
         {
           abstract: :abstract,
@@ -33,6 +34,7 @@ def map_oai_hyku
           title: :title
         }
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end
diff --git a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
index 84e3b2c50..d54534924 100644
--- a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
+++ b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
@@ -15,7 +15,7 @@ module FindIdsByModelDecorator
       # @param ids [Enumerable<#to_s>, Symbol]
       #
       # @return [Enumerable<Valkyrie::ID>]
-      def find_ids_by_model(model:, ids: :all)
+      def find_ids_by_model(model:, ids: :all) # rubocop:disable Metrics/MethodLength
         return enum_for(:find_ids_by_model, model: model, ids: ids) unless block_given?
         model_name = ModelRegistry.lookup(model).model_name
 
@@ -37,6 +37,7 @@ def find_ids_by_model(model:, ids: :all)
           )['response']
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

From 306b89331f6ca82d110cdaf6af4ee20947a24c49 Mon Sep 17 00:00:00 2001
From: Shana Moore <shana@scientist.com>
Date: Thu, 14 Dec 2023 09:00:25 -0800
Subject: [PATCH 070/126] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20deprecated=20Bl?=
 =?UTF-8?q?acklight=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

removing the deprecated blacklight code allows the specs to run. We should consider if finding a replacement is necessary in the following ticket:

- https://github.com/scientist-softserv/hykuup_knapsack/issues/54

Issue:
- https://github.com/scientist-softserv/hykuup_knapsack/issues/35
---
 app/controllers/hyrax/contact_form_controller.rb | 1 -
 app/controllers/hyrax/homepage_controller.rb     | 1 -
 app/controllers/hyrax/pages_controller.rb        | 1 -
 app/controllers/search_history_controller.rb     | 1 -
 4 files changed, 4 deletions(-)

diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index 4e098736b..d0bed0992 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -11,7 +11,6 @@ class ContactFormController < ApplicationController
     # OVERRIDE: Hyrax v3.4.0 Add for theming
     # Adds Hydra behaviors into the application controller
     include Blacklight::SearchContext
-    include Blacklight::SearchHelper
     include Blacklight::AccessControls::Catalog
     before_action :build_contact_form
     layout 'homepage'
diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
index 67b0690f2..36f1e794f 100644
--- a/app/controllers/hyrax/homepage_controller.rb
+++ b/app/controllers/hyrax/homepage_controller.rb
@@ -27,7 +27,6 @@ module Hyrax
   class HomepageController < CatalogController
     # Adds Hydra behaviors into the application controller
     include Blacklight::SearchContext
-    include Blacklight::SearchHelper
     include Blacklight::AccessControls::Catalog
 
     # OVERRIDE: account for Hyku themes
diff --git a/app/controllers/hyrax/pages_controller.rb b/app/controllers/hyrax/pages_controller.rb
index 0107739fb..2d54917fe 100644
--- a/app/controllers/hyrax/pages_controller.rb
+++ b/app/controllers/hyrax/pages_controller.rb
@@ -15,7 +15,6 @@ class PagesController < ApplicationController
     # OVERRIDE: Hyrax v3.4.0 Add for theming
     # Adds Hydra behaviors into the application controller
     include Blacklight::SearchContext
-    include Blacklight::SearchHelper
     include Blacklight::AccessControls::Catalog
 
     # OVERRIDE: Adding inject theme views method for theming
diff --git a/app/controllers/search_history_controller.rb b/app/controllers/search_history_controller.rb
index a97b2e3ff..eb6c0983a 100644
--- a/app/controllers/search_history_controller.rb
+++ b/app/controllers/search_history_controller.rb
@@ -3,6 +3,5 @@
 class SearchHistoryController < ApplicationController
   include Blacklight::SearchHistory
   helper BlacklightAdvancedSearch::RenderConstraintsOverride
-  helper BlacklightRangeLimit::ViewHelperOverride
   helper RangeLimitHelper
 end

From 8b64bf80e33efa5e6d4225c00fa8dcd54fc9d2d2 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Thu, 14 Dec 2023 11:59:14 -0500
Subject: [PATCH 071/126] =?UTF-8?q?=F0=9F=A7=B9=20Avoid=20`#present=3F`=20?=
 =?UTF-8?q?in=20non-Rails=20situations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rails provides [`Object#present?`][1], which is a method that is not
generally available in Ruby.  However in the changed context, the
scripts do not have access to Rails methods.

By using this adjusted approach we favor baseline Ruby methods.

[1]: https://api.rubyonrails.org/classes/Object.html#method-i-present-3F
---
 bin/web    | 2 +-
 bin/worker | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/web b/bin/web
index 46e648166..2c4aeae24 100755
--- a/bin/web
+++ b/bin/web
@@ -1,5 +1,5 @@
 #!/usr/local/bin/ruby
 # frozen_string_literal: true
-`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
+`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` unless ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].to_s.strip.empty?
 
 exec "bundle exec puma -v -b tcp://0.0.0.0:3000"
diff --git a/bin/worker b/bin/worker
index b3cb34ce5..f6a61ee83 100755
--- a/bin/worker
+++ b/bin/worker
@@ -1,11 +1,11 @@
 #!/usr/local/bin/ruby
 # frozen_string_literal: true
-`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` if ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].present?
+`echo "$GOOGLE_OAUTH_PRIVATE_KEY_VALUE" | base64 -d > prod-cred.p12` unless ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'].to_s.strip.empty?
 
-if ENV['DATABASE_URL'].present?
-  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].gsub('pool=5', 'pool=30')
-else
+if ENV['DATABASE_URL'].to_s.strip.empty?
   puts 'DATABASE_URL not set, no pool change needed'
+else
+  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].gsub('pool=5', 'pool=30')
 end
 
 queue = ENV.fetch('HYRAX_ACTIVE_JOB_QUEUE', 'sidekiq')

From 4d291bb46d04e6ea5adddc32e2b8fda02808e6df Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Fri, 15 Dec 2023 10:19:55 -0500
Subject: [PATCH 072/126] =?UTF-8?q?=F0=9F=A7=B9=20Get=20Homepage=20Control?=
 =?UTF-8?q?ler=20specs=20passing=20(#2058)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refactor homepage controller to more closely align with Hyrax's
homepage controller.
Adjust theme views to render `modal` instead of `ajax_modal`.

refs: https://github.com/scientist-softserv/hykuup_knapsack/issues/56
---
 app/controllers/hyrax/homepage_controller.rb  |  54 +++++---
 .../layouts/hyrax.html.erb                    |   2 +-
 .../layouts/hyrax.html.erb                    |   2 +-
 .../hyrax/homepage_controller_spec.rb         | 127 ++++++++----------
 4 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
index 36f1e794f..45954860c 100644
--- a/app/controllers/hyrax/homepage_controller.rb
+++ b/app/controllers/hyrax/homepage_controller.rb
@@ -12,15 +12,17 @@
 #
 #########################################################################################
 #########################################################################################
-# OVERRIDE: Hyrax v2.9.0 to add home_text content block to the index method - Adding themes
-# OVERRIDE: Hyrax v2.9.0 from Hyrax v2.9.0 to add facets to home page - inheriting from
-# CatalogController rather than ApplicationController
-# OVERRIDE: Hyrax v2.9.0 from Hyrax v2.9.0 to add inject_theme_views method for theming
-# OVERRIDE: Hyrax v2.9.0 to add search_action_url method from Blacklight 6.23.0 to make facet links to go to /catalog
-# OVERRIDE: Hyrax v2.9.0 to add .sort_by to return collections in alphabetical order by title on the homepage
-# OVERRIDE: Hyrax v2.9.0 add all_collections page for IR theme
-# OVERRIDE: Hyrax v2.9.0 to add facet counts for resource types for IR theme
-# OVERRIDE: Hyrax v. 2.9.0 to add @featured_collection_list to index method
+
+# OVERRIDE: Hyrax v5.0.0
+# - add home_text content block to the index method - Adding themes
+# - add inject_theme_views method for theming
+# - add all_collections page for IR theme
+# - add facet counts for resource types for IR theme
+
+# - add facets to home page - inheriting from CatalogController rather than ApplicationController
+# - add search_action_url method from Blacklight 6.23.0 to make facet links to go to /catalog
+# - add .sort_by to return collections in alphabetical order by title on the homepage
+# - add @featured_collection_list to index method
 
 module Hyrax
   # Changed to inherit from CatalogController for home page facets
@@ -61,7 +63,7 @@ def index
 
       ir_counts if home_page_theme == 'institutional_repository'
 
-      (@response, @document_list) = search_results(params)
+      (@response, @document_list) = search_service.search_results
 
       respond_to do |format|
         format.html { store_preferred_view }
@@ -102,26 +104,28 @@ def search_action_url(options = {})
 
     private
 
-    # Return 6 collections
+    # Return 6 collections, sorts by title
     def collections(rows: 6)
-      builder = Hyrax::CollectionSearchBuilder.new(self)
-                                              .rows(rows)
-      response = repository.search(builder)
-      # adding .sort_by to return collections in alphabetical order by title on the homepage
-      response.documents.sort_by(&:title)
+    (response, documents) = Hyrax::CollectionsService.new(self).search_results do |builder|
+        builder.rows(rows)
+        builder.merge(sort: "title_ssi")
+      end
     rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
       []
     end
 
-    def recent
-      # grab any recent documents
-      (_, @recent_documents) = search_results(q: '', sort: sort_field, rows: 6)
+    # override to show 6 recent items
+    def recent(rows: 6)
+      (_, @recent_documents) = search_service.search_results do |builder|
+        builder.rows(rows)
+        builder.merge(sort: sort_field)
+      end
     rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
       @recent_documents = []
     end
 
     def ir_counts
-      @ir_counts = get_facet_field_response('resource_type_sim', {}, "f.resource_type_sim.facet.limit" => "-1")
+      @ir_counts = search_service.facet_field_response('resource_type_sim', "f.resource_type_sim.facet.limit" => "-1")
     end
 
     # COPIED from Hyrax::HomepageController
@@ -144,5 +148,15 @@ def inject_theme_views
         yield
       end
     end
+
+    # add this method to vary blacklight config and user_params
+    def search_service(*args)
+      Hyrax::SearchService.new(
+        config: ::CatalogController.new.blacklight_config, 
+        user_params: params.except(:q, :page), 
+        scope: self,
+        current_ability: current_ability,
+        search_builder_class: search_builder_class)
+    end
   end
 end
diff --git a/app/views/themes/cultural_repository/layouts/hyrax.html.erb b/app/views/themes/cultural_repository/layouts/hyrax.html.erb
index 889f1f02f..0b3f706cd 100644
--- a/app/views/themes/cultural_repository/layouts/hyrax.html.erb
+++ b/app/views/themes/cultural_repository/layouts/hyrax.html.erb
@@ -40,6 +40,6 @@
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
     <%= render '/shared/select_work_type_modal', create_work_presenter: @presenter&.create_work_presenter if @presenter&.draw_select_work_modal? %>
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>
\ No newline at end of file
diff --git a/app/views/themes/institutional_repository/layouts/hyrax.html.erb b/app/views/themes/institutional_repository/layouts/hyrax.html.erb
index b4f8de2e2..3b545a178 100644
--- a/app/views/themes/institutional_repository/layouts/hyrax.html.erb
+++ b/app/views/themes/institutional_repository/layouts/hyrax.html.erb
@@ -29,6 +29,6 @@
 
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
-    <%= render 'shared/ajax_modal' %>
+    <%= render 'shared/modal' %>
   </body>
 </html>
\ No newline at end of file
diff --git a/spec/controllers/hyrax/homepage_controller_spec.rb b/spec/controllers/hyrax/homepage_controller_spec.rb
index c58db28d4..06a1110e0 100644
--- a/spec/controllers/hyrax/homepage_controller_spec.rb
+++ b/spec/controllers/hyrax/homepage_controller_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
-
-# Copied from Hyrax v2.9.0 to add home_text content block to the index method - Adding themes
-RSpec.describe Hyrax::HomepageController, type: :controller, clean: true do
-  let(:routes) { Hyrax::Engine.routes }
+RSpec.describe Hyrax::HomepageController, type: :controller do
+  routes { Hyrax::Engine.routes }
 
   describe "#index" do
     let(:user) { create(:user) }
@@ -12,17 +10,11 @@
     end
 
     context 'with existing featured researcher' do
-      let!(:frodo) do
-        ContentBlock.create!(
-          name: ContentBlock::NAME_REGISTRY[:researcher],
-          value: 'Frodo Baggins',
-          created_at: Time.zone.now
-        )
-      end
+      let!(:frodo) { ContentBlock.create!(name: ContentBlock::NAME_REGISTRY[:researcher], value: 'Frodo Baggins', created_at: Time.zone.now) }
 
       it 'finds the featured researcher' do
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(assigns(:featured_researcher)).to eq frodo
       end
     end
@@ -30,7 +22,7 @@
     context 'with no featured researcher' do
       it "sets featured researcher" do
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
         assigns(:featured_researcher).tap do |researcher|
           expect(researcher).to be_kind_of ContentBlock
           expect(researcher.name).to eq 'featured_researcher'
@@ -40,56 +32,41 @@
 
     it "sets marketing text" do
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
       assigns(:marketing_text).tap do |marketing|
         expect(marketing).to be_kind_of ContentBlock
         expect(marketing.name).to eq 'marketing_text'
       end
     end
 
-    # override hyrax v2.9.0 added @home_text - Adding Themes
-    it "sets home page text" do
-      get :index
-      expect(response).to be_success
-      assigns(:home_text).tap do |home|
-        expect(home).to be_kind_of ContentBlock
-        expect(home.name).to eq 'home_text'
-      end
-    end
-
     it "does not include other user's private documents in recent documents" do
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
       titles = assigns(:recent_documents).map { |d| d['title_tesim'][0] }
       expect(titles).not_to include('Test Private Document')
     end
 
-    it "includes only GenericWork objects in recent documents" do
+    it "includes only Work objects in recent documents" do
       get :index
-      assigns(:recent_documents).each do |doc|
-        expect(doc["has_model_ssim"]).to eql ["GenericWork"]
-      end
+      expect(assigns(:recent_documents).all?(&:work?)).to eq true
     end
 
     context "with a document not created this second", clean_repo: true do
+      let(:work_1) { { id: 'work_1', has_model_ssim: 'GenericWork', read_access_person_ssim: user.user_key, date_uploaded_dtsi: 2.days.ago.iso8601 } }
+      let(:work_2) { { id: 'work_2', has_model_ssim: 'GenericWork', read_access_person_ssim: user.user_key, date_uploaded_dtsi: 4.days.ago.iso8601 } }
+      let(:work_3) { { id: 'work_3', has_model_ssim: 'Image', read_access_person_ssim: user.user_key, date_uploaded_dtsi: 3.days.ago.iso8601 } }
+
       before do
-        gw3 = GenericWork.new(title: ['Test 3 Document'], read_groups: ['public'])
-        gw3.apply_depositor_metadata('mjg36')
-        # stubbing to_solr so we know we have something that didn't create in the current second
-        old_to_solr = gw3.method(:to_solr)
-        allow(gw3).to receive(:to_solr) do
-          old_to_solr.call.merge(
-            "system_create_dtsi" => 1.day.ago.iso8601,
-            "date_uploaded_dtsi" => 1.day.ago.iso8601
-          )
+        [work_1, work_2, work_3].each do |obj|
+          Hyrax::SolrService.add(obj)
         end
-        gw3.save
+        Hyrax::SolrService.commit
       end
 
       it "sets recent documents in the right order" do
         get :index
-        expect(response).to be_success
-        expect(assigns(:recent_documents).length).to be <= 4
+        expect(response).to be_successful
+        expect(assigns(:recent_documents).length).to eq 3
         create_times = assigns(:recent_documents).map { |d| d['date_uploaded_dtsi'] }
         expect(create_times).to eq create_times.sort.reverse
       end
@@ -97,23 +74,21 @@
 
     context "with collections" do
       let(:presenter) { double }
-      let(:repository) { double }
-      let(:collection) { create(:collection) }
-      let(:collection_results) { double(documents: [collection]) }
+      # let(:repository) { double }
+      let(:collection_results) { double(documents: ['collection results']) }
 
       before do
-        allow(controller).to receive(:repository).and_return(repository)
+        # allow(controller).to receive(:repository).and_return(repository)
         allow(controller).to receive(:search_results).and_return([nil, ['recent document']])
-        allow(controller.repository).to receive(:search).with(an_instance_of(Hyrax::CollectionSearchBuilder))
-                                                        .and_return(collection_results)
+        allow_any_instance_of(Hyrax::CollectionsService).to receive(:search_results).and_return(collection_results.documents)
       end
 
       it "initializes the presenter with ability and a list of collections" do
-        expect(Hyrax::HomepagePresenter).to receive(:new).with(Ability,
-                                                               [collection])
-                                                         .and_return(presenter)
+        expect(Hyrax::HomepagePresenter).to receive(:new)
+                                        .with(controller.current_ability, ["collection results"])
+                                        .and_return(presenter)
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(assigns(:presenter)).to eq presenter
       end
     end
@@ -127,51 +102,63 @@
 
       it "sets featured works" do
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(assigns(:featured_work_list)).to be_kind_of FeaturedWorkList
       end
     end
 
     it "sets announcement content block" do
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
       assigns(:announcement_text).tap do |announcement|
         expect(announcement).to be_kind_of ContentBlock
         expect(announcement.name).to eq 'announcement_text'
       end
     end
 
-    xcontext "without solr" do # skip until and fix with ticket #301 https://gitlab.com/notch8/palni-palci/-/issues/301
+    xcontext "without solr" do # skip: see https://github.com/scientist-softserv/palni-palci/issues/154
       before do
-        allow(controller).to receive(:repository).and_return(instance_double(Blacklight::Solr::Repository))
-        allow(controller.repository).to receive(:search).and_raise Blacklight::Exceptions::InvalidRequest
+        allow_any_instance_of(Hyrax::SearchService).to receive(:search_results).and_raise Blacklight::Exceptions::InvalidRequest
       end
 
       it "errors gracefully" do
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(assigns(:admin_sets)).to be_blank
         expect(assigns(:recent_documents)).to be_blank
       end
     end
 
-    context 'with theming' do
-      it { is_expected.to use_around_action(:inject_theme_views) }
-    end
+    # specs for Hyku-only features
+    # override added @home_text - Adding Themes
+    describe 'Hyku exclusive features' do
+      it "sets home page text" do
+        get :index
+        expect(response).to be_successful
+        assigns(:home_text).tap do |home|
+          expect(home).to be_kind_of ContentBlock
+          expect(home.name).to eq 'home_text'
+        end
+      end
 
-    context 'with ir stats' do
-      before do
-        allow(controller).to receive(:home_page_theme).and_return('institutional_repository')
+      context 'with theming' do
+        it { is_expected.to use_around_action(:inject_theme_views) }
       end
-      # rubocop:disable RSpec/LetSetup
-      let!(:work_with_resource_type) { create(:work, user: user, resource_type: ['Article']) }
 
-      # rubocop:enable RSpec/LetSetup
+      context 'with ir stats' do
+        before do
+          allow(controller).to receive(:home_page_theme).and_return('institutional_repository')
+        end
+        # rubocop:disable RSpec/LetSetup
+        let!(:work_with_resource_type) { create(:work, user: user, resource_type: ['Article']) }
 
-      it 'gets the stats' do
-        get :index
-        expect(response).to be_success
-        expect(assigns(:ir_counts)['facet_counts']['facet_fields']['resource_type_sim']).to include('Article', 1)
+        # rubocop:enable RSpec/LetSetup
+
+        it 'gets the stats' do
+          get :index
+          expect(response).to be_successful
+          expect(assigns(:ir_counts)['facet_counts']['facet_fields']['resource_type_sim']).to include('Article', 1)
+        end
       end
     end
   end

From 2d00694b07f4f875ae56aceb0e25f41b4c041f0b Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:31:45 -0500
Subject: [PATCH 073/126] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Replace=20Homepage?=
 =?UTF-8?q?=20Presenter=20with=20decorator=20(#2059)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/presenters/hyrax/homepage_presenter.rb    | 74 -------------------
 .../hyrax/homepage_presenter_decorator.rb     | 29 ++++++++
 2 files changed, 29 insertions(+), 74 deletions(-)
 delete mode 100644 app/presenters/hyrax/homepage_presenter.rb
 create mode 100644 app/presenters/hyrax/homepage_presenter_decorator.rb

diff --git a/app/presenters/hyrax/homepage_presenter.rb b/app/presenters/hyrax/homepage_presenter.rb
deleted file mode 100644
index 2351f1195..000000000
--- a/app/presenters/hyrax/homepage_presenter.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE Hyrax 3.4.0 to add methods to:
-# hide featured researcher
-# hide featured works
-# hide recently uploaded
-# hide share button
-module Hyrax
-  class HomepagePresenter
-    class_attribute :create_work_presenter_class
-    self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
-    attr_reader :current_ability, :collections
-
-    def initialize(current_ability, collections)
-      @current_ability = current_ability
-      @collections = collections
-    end
-
-    # OVERRIDE: Hyrax v3.4.0 to removed: @return [Boolean] If the
-    #   display_share_button_when_not_logged_in? is activated, then
-    #   return true since we are utilizing the feature flipper
-    #   Flipflop.show_share_button? in Hyku.
-
-    # @return [Boolean] If the current user is a guest
-    #   and the feature flipper is enabled or if the signed in
-    #   user has permission to create at least one kind of work
-    #   and the feature flipper is enabled.
-
-    def display_share_button?
-      Flipflop.show_share_button? && current_ability.can_create_any_work? ||
-        Flipflop.show_share_button? && user_unregistered?
-    end
-
-    # A presenter for selecting a work type to create
-    # this is needed here because the selector is in the header on every page
-    def create_work_presenter
-      @create_work_presenter ||= create_work_presenter_class.new(current_ability.current_user)
-    end
-
-    def create_many_work_types?
-      create_work_presenter.many?
-    end
-
-    def draw_select_work_modal?
-      display_share_button? && create_many_work_types?
-    end
-
-    def first_work_type
-      create_work_presenter.first_model
-    end
-
-    # changed to add feature flag for featured researcher
-    def display_featured_researcher?
-      Flipflop.show_featured_researcher?
-    end
-
-    # changed to add feature flag for featured work
-    def display_featured_works?
-      Flipflop.show_featured_works?
-    end
-
-    # changed to add feature flag for recently uploaded
-    def display_recently_uploaded?
-      Flipflop.show_recently_uploaded?
-    end
-
-    private
-
-    def user_unregistered?
-      current_ability.current_user.new_record? ||
-        current_ability.current_user.guest?
-    end
-  end
-end
diff --git a/app/presenters/hyrax/homepage_presenter_decorator.rb b/app/presenters/hyrax/homepage_presenter_decorator.rb
new file mode 100644
index 000000000..d75740a20
--- /dev/null
+++ b/app/presenters/hyrax/homepage_presenter_decorator.rb
@@ -0,0 +1,29 @@
+# # frozen_string_literal: true
+
+# OVERRIDE Hyrax 5.0 to hide features via flipper
+# hide featured researcher
+# hide featured works
+# hide recently uploaded
+# hide share button
+module Hyrax
+  module HomepagePresenterDecorator
+    def display_share_button?
+      Flipflop.show_share_button? && current_ability.can_create_any_work? ||
+        Flipflop.show_share_button? && user_unregistered?
+    end
+
+    def display_featured_researcher?
+      Flipflop.show_featured_researcher?
+    end
+
+    def display_featured_works?
+      Flipflop.show_featured_works?
+    end
+
+    def display_recently_uploaded?
+      Flipflop.show_recently_uploaded?
+    end
+  end
+end
+
+Hyrax::HomepagePresenter.prepend(Hyrax::HomepagePresenterDecorator)

From 1bfe119fb9183aa19ec9d70750ddb1ab6671e3c8 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:37:39 -0500
Subject: [PATCH 074/126] =?UTF-8?q?=F0=9F=A7=B9Get=20CatalogController=20s?=
 =?UTF-8?q?pecs=20working=20(#2060)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/catalog_controller.rb       | 42 ++++++++-------------
 spec/controllers/catalog_controller_spec.rb |  2 +-
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index ca0ce0738..93d0ddf91 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -48,12 +48,9 @@ def self.uploaded_field
       suggester_name: 'iiifSuggester'
     }
 
-    config.view.gallery.partials = %i[index_header index]
-    config.view.masonry.partials = [:index]
-    config.view.slideshow.partials = [:index]
-
     config.show.tile_source_field = :content_metadata_image_iiif_info_ssm
     config.show.partials.insert(1, :openseadragon)
+
     # default advanced config values
     config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
     # config.advanced_search[:qt] ||= 'advanced'
@@ -69,6 +66,7 @@ def self.uploaded_field
 
     # Show gallery view
     config.view.gallery.partials = %i[index_header index]
+    config.view.masonry.partials = [:index]
     config.view.slideshow.partials = [:index]
 
     # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
@@ -97,6 +95,18 @@ def self.uploaded_field
     config.index.display_type_field = 'has_model_ssim'
     config.index.thumbnail_field = 'thumbnail_path_ss'
 
+    # Blacklight 7 additions
+    config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_results_collection_tool(:sort_widget)
+    config.add_results_collection_tool(:per_page_widget)
+    config.add_results_collection_tool(:view_type_group)
+    config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
+    config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
+    config.add_show_tools_partial(:citation)
+    config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
+    config.add_nav_action(:search_history, partial: 'blacklight/nav/search_history')
+
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
     config.add_facet_field 'human_readable_type_sim', label: "Type", limit: 5
@@ -114,31 +124,12 @@ def self.uploaded_field
     # TODO: deal with part of facet changes
     # config.add_facet_field solr_name("part", :facetable), limit: 5, label: 'Part'
     # config.add_facet_field solr_name("part_of", :facetable), limit: 5
-    # removed # config.add_facet_field solr_name("file_format", :facetable), limit: 5
-    # removed # config.add_facet_field solr_name("contributor", :facetable), label: "Contributor", limit: 5
-    # remvode config.add_facet_field solr_name("refereed", :facetable), limit: 5
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
-    # TODO: ROB
-    #     # Prior to this change, the applications specific translations were not loaded. Dogbiscuits were assuming the translations were already loaded.
-    #     Rails.root.glob("config/locales/*.yml").each do |path|
-    #       I18n.load_path << path.to_s
-    #     end
-    #     I18n.backend.reload!
-    #     index_props = DogBiscuits.config.index_properties.collect do |prop|
-    #       { prop => index_options(prop, DogBiscuits.config.property_mappings[prop]) }
-    #     end
-    #     add_index_field config, index_props
-
-    # solr fields to be displayed in the show (single result) view
-    #   The ordering of the field names is the order of the display
-    # show_props = DogBiscuits.config.all_properties
-    # add_show_field config, show_props
-
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
     config.add_index_field 'title_tesim', label: "Title", itemprop: 'name', if: false
@@ -203,8 +194,7 @@ def self.uploaded_field
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', label: 'All Fields', include_in_advanced_search: false) do |field|
       all_names = config.show_fields.values.map(&:field).join(" ")
-      # TODO: ROB all_names = (config.show_fields.values.map { |v| v.field.to_s } +
-      #         DogBiscuits.config.all_properties.map { |p| "#{p}_tesim" }).uniq.join(" ")
+
       title_name = 'title_tesim'
       field.solr_parameters = {
         qf: "#{all_names} file_format_tesim all_text_timv",
@@ -446,7 +436,7 @@ def self.uploaded_field
 
   # This is overridden just to give us a JSON response for debugging.
   def show
-    _, @document = fetch params[:id]
+    _, @document = search_service.fetch(params[:id])
     render json: @document.to_h
   end
 end
diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb
index f1c3e9c39..0da2bd571 100644
--- a/spec/controllers/catalog_controller_spec.rb
+++ b/spec/controllers/catalog_controller_spec.rb
@@ -13,7 +13,7 @@
       it "is successful" do
         get :show, params: { id: file_set }
         expect(response).to be_successful
-        expect(response.content_type).to eq 'application/json'
+        expect(response.content_type).to eq "application/json; charset=utf-8"
       end
     end
 

From 76010a4c41c059ea1630f8f47c938c071deeb1f1 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:49:08 -0500
Subject: [PATCH 075/126] =?UTF-8?q?=F0=9F=A7=B9=20Hyrax=205=20get=20additi?=
 =?UTF-8?q?onal=20specs=20passing=20(#2062)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹 Get chrome.hyku.test working

* 🧹 Get SitesControllerSpecs working

 File fixtures were broken.
 Ref https://github.com/scientist-softserv/hykuup_knapsack/issues/56

* 🧹 Remove google analytics from config reload

This is a piece of a fix for analytics that came in via
https://github.com/scientist-softserv/palni-palci/pull/946

Additional backporting of analytics work is still needed, but this
fixes numerous specs so it is being pulled in earlier.

* 🧹 Update ruby version for circleci

* 🧹 Update rails version for circleci
---
 .circleci/config.yml                    |  8 ++++----
 app/models/concerns/account_settings.rb |  2 --
 spec/rails_helper.rb                    |  5 ++---
 spec/support/fixtures.rb                | 13 -------------
 4 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 spec/support/fixtures.rb

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f08b5735..84e0cf65b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,13 +10,13 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.7.8
+        default: 3.2.2
       bundler_version:
         type: string
         default: 2.4.8
       rails_version:
         type: string
-        default: '5.1.6'
+        default: '6.1.7.6'
       solr_config_path:
         type: string
       fcrepo_version:
@@ -95,6 +95,6 @@ workflows:
   ci:
     jobs:
       - bundle:
-          ruby_version: "2.7.8"
-          name: "ruby2-7-8"
+          ruby_version: "3.2.2"
+          name: "ruby3-2-2"
           solr_config_path: 'solr/conf'
diff --git a/app/models/concerns/account_settings.rb b/app/models/concerns/account_settings.rb
index dcba12122..54d8df829 100644
--- a/app/models/concerns/account_settings.rb
+++ b/app/models/concerns/account_settings.rb
@@ -161,8 +161,6 @@ def set_smtp_settings
   def reload_library_config
     Hyrax.config do |config|
       config.contact_email = contact_email
-      config.analytics = google_analytics_id.present?
-      config.google_analytics_id = google_analytics_id if google_analytics_id.present?
       config.geonames_username = geonames_username
       config.uploader[:maxFileSize] = file_size_limit
     end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 33c069b56..e67ad2d18 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -62,8 +62,7 @@
 ENV['WEB_HOST'] ||= `hostname -s`.strip
 
 if ENV['CHROME_HOSTNAME'].present?
-  options = Selenium::WebDriver::Options.chrome(args: ["headless",
-                                                       "disable-gpu",
+  options = Selenium::WebDriver::Options.chrome(args: ["disable-gpu",
                                                        "no-sandbox",
                                                        "whitelisted-ips",
                                                        "window-size=1400,1400"])
@@ -105,6 +104,7 @@
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.file_fixture_path = "#{::Rails.root}/spec/fixtures"
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -132,7 +132,6 @@
   # config.filter_gems_from_backtrace("gem name")
 
   config.include Devise::Test::ControllerHelpers, type: :controller
-  config.include Fixtures::FixtureFileUpload
   config.include FactoryBot::Syntax::Methods
   config.include ApplicationHelper, type: :view
   config.include Warden::Test::Helpers, type: :feature
diff --git a/spec/support/fixtures.rb b/spec/support/fixtures.rb
deleted file mode 100644
index 2843b3645..000000000
--- a/spec/support/fixtures.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Fixtures
-  module FixtureFileUpload
-    def fixture_file(path)
-      File.open(fixture_file_path(path))
-    end
-
-    def fixture_file_path(path)
-      Rails.root + 'spec/fixtures' + path
-    end
-  end
-end

From 2cad6b28002fd30c5fa891424c7b7dc8017b421c Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:47:21 -0500
Subject: [PATCH 076/126] =?UTF-8?q?=F0=9F=A7=B9Database=20migration=20&=20?=
 =?UTF-8?q?schema=20update=20(#2063)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For table hyrax_counter_metrics
---
 ...5705_create_hyrax_counter_metrics.hyrax.rb | 14 +++++++++++++
 ...15215706_change_work_id_to_string.hyrax.rb |  5 +++++
 ..._indices_to_hyrax_counter_metrics.hyrax.rb |  8 +++++++
 ...5708_add_fields_to_counter_metric.hyrax.rb |  8 +++++++
 db/schema.rb                                  | 21 ++++++++++++++++++-
 5 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20231215215705_create_hyrax_counter_metrics.hyrax.rb
 create mode 100644 db/migrate/20231215215706_change_work_id_to_string.hyrax.rb
 create mode 100644 db/migrate/20231215215707_add_indices_to_hyrax_counter_metrics.hyrax.rb
 create mode 100644 db/migrate/20231215215708_add_fields_to_counter_metric.hyrax.rb

diff --git a/db/migrate/20231215215705_create_hyrax_counter_metrics.hyrax.rb b/db/migrate/20231215215705_create_hyrax_counter_metrics.hyrax.rb
new file mode 100644
index 000000000..80caf88c1
--- /dev/null
+++ b/db/migrate/20231215215705_create_hyrax_counter_metrics.hyrax.rb
@@ -0,0 +1,14 @@
+class CreateHyraxCounterMetrics < ActiveRecord::Migration[6.1]
+  def change
+    create_table :hyrax_counter_metrics do |t|
+      t.string :worktype
+      t.string :resource_type
+      t.integer :work_id
+      t.date :date
+      t.integer :total_item_investigations
+      t.integer :total_item_requests
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20231215215706_change_work_id_to_string.hyrax.rb b/db/migrate/20231215215706_change_work_id_to_string.hyrax.rb
new file mode 100644
index 000000000..1cdb92a36
--- /dev/null
+++ b/db/migrate/20231215215706_change_work_id_to_string.hyrax.rb
@@ -0,0 +1,5 @@
+class ChangeWorkIdToString < ActiveRecord::Migration[6.1]
+  def change
+    change_column :hyrax_counter_metrics, :work_id, :string
+  end
+end
diff --git a/db/migrate/20231215215707_add_indices_to_hyrax_counter_metrics.hyrax.rb b/db/migrate/20231215215707_add_indices_to_hyrax_counter_metrics.hyrax.rb
new file mode 100644
index 000000000..b71e0977b
--- /dev/null
+++ b/db/migrate/20231215215707_add_indices_to_hyrax_counter_metrics.hyrax.rb
@@ -0,0 +1,8 @@
+class AddIndicesToHyraxCounterMetrics < ActiveRecord::Migration[6.1]
+  def change
+    add_index :hyrax_counter_metrics, :worktype
+    add_index :hyrax_counter_metrics, :resource_type
+    add_index :hyrax_counter_metrics, :work_id
+    add_index :hyrax_counter_metrics, :date
+  end
+end
diff --git a/db/migrate/20231215215708_add_fields_to_counter_metric.hyrax.rb b/db/migrate/20231215215708_add_fields_to_counter_metric.hyrax.rb
new file mode 100644
index 000000000..7b2ec02fa
--- /dev/null
+++ b/db/migrate/20231215215708_add_fields_to_counter_metric.hyrax.rb
@@ -0,0 +1,8 @@
+class AddFieldsToCounterMetric < ActiveRecord::Migration[6.1]
+  def change
+    add_column :hyrax_counter_metrics, :title, :string
+    add_column :hyrax_counter_metrics, :year_of_publication, :integer, index: true
+    add_column :hyrax_counter_metrics, :publisher, :string, index: true
+    add_column :hyrax_counter_metrics, :author, :string, index: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f65809e9f..7d5629751 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_08_04_073106) do
+ActiveRecord::Schema.define(version: 2023_12_15_215708) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "hstore"
@@ -372,6 +372,25 @@
     t.index ["machine_id"], name: "index_hyrax_collection_types_on_machine_id", unique: true
   end
 
+  create_table "hyrax_counter_metrics", force: :cascade do |t|
+    t.string "worktype"
+    t.string "resource_type"
+    t.string "work_id"
+    t.date "date"
+    t.integer "total_item_investigations"
+    t.integer "total_item_requests"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.string "title"
+    t.integer "year_of_publication"
+    t.string "publisher"
+    t.string "author"
+    t.index ["date"], name: "index_hyrax_counter_metrics_on_date"
+    t.index ["resource_type"], name: "index_hyrax_counter_metrics_on_resource_type"
+    t.index ["work_id"], name: "index_hyrax_counter_metrics_on_work_id"
+    t.index ["worktype"], name: "index_hyrax_counter_metrics_on_worktype"
+  end
+
   create_table "hyrax_default_administrative_set", force: :cascade do |t|
     t.string "default_admin_set_id", null: false
     t.datetime "created_at", null: false

From cd3b05948479b612eaab552870159a0d26e53ac3 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Fri, 15 Dec 2023 19:14:28 -0500
Subject: [PATCH 077/126] =?UTF-8?q?=F0=9F=A7=B9=20Fix=20Hyrax=205=20remain?=
 =?UTF-8?q?ing=20controller=20spec=20failures=20(#2064)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹Remove ActiveFedora monkeypatch

* 🧹Fix file fixture
---
 config/initializers/active_fedora_override.rb        | 12 ------------
 .../hyrax/generic_works_controller_spec.rb           |  4 +++-
 spec/controllers/hyrax/images_controller_spec.rb     |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 config/initializers/active_fedora_override.rb

diff --git a/config/initializers/active_fedora_override.rb b/config/initializers/active_fedora_override.rb
deleted file mode 100644
index e595997ae..000000000
--- a/config/initializers/active_fedora_override.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-# Based on https://github.com/samvera/hyrax/issues/4581#issuecomment-843085122
-
-# Monkey-patch to short circuit ActiveModel::Dirty which attempts to load the whole master files ordered list when calling nodes_will_change!
-# This leads to a stack level too deep exception when attempting to delete a master file from a media object on the manage files step.
-# See https://github.com/samvera/active_fedora/pull/1312/commits/7c8bbbefdacefd655a2ca653f5950c991e1dc999#diff-28356c4daa0d55cbaf97e4269869f510R100-R103
-ActiveFedora::Aggregation::ListSource.class_eval do
-  def attribute_will_change!(attr)
-    return super unless attr == 'nodes'
-    attributes_changed_by_setter[:nodes] = true
-  end
-end
diff --git a/spec/controllers/hyrax/generic_works_controller_spec.rb b/spec/controllers/hyrax/generic_works_controller_spec.rb
index 741963ed2..65d075285 100644
--- a/spec/controllers/hyrax/generic_works_controller_spec.rb
+++ b/spec/controllers/hyrax/generic_works_controller_spec.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rails_helper'
+
 RSpec.describe Hyrax::GenericWorksController do
   let(:user) { FactoryBot.create(:user) }
   let(:work) { FactoryBot.create(:work_with_one_file, user: user) }
@@ -7,7 +9,7 @@
 
   before do
     Hydra::Works::AddFileToFileSet.call(file_set,
-                                        fixture_file('images/world.png'),
+                                        fixture_file_upload('images/world.png'),
                                         :original_file)
   end
 
diff --git a/spec/controllers/hyrax/images_controller_spec.rb b/spec/controllers/hyrax/images_controller_spec.rb
index e0b2b42b6..06b48c7c4 100644
--- a/spec/controllers/hyrax/images_controller_spec.rb
+++ b/spec/controllers/hyrax/images_controller_spec.rb
@@ -12,7 +12,7 @@
 
   before do
     Hydra::Works::AddFileToFileSet.call(file_set,
-                                        fixture_file('images/world.png'),
+                                        fixture_file_upload('images/world.png'),
                                         :original_file)
   end
 

From 67f316353c057713c194ce13fc58deb38cee993e Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Fri, 15 Dec 2023 17:42:53 -0800
Subject: [PATCH 078/126] =?UTF-8?q?=F0=9F=A7=B9=20Upgrade=20views=20from?=
 =?UTF-8?q?=20Bootstrap=203=20to=204?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit is a first swing of upgrading all the views from Bootstrap 3
to 4.  There's still a lot of work to be done to make the views look
good but this is a good first step.
---
 app/views/_admin_util_links.html.erb          |  16 +-
 app/views/_logo.html.erb                      |  20 +--
 app/views/_masthead.html.erb                  |  26 ++--
 app/views/_user_util_links.html.erb           |  36 +++--
 app/views/account_sign_up/new.html.erb        |  10 +-
 app/views/admin/accounts/edit.html.erb        |  10 +-
 app/views/admin/groups/_form.html.erb         |   8 +-
 app/views/admin/groups/_nav.html.erb          |   8 +-
 app/views/admin/groups/_per_page.html.erb     |   4 +-
 app/views/admin/groups/_search.html.erb       |   8 +-
 app/views/admin/groups/index.html.erb         |  20 +--
 app/views/admin/groups/new.html.erb           |  18 +--
 app/views/admin/groups/remove.html.erb        |  10 +-
 app/views/admin/groups/roles.html.erb         | 119 +++++++--------
 app/views/admin/groups/users.html.erb         |  28 ++--
 app/views/admin/work_types/edit.html.erb      |  12 +-
 .../advanced/_advanced_search_help.html.erb   |  34 ++---
 ..._index_gallery_collection_wrapper.html.erb |   4 +-
 .../_index_header_list_collection.html.erb    |   8 +-
 .../_index_header_list_default.html.erb       |  16 +-
 .../_thumbnail_list_collection.html.erb       |   2 +-
 app/views/devise/passwords/new.html.erb       |  10 +-
 app/views/devise/registrations/new.html.erb   |  28 ++--
 .../registrations/registrations/new.html.erb  |  36 +++--
 app/views/devise/sessions/new.html.erb        |  49 +++---
 .../_form_participant_table.html.erb          |  74 ++++-----
 .../admin_sets/_form_participants.html.erb    |  24 +--
 .../appearances/_banner_image_form.html.erb   |  13 +-
 .../admin/appearances/_color_input.html.erb   |   2 +-
 .../appearances/_custom_css_form.html.erb     |   8 +-
 .../appearances/_default_colors_form.html.erb |   8 +-
 .../appearances/_default_fonts_form.html.erb  |  12 +-
 .../appearances/_default_images_form.html.erb |  14 +-
 .../_directory_image_form.html.erb            |  12 +-
 .../admin/appearances/_favicon_form.html.erb  |  12 +-
 .../appearances/_logo_image_form.html.erb     |  12 +-
 .../admin/appearances/_theme_form.html.erb    |  22 +--
 .../hyrax/admin/appearances/show.html.erb     |  56 +++----
 .../_form_participants.html.erb               |  10 +-
 app/views/hyrax/admin/stats/show.html.erb     |  41 ++---
 app/views/hyrax/admin/users/index.html.erb    |  14 +-
 .../hyrax/admin/workflow_roles/index.html.erb |  42 +++---
 app/views/hyrax/base/_form_share.html.erb     |   8 +-
 app/views/hyrax/base/_show_actions.html.erb   |  18 +--
 app/views/hyrax/base/show.html.erb            |  24 +--
 app/views/hyrax/contact_form/new.html.erb     |  33 ++--
 app/views/hyrax/content_blocks/_form.html.erb | 102 +++++++------
 app/views/hyrax/dashboard/_sidebar.html.erb   |  12 +-
 .../dashboard/collections/_form.html.erb      |  54 ++++---
 .../collections/_form_branding.html.erb       |  45 +++---
 .../collections/_form_discovery.html.erb      |  10 +-
 .../collections/_form_share.html.erb          | 141 +++++++++--------
 .../collections/_form_share_table.html.erb    |  75 ++++-----
 .../collections/_list_collections.html.erb    |   4 +-
 .../_show_add_items_actions.html.erb          |   4 +-
 .../_show_document_list_row.html.erb          |  26 ++--
 .../_show_parent_collection_row.html.erb      |   6 +-
 .../collections/_subcollection_list.html.erb  |   6 +-
 .../dashboard/sidebar/_activity.html.erb      | 142 ++++++++++--------
 .../dashboard/sidebar/_configuration.html.erb |  25 ++-
 .../sidebar/_repository_content.html.erb      |   6 +-
 .../hyrax/dashboard/sidebar/_tasks.html.erb   |   9 +-
 .../dashboard/works/_list_works.html.erb      |   9 +-
 .../homepage/_explore_collections.html.erb    |   5 +-
 .../_featured_collection_fields.html.erb      |  24 +--
 .../_featured_collection_section.html.erb     |  21 ++-
 .../hyrax/homepage/_featured_fields.html.erb  |   4 +-
 .../hyrax/homepage/_home_content.html.erb     |  41 +++--
 app/views/hyrax/homepage/_home_text.html.erb  |  12 +-
 .../_sortable_featured_collections.html.erb   |  10 +-
 .../hyrax/my/_collection_action_menu.html.erb |  17 ++-
 app/views/hyrax/my/_work_action_menu.html.erb |  26 ++--
 .../my/collections/_list_collections.html.erb |   4 +-
 app/views/hyrax/my/works/_list_works.html.erb |  10 +-
 .../uploads/_js_templates_branding.html.erb   |  24 ++-
 app/views/hyrax/users/_vitals.html.erb        |  21 ---
 app/views/identity_providers/_form.html.erb   |  15 +-
 app/views/identity_providers/index.html.erb   |  11 +-
 app/views/labels/edit.html.erb                |  41 +++--
 app/views/layouts/hyrax.html.erb              |   6 +-
 app/views/proprietor/accounts/edit.html.erb   |  22 +--
 app/views/proprietor/accounts/index.html.erb  |  12 +-
 app/views/proprietor/accounts/new.html.erb    |  50 +++---
 app/views/proprietor/accounts/show.html.erb   |  30 ++--
 app/views/proprietor/users/edit.html.erb      |   4 +-
 app/views/proprietor/users/index.html.erb     |  12 +-
 app/views/proprietor/users/new.html.erb       |  34 ++---
 app/views/proprietor/users/show.html.erb      |   8 +-
 app/views/roles/index.html.erb                |  12 +-
 app/views/shared/_footer.html.erb             |  12 +-
 app/views/single_signon/index.html.erb        |  35 ++---
 app/views/splash/index.html.erb               |  12 +-
 app/views/status/index.html.erb               |  16 +-
 .../_collections_section.html.erb             |   6 +-
 .../cultural_repository/_facets.html.erb      |  14 +-
 ..._featured_works_home_text_section.html.erb |  18 +--
 .../cultural_repository/_home_text.html.erb   |   2 +-
 .../themes/cultural_repository/_logo.html.erb |  22 +--
 .../cultural_repository/_masthead.html.erb    |  47 +++---
 .../_recent_works_section.html.erb            |   8 +-
 .../_user_util_links.html.erb                 |  51 ++++---
 .../catalog/_search_form.html.erb             |  30 ++--
 .../homepage/_explore_collections.html.erb    |  22 +--
 .../hyrax/homepage/_facet_layout.html.erb     |  13 +-
 .../hyrax/homepage/_featured.html.erb         |  16 +-
 .../hyrax/homepage/_featured_fields.html.erb  |   4 +-
 .../hyrax/homepage/_featured_works.html.erb   |   8 +-
 .../hyrax/homepage/_marketing.html.erb        |   8 +-
 .../hyrax/homepage/_recent_document.html.erb  |  11 +-
 .../homepage/_recently_uploaded.html.erb      |   6 +-
 .../layouts/_share_your_work_row.html.erb     |  16 +-
 .../layouts/homepage.html.erb                 |  10 +-
 .../layouts/hyrax.html.erb                    |  20 ++-
 .../hyrax/base/_work_title.html.erb           |   2 +-
 .../cultural_show/hyrax/base/show.html.erb    |  26 ++--
 .../_controls.html.erb                        |  42 +++---
 .../_home_text.html.erb                       |   6 +-
 .../_ir_below_stats_layout.html.erb           |   8 +-
 .../institutional_repository/_logo.html.erb   |  22 +--
 .../_masthead.html.erb                        |  45 +++---
 .../_user_util_links.html.erb                 |  32 ++--
 .../catalog/_search_form.html.erb             |  28 ++--
 .../homepage/_explore_collections.html.erb    |  22 +--
 .../homepage/_featured_researcher.html.erb    |   4 +-
 .../homepage/_ir_homepage_stats.html.erb      |   6 +-
 .../hyrax/homepage/_marketing.html.erb        |   4 +-
 .../hyrax/homepage/_recent_document.html.erb  |   6 +-
 .../homepage/_recently_uploaded.html.erb      |   4 +-
 .../homepage/_resource_type_slider.html.erb   |  28 ++--
 .../homepage/_resource_type_stats.html.erb    |   8 +-
 .../hyrax/homepage/all_collections.html.erb   |   8 +-
 .../layouts/homepage.html.erb                 |  12 +-
 .../layouts/hyrax.html.erb                    |  16 +-
 .../_featured_carousel.html.erb               |  28 ++--
 .../neutral_repository/_home_text.html.erb    |   6 +-
 .../_theme_container.html.erb                 |  56 ++++---
 .../homepage/_explore_collections.html.erb    |   8 +-
 .../homepage/_featured_researcher.html.erb    |   4 +-
 .../hyrax/homepage/_featured_works.html.erb   |  10 +-
 .../hyrax/homepage/_recent_document.html.erb  |  11 +-
 .../homepage/_recently_uploaded.html.erb      |   2 +-
 .../layouts/homepage.html.erb                 |   4 +-
 .../hyrax/base/_work_title.html.erb           |   4 +-
 .../scholarly_show/hyrax/base/show.html.erb   |  28 ++--
 144 files changed, 1558 insertions(+), 1490 deletions(-)
 delete mode 100644 app/views/hyrax/users/_vitals.html.erb

diff --git a/app/views/_admin_util_links.html.erb b/app/views/_admin_util_links.html.erb
index 808e1230e..86a76ae03 100644
--- a/app/views/_admin_util_links.html.erb
+++ b/app/views/_admin_util_links.html.erb
@@ -1,22 +1,24 @@
 <% if user_signed_in? %>
   <% if can? :manage, Account %>
-    <ul class="nav navbar-nav">
-      <li>
-        <%= link_to main_app.proprietor_accounts_path do %>
+    <ul class="navbar-nav mr-auto">
+      <li class="nav-item">
+        <%= link_to main_app.proprietor_accounts_path, class: 'nav-link' do %>
           <span class="fa fa-gears"></span> <%= t("hyku.proprietor.accounts.nav") %>
         <% end %>
       </li>
-      <li>
-        <%= link_to main_app.proprietor_users_path do %>
+      <li class="nav-item">
+        <%= link_to main_app.proprietor_users_path, class: 'nav-link' do %>
           <span class="fa fa-users"></span> <%= t("hyku.proprietor.users.nav") %>
         <% end %>
       </li>
     </ul>
   <% end %>
 <% end %>
-<ul id="user_utility_links" class="nav navbar-nav navbar-right">
+<ul id="user_utility_links" class="navbar-nav ml-auto">
   <%= render 'shared/locale_picker' if available_translations.size > 1 %>
   <% if user_signed_in? %>
-    <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
+    <li class="nav-item">
+      <%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path, class: 'nav-link' %>
+    </li>
   <% end %>
 </ul>
diff --git a/app/views/_logo.html.erb b/app/views/_logo.html.erb
index 3776707b4..08eca88bd 100644
--- a/app/views/_logo.html.erb
+++ b/app/views/_logo.html.erb
@@ -1,10 +1,10 @@
-  <% if logo_image %>
-    <a id="logo" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-      <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
-      <%= image_tag logo_image, alt: block_for(name: 'logo_image_text') %>
-    </a>
-  <% else %>
-    <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-      <span class="institution_name"><%= application_name %></span>
-    </a>
-  <% end %>
+<% if logo_image %>
+  <a id="logo" href="<%= hyrax.root_path %>" data-no-turbolink="true">
+    <i class="fa fa-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></i>
+    <%= image_tag logo_image, alt: block_for(name: 'logo_image_text') %>
+  </a>
+<% else %>
+  <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
+    <span class="institution_name"><%= application_name %></span>
+  </a>
+<% end %>
diff --git a/app/views/_masthead.html.erb b/app/views/_masthead.html.erb
index 7c41b1929..bd3892fb8 100644
--- a/app/views/_masthead.html.erb
+++ b/app/views/_masthead.html.erb
@@ -1,22 +1,18 @@
-<nav id="masthead" class="navbar navbar-inverse navbar-static-top" role="navigation" aria-label="masthead">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <%= render '/logo' %>
-    </div>
+<%# OVERRIDE Hyrax v5.0.0rc1 to render either admin or user util links %>
 
-    <div class="collapse navbar-collapse" id="top-navbar-collapse">
+<header aria-label="header" class="top-header">
+  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between <%= placement_class %>" role="navigation" aria-label="masthead">
+    <h1 class="sr-only"><%= application_name %></h1>
+    <%= render '/logo' %>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse justify-content-end" id="top-navbar-collapse">
       <% if admin_host? %>
         <%= render '/admin_util_links' %>
       <% else %>
         <%= render '/user_util_links' %>
       <% end %>
     </div>
-  </div>
-</nav>
+  </nav>
+</header>
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
index 782fcb5f1..db04aca6d 100644
--- a/app/views/_user_util_links.html.erb
+++ b/app/views/_user_util_links.html.erb
@@ -1,31 +1,29 @@
-<ul id="user_utility_links" class="nav navbar-nav navbar-right">
+<ul id="user_utility_links" class="navbar-nav ml-auto">
   <%= render 'shared/locale_picker' if available_translations.size > 1 %>
   <% if user_signed_in? %>
-    <li>
+    <li class="nav-item">
       <%= render_notifications(user: current_user) %>
     </li>
-    <li class="dropdown">
-      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false, controls: 'user-util-links' } do %>
+    <li class="nav-item dropdown">
+      <%= link_to hyrax.dashboard_profile_path(current_user), class: 'nav-link dropdown-toggle', id: 'navbarDropdown', role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
         <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
-        <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
+        <%= current_user.name %>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
-        <span class="fa fa-user" aria-hidden="true"></span>
-        <span class="caret"></span>
+        <i class="fa fa-user" aria-hidden="true"></i>
       <% end %>
-      <ul id="user-util-links" class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
-
-        <li class="divider"></li>
-	<% if Devise.mappings[:user]&.registerable? %>
-          <li><%= link_to t("hyku.toolbar.profile.edit_registration"), main_app.edit_user_registration_path %></li>
+      <div id="user-util-links" class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+        <a class="dropdown-item" href="<%= hyrax.dashboard_path %>"><%= t("hyrax.toolbar.dashboard.menu") %></a>
+        <div class="dropdown-divider"></div>
+        <% if Devise.mappings[:user]&.registerable? %>
+          <a class="dropdown-item" href="<%= main_app.edit_user_registration_path %>"><%= t("hyku.toolbar.profile.edit_registration") %></a>
         <% end %>
-        <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
-      </ul>
-    </li><!-- /.btn-group -->
+        <a class="dropdown-item" href="<%= main_app.destroy_user_session_path %>"><%= t("hyrax.toolbar.profile.logout") %></a>
+      </div>
+    </li>
   <% else %>
-    <li>
-      <%= link_to main_app.single_signon_index_path do %>
-        <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
+    <li class="nav-item">
+      <%= link_to main_app.single_signon_index_path, class: 'nav-link' do %>
+        <i class="fa fa-sign-in" aria-hidden="true"></i> <%= t("hyrax.toolbar.profile.login") %>
       <% end %>
     </li>
   <% end %>
diff --git a/app/views/account_sign_up/new.html.erb b/app/views/account_sign_up/new.html.erb
index dcc07cd8f..b63664813 100644
--- a/app/views/account_sign_up/new.html.erb
+++ b/app/views/account_sign_up/new.html.erb
@@ -4,7 +4,7 @@
 
 <div class="row">
   <div class="col-md-8">
-    <%= form_for(@account, url: account_sign_up_path(@account), html: { class: 'form form-horizontal' }) do |f| %>
+    <%= form_for(@account, url: account_sign_up_path(@account), html: { class: 'form' }) do |f| %>
         <% if @account.errors.any? %>
           <div id="error_explanation" class="alert alert-danger">
             <%= pluralize(@account.errors.count, "error") %> prohibited this repository from being saved:
@@ -16,15 +16,15 @@
           </div>
         <% end %>
 
-        <div class="form-group">
-          <%= f.label :name, 'Short name', class: 'col-md-2 control-label' %>
+        <div class="form-group row">
+          <%= f.label :name, 'Short name', class: 'col-md-2 col-form-label' %>
           <div class="col-md-10">
             <%= f.text_field :name, class: 'form-control' %>
-            <span class="help-block">A single or hyphenated name used for technical aspects of the repository (e.g., "acme" or "acme-library").</span>
+            <small class="form-text text-muted">A single or hyphenated name used for technical aspects of the repository (e.g., "acme" or "acme-library").</small>
           </div>
         </div>
 
-        <%= f.submit class: 'btn btn-primary pull-right' %>
+        <%= f.submit class: 'btn btn-secondary float-right' %>
       <% end %>
   </div>
 </div>
diff --git a/app/views/admin/accounts/edit.html.erb b/app/views/admin/accounts/edit.html.erb
index e03fcb9fd..533aa0a07 100644
--- a/app/views/admin/accounts/edit.html.erb
+++ b/app/views/admin/accounts/edit.html.erb
@@ -4,9 +4,9 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default account-form">
+    <div class="card account-form">
       <%= simple_form_for([:admin, @account], url: admin_account_path, :html => { class: 'form' }) do |f| %>
-        <div class="panel-body">
+        <div class="card-body">
           <% if @account.errors.any? %>
             <div id="error_explanation">
               <h2><%= pluralize(@account.errors.count, "error") %> prohibited this account from being saved:</h2>
@@ -24,11 +24,11 @@
           </div>
 
           <% current_account.public_settings.each do |key, value| %>
-            <%= render 'shared/settings', f:f, key: key, value: value %>
+            <%= render 'shared/settings', f: f, key: key, value: value %>
           <% end %>
 
-          <div class="panel-footer">
-            <%= f.submit class: 'btn btn-primary pull-right' %>
+          <div class="card-footer">
+            <%= f.submit class: 'btn btn-secondary float-right' %>
           </div>
         </div>
       <% end %>
diff --git a/app/views/admin/groups/_form.html.erb b/app/views/admin/groups/_form.html.erb
index f7363b22a..ad9af2a2b 100644
--- a/app/views/admin/groups/_form.html.erb
+++ b/app/views/admin/groups/_form.html.erb
@@ -5,15 +5,15 @@
     target_path = admin_group_path(@group)
   end
 %>
-<div class="panel panel-default">
+<div class="card">
   <%= simple_form_for @group, url: target_path do |f| %>
-    <div class="panel-body">
+    <div class="card-body">
       <%= f.input :humanized_name, label: t('hyku.admin.groups.label.humanized_name'), required: true %>
       <%= f.input :description, as: :text, label: t('hyku.admin.groups.label.description'), hint: '' %>
     </div>
-    <div class="panel-footer text-right">
+    <div class="card-footer text-right">
       <%= link_to t('simple_form.cancel'), admin_groups_path, class: 'btn btn-link action-cancel' %>
-      <%= f.submit class: 'btn btn-primary action-save' %>
+      <%= f.submit class: 'btn btn-secondary action-save' %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/admin/groups/_nav.html.erb b/app/views/admin/groups/_nav.html.erb
index be0888668..17a25700c 100644
--- a/app/views/admin/groups/_nav.html.erb
+++ b/app/views/admin/groups/_nav.html.erb
@@ -2,10 +2,10 @@
 <div class="panel-tab-wrapper">
   <ul class="nav nav-tabs">
     <% navigation_presenter.tabs.each do |tab| %>
-      <%= content_tag :li, role: 'presentation', class: tab.css_class do %>
-        <%= link_to tab.name, tab.path %>
-      <% end %>
+      <li class="nav-item" role="presentation">
+        <%= link_to tab.name, tab.path, class: "nav-link #{'active' if tab.css_class == 'active'}" %>
+      </li>
     <% end %>
   </ul>
-  <%= link_to t('hyku.admin.groups.nav.index'), admin_groups_path, class: 'pull-right nav-escape-link' %>
+  <%= link_to t('hyku.admin.groups.nav.index'), admin_groups_path, class: 'float-right nav-escape-link' %>
 </div>
diff --git a/app/views/admin/groups/_per_page.html.erb b/app/views/admin/groups/_per_page.html.erb
index a2182bc09..4f9615dc9 100644
--- a/app/views/admin/groups/_per_page.html.erb
+++ b/app/views/admin/groups/_per_page.html.erb
@@ -5,7 +5,7 @@
   <% if params[:page].present? %>
     <%= f.input :page, as: :hidden, input_html: { name: :page, value: params[:page] } %>
   <% end %>
-  <%= f.input :per, collection: [10, 25, 100], include_blank: false, required: false, selected: params[:per], input_html: { class: 'js-per-page__select', name: :per } %>
+  <%= f.input :per, collection: [10, 25, 100], include_blank: false, required: false, selected: params[:per], input_html: { class: 'js-per-page__select custom-select', name: :per } %>
   <%= t('hyku.admin.groups.label.per_page') %>
-  <%= f.submit class: 'btn btn-default js-per-page__submit' %>
+  <%= f.submit class: 'btn btn-secondary js-per-page__submit' %>
 <% end %>
diff --git a/app/views/admin/groups/_search.html.erb b/app/views/admin/groups/_search.html.erb
index 52fe58f83..26548adf5 100644
--- a/app/views/admin/groups/_search.html.erb
+++ b/app/views/admin/groups/_search.html.erb
@@ -5,11 +5,11 @@
   <% if params[:page].present? %>
     <%= f.input :page, as: :hidden, input_html: { name: :page, value: params[:page] } %>
   <% end %>
-  <div class="form-group list-scope">
-    <%= f.input :q, required: false, input_html: { class: 'list-scope__query', name: :q, value: params[:q] }, wrapper_html: { class: 'list-scope__query-wrapper'} %>
+  <div class="form-group mb-2 list-scope">
+    <%= f.input :q, required: false, input_html: { class: 'form-control list-scope__query', name: :q, value: params[:q] }, wrapper_html: { class: 'list-scope__query-wrapper'} %>
     <% if params[:q].present? %>
-      <%= link_to content_tag(:span, '&times;'.html_safe, :'aria-hidden' => true),  @target, class: 'close list-scope__reset', :'aria-label' => t('hyku.admin.groups.action.search.clear') %>
+      <%= link_to content_tag(:span, '&times;'.html_safe, :'aria-hidden' => true),  @target, class: 'btn btn-sm btn-secondary close list-scope__reset', :'aria-label' => t('hyku.admin.groups.action.search.clear') %>
     <% end %>
   </div>
-  <%= f.submit class: 'btn btn-primary list-scope__submit' %>
+  <%= f.submit class: 'btn btn-primary mb-2 list-scope__submit' %>
 <% end %>
diff --git a/app/views/admin/groups/index.html.erb b/app/views/admin/groups/index.html.erb
index 8a1101e35..94c4c4324 100644
--- a/app/views/admin/groups/index.html.erb
+++ b/app/views/admin/groups/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :page_title, construct_page_title(t('hyku.admin.groups.title.index'), t('hyku.admin.title')) %>
 <% provide :page_header do %>
-  <%if can? :edit, Hyrax::Group %>
+  <% if can? :edit, Hyrax::Group %>
     <h1>
       <span class="fa fa-users"></span>
       <%= t('hyku.admin.groups.title.index') %>
@@ -13,8 +13,8 @@
   <% end %>
 <% end %>
 
-<div class="panel panel-default group-listing">
-  <div class="panel-heading">
+<div class="card group-listing">
+  <div class="card-header">
     <% group_count = Hyrax::Group.count %>
     <% if group_count == 1 %>
       <%= t('hyku.admin.groups.describe_singular_quantity_html') %>
@@ -22,16 +22,16 @@
       <%= t('hyku.admin.groups.describe_quantity_html', number: group_count ) %>
     <% end %>
     <% if can? :create, Hyrax::Group %>
-      <%= link_to t('hyku.admin.groups.action.create'), new_admin_group_path, class: 'btn btn-primary pull-right new-group' %>
+      <%= link_to t('hyku.admin.groups.action.create'), new_admin_group_path, class: 'btn btn-primary float-right new-group' %>
     <% end %>
   </div>
-  <div class="panel-body">
+  <div class="card-body">
     <div class="container-fluid full-width-container">
       <div class="row">
-        <div class="col-sm-6">
+        <div class="col-md-6">
           <%= render 'per_page', target: admin_groups_path %>
         </div>
-        <div class="col-sm-6 text-right">
+        <div class="col-md-6 text-right">
           <%= render 'search', target: admin_groups_path %>
         </div>
       </div>
@@ -53,7 +53,7 @@
             <tr id=<%= "#{group.name}" %>>
               <td>
                 <b><%= group.humanized_name %></b>
-                <p class='help-block'>
+                <p class='form-text text-muted'>
                   <%= group.description_label %>
                 </p>
               </td>
@@ -71,7 +71,7 @@
               </td>
               <td>
                 <% if can? :edit, Hyrax::Group %>
-                  <%= link_to t('hyku.admin.groups.action.edit'), edit_admin_group_path(group), id: "edit-#{group.name}-group", class: 'btn btn-default' %>
+                  <%= link_to t('hyku.admin.groups.action.edit'), edit_admin_group_path(group), id: "edit-#{group.name}-group", class: 'btn btn-secondary' %>
                 <% end %>
               </td>
             </tr>
@@ -80,7 +80,7 @@
       </table>
     </div>
 
-    <nav class="pull-right">
+    <nav class="float-right">
       <%= paginate @groups %>
     </nav>
   </div>
diff --git a/app/views/admin/groups/new.html.erb b/app/views/admin/groups/new.html.erb
index c20ee46fb..f2be4a36b 100644
--- a/app/views/admin/groups/new.html.erb
+++ b/app/views/admin/groups/new.html.erb
@@ -7,19 +7,19 @@
 <% end %>
 <div class="panel-tab-wrapper">
   <ul class="nav nav-tabs">
-    <li role="presentation" class="active">
-      <a href="javascript:void(0);"><%= t('hyku.admin.groups.nav.attributes') %></a>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link active" href="javascript:void(0);"><%= t('hyku.admin.groups.nav.attributes') %></a>
     </li>
-    <li role="presentation" class="disabled">
-      <a href="javascript:void(0);"><%= t('hyku.admin.groups.nav.members') %></a>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link disabled" href="javascript:void(0);"><%= t('hyku.admin.groups.nav.members') %></a>
     </li>
-    <li role="presentation" class="disabled">
-      <a href="javascript:void(0);"><%= t('hyku.admin.groups.nav.roles') %></a>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link disabled" href="javascript:void(0);"><%= t('hyku.admin.groups.nav.roles') %></a>
     </li>
-    <li role="presentation" class="disabled">
-      <a href="javascript:void(0);"><%= t('hyku.admin.groups.nav.delete') %></a>
+    <li class="nav-item" role="presentation">
+      <a class="nav-link disabled" href="javascript:void(0);"><%= t('hyku.admin.groups.nav.delete') %></a>
     </li>
   </ul>
-  <%= link_to t('hyku.admin.groups.nav.index'), admin_groups_path, class: 'pull-right nav-escape-link' %>
+  <%= link_to t('hyku.admin.groups.nav.index'), admin_groups_path, class: 'float-right nav-escape-link' %>
 </div>
 <%= render 'form' %>
diff --git a/app/views/admin/groups/remove.html.erb b/app/views/admin/groups/remove.html.erb
index b5380ed6c..b2a01abcf 100644
--- a/app/views/admin/groups/remove.html.erb
+++ b/app/views/admin/groups/remove.html.erb
@@ -7,15 +7,15 @@
 <% end %>
 
 <%= render 'nav' %>
-<div class="panel panel-default">
-  <div class="panel-body">
-    <blockquote class="callout callout-danger callout-with-action">
+<div class="card">
+  <div class="card-body">
+    <blockquote class="callout callout-danger">
       <h3><%= t('hyku.admin.groups.title.delete', group: @group.humanized_name) %></h3>
       <p>
-      <%= t('hyku.admin.groups.action.remove.description') %>
+        <%= t('hyku.admin.groups.action.remove.description') %>
       </p>
       <div class="callout-action">
-        <%= link_to t('hyku.admin.groups.action.remove.submit'),  admin_group_path(@group), class: "btn btn-danger action-delete #{'disabled' if @group.default_group?}", method: :delete, data: { confirm: t('hyku.admin.groups.action.remove.confirmation') } %>
+        <%= link_to t('hyku.admin.groups.action.remove.submit'), admin_group_path(@group), class: "btn btn-danger action-delete #{'disabled' if @group.default_group?}", method: :delete, data: { confirm: t('hyku.admin.groups.action.remove.confirmation') } %>
       </div>
     </blockquote>
   </div>
diff --git a/app/views/admin/groups/roles.html.erb b/app/views/admin/groups/roles.html.erb
index 2e75f697b..b3aa2f89e 100644
--- a/app/views/admin/groups/roles.html.erb
+++ b/app/views/admin/groups/roles.html.erb
@@ -7,77 +7,78 @@
 <% end %>
 
 <%= render '/admin/groups/nav' %>
-<div class='panel panel-default'>
-  <div class='panel-body'>
+<div class='card'>
+  <div class='card-body'>
     <p class='lead'><%= t('hyku.admin.groups.action.members.description') %></p>
 
-  <!-- BEGIN Current Group Roles -->
-  <div class='panel panel-default'>
-    <div class='panel-heading'>
-      <h3 class='panel-title'><%= t('hyku.admin.groups.roles.title.current_group_roles') %></h3>
-    </div>
+    <!-- BEGIN Current Group Roles -->
+    <div class='card'>
+      <div class='card-header'>
+        <h3 class='card-title'><%= t('hyku.admin.groups.roles.title.current_group_roles') %></h3>
+      </div>
 
-    <div class='panel-body'>
-      <div class='table-responsive'>
-        <table class='table table-striped datatable group-roles-table current-group-roles'>
-          <thead>
-            <th><%= t('hyku.admin.groups.roles.label.name') %></th>
-            <th><%= t('hyku.admin.groups.roles.label.description') %></th>
-            <th><%= t('hyku.admin.groups.roles.label.action') %></th>
-          </thead>
+      <div class='card-body'>
+        <div class='table-responsive'>
+          <table class='table table-striped datatable group-roles-table current-group-roles'>
+            <thead>
+              <th><%= t('hyku.admin.groups.roles.label.name') %></th>
+              <th><%= t('hyku.admin.groups.roles.label.description') %></th>
+              <th><%= t('hyku.admin.groups.roles.label.action') %></th>
+            </thead>
 
-          <tbody>
-            <% @group.roles&.each do |role| %>
-              <tr id=<%= "assigned-role-#{role.id}" %>>
-                <td><%= role.name.titleize %></td>
-                <td><%= role.description_label %>
-                <td>
-                <%= simple_form_for :remove_role_from_group, url: admin_group_role_path(group_id: @group.to_param, role_id: role.id), method: :delete, html: { class: 'form' } do |f| %>
-                  <%= f.submit class: 'btn btn-danger', disabled: @group.name == ::Ability.admin_group_name && role.name == 'admin', id: "remove-role-#{role.id}-from-group" %>
-                <% end %>
-                </td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
+            <tbody>
+              <% @group.roles&.each do |role| %>
+                <tr id=<%= "assigned-role-#{role.id}" %>>
+                  <td><%= role.name.titleize %></td>
+                  <td><%= role.description_label %>
+                  <td>
+                  <%= simple_form_for :remove_role_from_group, url: admin_group_role_path(group_id: @group.to_param, role_id: role.id), method: :delete, html: { class: 'form' } do |f| %>
+                    <%= f.submit class: 'btn btn-danger', disabled: @group.name == ::Ability.admin_group_name && role.name == 'admin', id: "remove-role-#{role.id}-from-group" %>
+                  <% end %>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </div>
       </div>
     </div>
-  </div>
-  <!-- END Current Group Roles -->
+    <!-- END Current Group Roles -->
 
-  <!-- BEGIN Add Role to Group -->
-  <div class='panel panel-default'>
-    <div class='panel-heading'>
-      <h3 class='panel-title'><%= t('hyku.admin.groups.roles.title.add_group_roles') %></h3>
-    </div>
+    <!-- BEGIN Add Role to Group -->
+    <div class='card'>
+      <div class='card-header'>
+        <h3 class='card-title'><%= t('hyku.admin.groups.roles.title.add_group_roles') %></h3>
+      </div>
 
-    <div class='panel-body'>
-      <div class='table-responsive'>
-        <table class='table table-striped datatable group-roles-table add-group-roles'>
-          <thead>
-            <th><%= t('hyku.admin.groups.roles.label.name') %></th>
-            <th><%= t('hyku.admin.groups.roles.label.description') %></th>
-            <th><%= t('hyku.admin.groups.roles.label.action') %></th>
-          </thead>
+      <div class='card-body'>
+        <div class='table-responsive'>
+          <table class='table table-striped datatable group-roles-table add-group-roles'>
+            <thead>
+              <th><%= t('hyku.admin.groups.roles.label.name') %></th>
+              <th><%= t('hyku.admin.groups.roles.label.description') %></th>
+              <th><%= t('hyku.admin.groups.roles.label.action') %></th>
+            </thead>
 
-          <tbody>
-            <% @roles&.each do |role| %>
-              <tr id=<%= "available-role-#{role.id}" %>>
-                <td><%= role.name.titleize %></td>
-                <td><%= role.description_label %>
-                <td>
-                  <%= simple_form_for :add_role_to_group, url: admin_group_roles_path(group_id: @group.to_param, role_id: role.id), method: :post, html: { class: 'form' } do |f| %>
-                    <%= f.submit class: 'btn btn-success', id: "add-role-#{role.id}-to-group" %>
-                  <% end %>
-                </td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
+            <tbody>
+              <% @roles&.each do |role| %>
+                <tr id=<%= "available-role-#{role.id}" %>>
+                  <td><%= role.name.titleize %></td>
+                  <td><%= role.description_label %>
+                  <td>
+                    <%= simple_form_for :add_role_to_group, url: admin_group_roles_path(group_id: @group.to_param, role_id: role.id), method: :post, html: { class: 'form' } do |f| %>
+                      <%= f.submit class: 'btn btn-success', id: "add-role-#{role.id}-to-group" %>
+                    <% end %>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </div>
       </div>
     </div>
+    <!-- END Add Role to Group -->
   </div>
-  <!-- END Add Role to Group -->
 </div>
 
 <script>
diff --git a/app/views/admin/groups/users.html.erb b/app/views/admin/groups/users.html.erb
index 75da95dee..4e0fbc807 100644
--- a/app/views/admin/groups/users.html.erb
+++ b/app/views/admin/groups/users.html.erb
@@ -7,33 +7,33 @@
 <% end %>
 
 <%= render '/admin/groups/nav' %>
-<div class="panel panel-default group-user-listing">
-  <div class="panel-body">
+<div class="card group-user-listing">
+  <div class="card-body">
 
     <p class="lead"><%= t('hyku.admin.groups.action.members.description') %></p>
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="panel-title"><%= t('hyku.admin.groups.title.add_user') %></h3>
+    <div class="card">
+      <div class="card-header">
+        <h3 class="card-title"><%= t('hyku.admin.groups.title.add_user') %></h3>
       </div>
-      <div class="panel-body">
-        <%= simple_form_for :user_search, url: hyrax.users_path, method: :get, html: { class: 'form-inline pull-left js-group-user-search' } do |f| %>
+      <div class="card-body">
+        <%= simple_form_for :user_search, url: hyrax.users_path, method: :get, html: { class: 'form-inline float-left js-group-user-search' } do |f| %>
           <%= f.input :uq, name: :uq, required: false, input_html: { class: 'js-group-user-search__query', value: params[:uq] } %>
-          <%= f.submit class: 'btn btn-default js-group-user-search__submit' %>
+          <%= f.submit class: 'btn btn-secondary js-group-user-search__submit' %>
         <% end %>
 
-        <%= simple_form_for :add_user_to_group, url: admin_group_users_path(group_id: @group.to_param), method: :post, html: { class: 'form-inline pull-left js-group-user-add' } do |f| %>
+        <%= simple_form_for :add_user_to_group, url: admin_group_users_path(group_id: @group.to_param), method: :post, html: { class: 'form-inline float-left js-group-user-add' } do |f| %>
           <%= f.input :user_id, required: false, input_html: { class: 'js-group-user-add__id', name: :user_id } %>
           <%= f.submit class: 'btn btn-primary js-group-user-add__submit' %>
         <% end %>
       </div>
     </div>
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="panel-title"><%= t('hyku.admin.groups.title.list_members') %></h3>
+    <div class="card">
+      <div class="card-header">
+        <h3 class="card-title"><%= t('hyku.admin.groups.title.list_members') %></h3>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <div class="container-fluid full-width-container">
           <div class="row">
             <div class="col-sm-6">
@@ -85,7 +85,7 @@
           </table>
         </div>
 
-        <nav class="pull-right">
+        <nav class="float-right">
           <%= paginate @users %>
         </nav>
       </div>
diff --git a/app/views/admin/work_types/edit.html.erb b/app/views/admin/work_types/edit.html.erb
index 4595d2660..d325fb8f5 100644
--- a/app/views/admin/work_types/edit.html.erb
+++ b/app/views/admin/work_types/edit.html.erb
@@ -2,14 +2,14 @@
   <h1><span class="fa fa-address-book"></span> <%= t('hyku.admin.work_types') %></h1>
 <% end %>
 
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="card">
+  <div class="card-body">
     <%= simple_form_for @site, url: '/admin/work_types' do |f| %>
       <% Hyrax.config.registered_curation_concern_types.each do |type| %>
-        <div class="checkbox">
-          <label for="input-<%= type %>">
-            <%= check_box_tag 'available_works[]', type, @site.available_works&.include?(type), id: "input-#{type}" %>
-            <span><%= type %></span><br />
+        <div class="form-check">
+          <input class="form-check-input" type="checkbox" value="<%= type %>" id="input-<%= type %>" name="available_works[]" <%= 'checked' if @site.available_works&.include?(type) %>>
+          <label class="form-check-label" for="input-<%= type %>">
+            <%= type %>
           </label>
         </div>
       <% end %>
diff --git a/app/views/advanced/_advanced_search_help.html.erb b/app/views/advanced/_advanced_search_help.html.erb
index df18fcbc5..52ef3a695 100644
--- a/app/views/advanced/_advanced_search_help.html.erb
+++ b/app/views/advanced/_advanced_search_help.html.erb
@@ -1,26 +1,20 @@
+<%# OVERRIDE Blacklight Advanced Search v7.0.0 to add Search by date %>
+
 <div class='card card-default'>
   <div class="card-body">
     <h4 class="card-title">Search tips</h4>
     <ul class="advanced-help">
-     <li>Select "match all" to require all fields.
-     </li>
-
-     <li>Select "match any" to find at least one field.
-     </li>
-
-     <li>Combine keywords and attributes to find specific items.
-     </li>
-
-     <li>Search by date with format: YYYYMMDD, YYYYMM or YYYY. Do not use "-", "/", or any other special characters.</li>
-
-     <li>Use quotation marks to search as a phrase.
-
-     <li>Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
-
-     <li>Use "-" before a word or phrase to exclude.
-
-     <li>Use "OR", "AND", and "NOT" to create complex boolean logic. You can use parentheses in your complex expressions. </li>
-     <li>Truncation and wildcards are not supported - word-stemming is done automatically.</li>
-   </ul>
+      <li>Select "match all" to require all fields.</li>
+      <li>Select "match any" to find at least one field.</li>
+      <li>Combine keywords and attributes to find specific items.</li>
+      <%# OVERRIDE begin %>
+      <li>Search by date with format: YYYYMMDD, YYYYMM or YYYY. Do not use "-", "/", or any other special characters.</li>
+      <%# OVERRIDE end %>
+      <li>Use quotation marks to search as a phrase.</li>
+      <li>Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).</li>
+      <li>Use "-" before a word or phrase to exclude.</li>
+      <li>Use "OR", "AND", and "NOT" to create complex boolean logic. You can use parentheses in your complex expressions.</li>
+      <li>Truncation and wildcards are not supported - word-stemming is done automatically.</li>
+    </ul>
   </div>
 </div>
diff --git a/app/views/catalog/_index_gallery_collection_wrapper.html.erb b/app/views/catalog/_index_gallery_collection_wrapper.html.erb
index e55b72ff3..339cb6b89 100644
--- a/app/views/catalog/_index_gallery_collection_wrapper.html.erb
+++ b/app/views/catalog/_index_gallery_collection_wrapper.html.erb
@@ -1,5 +1,5 @@
-<%# OVERRIDE Hyrax 3.4.1: make collection thumbnail a link so it matches works %>
-<div class="document col-xs-6 col-md-3">
+<%# OVERRIDE Hyrax v5.0.0rc2: make collection thumbnail a link so it matches works %>
+<div class="document col-6 col-md-3">
   <div class="thumbnail">
     <% value = collection_thumbnail(document, {}, counter: document_counter_with_offset(document_counter)) %>
     <%= link_to value, generate_work_url(document.to_h, request)%>
diff --git a/app/views/catalog/_index_header_list_collection.html.erb b/app/views/catalog/_index_header_list_collection.html.erb
index d6860cc46..62a809d25 100644
--- a/app/views/catalog/_index_header_list_collection.html.erb
+++ b/app/views/catalog/_index_header_list_collection.html.erb
@@ -1,4 +1,8 @@
-<div class="search-results-title-row">
-  <h4 class="search-result-title"><%= link_to document.title_or_label, generate_work_url(document.to_h, request) %></h4>
+<%# OVERRIDE Hyrax v5.0.0rc2 %>
+
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
+  <%# OVERRIDE begin %>
+  <h3 class="search-result-title mb-0 pr-3"><%= link_to document.title_or_label, generate_work_url(document.to_h, request) %></h3>
+  <%# OVERRIDE end %>
   <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
 </div>
diff --git a/app/views/catalog/_index_header_list_default.html.erb b/app/views/catalog/_index_header_list_default.html.erb
index a215dc20c..bad9d9e9d 100644
--- a/app/views/catalog/_index_header_list_default.html.erb
+++ b/app/views/catalog/_index_header_list_default.html.erb
@@ -1,10 +1,10 @@
-<%# OVERRIDE Hyrax 3.4.0 to support shared search %>
+<%# OVERRIDE Hyrax v5.0.0rc2 to support shared search %>
 <% model = document.hydra_model %>
-<div class="search-results-title-row">
-    <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
-        <h4 class="search-result-title"><%= link_to document.title_or_label, generate_work_url(document, request) %></h4>
-        <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
-    <% else %>
-        <h4 class="search-result-title"><%= link_to document.title_or_label, generate_work_url(document, request) %></h4>
-    <% end %>
+<div class="search-results-title-row col-12 d-flex flex-row align-items-center pb-2">
+  <% if model == Hyrax::PcdmCollection || model < Hyrax::PcdmCollection %>
+    <h4 class="search-result-title"><%= link_to document.title_or_label, generate_work_url(document, request) %></h4>
+    <%= Hyrax::CollectionPresenter.new(document, current_ability).collection_type_badge %>
+  <% else %>
+    <h4 class="search-result-title"><%= link_to document.title_or_label, generate_work_url(document, request) %></h4>
+  <% end %>
 </div>
diff --git a/app/views/catalog/_thumbnail_list_collection.html.erb b/app/views/catalog/_thumbnail_list_collection.html.erb
index d06f1a488..65b33703a 100644
--- a/app/views/catalog/_thumbnail_list_collection.html.erb
+++ b/app/views/catalog/_thumbnail_list_collection.html.erb
@@ -1,5 +1,5 @@
 <%# Override Hyrax 3.4.1 to remove thumbnail link supression and use default collection thumbnail %>
-<div class="col-md-2">
+<div class="col-md-3">
   <% value = collection_thumbnail(document, {}, counter: document_counter_with_offset(document_counter)) %>
   <%= link_to value, generate_work_url(document.to_h, request)%>
 </div>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index d03d87c17..ce6aad1b8 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,20 +1,20 @@
 <h2 class="text-center">Forgot your password?</h2>
-<div class="row center-block">
-  <div class="col-md-6 col-md-offset-3">
+<div class="row justify-content-center">
+  <div class="col-md-6">
     <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
       <%= render "devise/shared/error_messages", resource: resource %>
 
       <div class="form-group">
         <%= f.label :email %><br />
-        <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control"  %>
+        <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "form-control" %>
       </div>
 
       <div class="form-group text-center">
-        <%= f.submit "Send me reset password instructions", class: 'btn btn-primary'  %>
+        <%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
       </div>
     <% end %>
     <div class="text-center">
       <%= render "devise/shared/links" %>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 9f9b48c79..316577673 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,19 +1,21 @@
-<div class="row col-md-9 account-form registration">
+<div class="row justify-content-center">
+  <div class="col-md-9 account-form registration">
     <h2><%= t(".sign_up_header") %></h2>
 
-    <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: 'form-horizontal' }) do |f| %>
-        <%= f.error_notification %>
+    <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: '' }) do |f| %>
+      <%= f.error_notification %>
 
-        <div class="form-inputs">
-            <%= f.input :display_name, required: true, wrapper: :inline %>
-            <%= f.input :email, required: true, autofocus: true, wrapper: :inline %>
-            <%= f.input :password, required: true, wrapper: :inline %>
-            <%= f.input :password_confirmation, required: true, wrapper: :inline %>
-        </div>
+      <div class="form-inputs">
+        <%= f.input :display_name, required: true, wrapper: :inline %>
+        <%= f.input :email, required: true, autofocus: true, wrapper: :inline %>
+        <%= f.input :password, required: true, wrapper: :inline %>
+        <%= f.input :password_confirmation, required: true, wrapper: :inline %>
+      </div>
 
-        <div class="form-actions">
-            <%= render 'devise/shared/links' %>
-            <%= f.button :submit, t(".sign_up") %>
-        </div>
+      <div class="form-actions">
+        <%= render 'devise/shared/links' %>
+        <%= f.button :submit, t(".sign_up") %>
+      </div>
     <% end %>
+  </div>
 </div>
diff --git a/app/views/devise/registrations/registrations/new.html.erb b/app/views/devise/registrations/registrations/new.html.erb
index 4ed469233..34dec3168 100644
--- a/app/views/devise/registrations/registrations/new.html.erb
+++ b/app/views/devise/registrations/registrations/new.html.erb
@@ -1,26 +1,24 @@
-<h2 class="text-center pt-40 pb-40"><%= t(".sign_up_header") %></h2>
-<div class="row center-block">
-  <div class="col-md-8 col-md-offset-2">
-    <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: 'form-horizontal' }) do |f| %>
-        <small>
+<h2 class="text-center pt-5 pb-5"><%= t(".sign_up_header") %></h2>
+<div class="row justify-content-center">
+  <div class="col-md-8">
+    <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: 'form' }) do |f| %>
+      <small>
         <%= f.error_notification %>
-        </small>
+      </small>
 
-        <div class="form-inputs">
-            <%= f.input :display_name, required: true, wrapper: :inline %>
-            <%= f.input :email, required: true, autofocus: true, wrapper: :inline %>
-            <%= f.input :password, required: true, wrapper: :inline %>
-            <%= f.input :password_confirmation, required: true, wrapper: :inline %>
-        </div>
+      <div class="form-inputs">
+        <%= f.input :display_name, required: true, wrapper: :inline %>
+        <%= f.input :email, required: true, autofocus: true, wrapper: :inline %>
+        <%= f.input :password, required: true, wrapper: :inline %>
+        <%= f.input :password_confirmation, required: true, wrapper: :inline %>
+      </div>
 
-        <div class="form-group text-center">
-            <%= render 'devise/shared/links' %>
-        </div>
-        <div class="text-center pb-40">
-            <%= f.button :submit, t(".sign_up") %>
-        </div>
+      <div class="form-group text-center">
+        <%= render 'devise/shared/links' %>
+      </div>
+      <div class="text-center pb-5">
+        <%= f.button :submit, t(".sign_up") %>
       </div>
     <% end %>
   </div>
 </div>
-
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 090e2cbd8..73c0cc605 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,31 +1,30 @@
+<h2 class="text-center">Log in</h2>
+<div class="row justify-content-center">
+  <div class="col-md-6">
+    <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+      <div class="form-group">
+        <%= f.label :email %><br />
+        <%= f.email_field :email, autofocus: true, class: "form-control" %>
+      </div>
 
-  <h2 class="text-center">Log in</h2>
-  <div class="row center-block">
-    <div class="col-md-6 col-md-offset-3">
-      <%= form_for(resource, as: resource_name, url: session_path(resource_name), class: "form-horizontal") do |f| %>
-        <div class="form-group">
-          <%= f.label :email %><br />
-          <%= f.email_field :email, autofocus: true, class: "form-control" %>
-        </div>
-
-        <div class="form-group">
-          <%= f.label :password, class: "control-label" %><br />
-          <%= f.password_field :password, autocomplete: "off", class: "form-control" %>
-        </div>
-
-        <% if devise_mapping.rememberable? -%>
-          <div class="form-group text-center">
-            <%= f.check_box :remember_me %>
-            <%= f.label :remember_me, class: "control-label" %>
-          </div>
-        <% end -%>
+      <div class="form-group">
+        <%= f.label :password, class: "control-label" %><br />
+        <%= f.password_field :password, autocomplete: "off", class: "form-control" %>
+      </div>
 
+      <% if devise_mapping.rememberable? -%>
         <div class="form-group text-center">
-          <%= f.submit "Log in", class: 'btn btn-primary' %>
+          <%= f.check_box :remember_me %>
+          <%= f.label :remember_me, class: "control-label" %>
         </div>
-      <% end %>
-      <div class="text-center">
-        <%= render "devise/shared/links" %>
+      <% end -%>
+
+      <div class="form-group text-center">
+        <%= f.submit "Log in", class: 'btn btn-primary' %>
       </div>
+    <% end %>
+    <div class="text-center">
+      <%= render "devise/shared/links" %>
     </div>
-  </div>
\ No newline at end of file
+  </div>
+</div>
diff --git a/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb b/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb
index 07903899c..d355978e5 100644
--- a/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb
+++ b/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb
@@ -1,38 +1,40 @@
-<%# OVERRIDE Hyrax v3.4.2 Filter out Role accesses as they should never be removed %>
-<h3><%= t(".#{access}.title") %></h3>
-<p><%= t(".#{access}.help") %></p>
-<%# OVERRIDE: use custom method to filter by access as well as filter out rolify Roles %>
-<% if @form.filter_access_grants_by_access(filter).any? %>
-  <%# OVERRIDE: use custom access-specific class in order to differentiate between access tables %>
-  <table class='table table-striped share-status <%= "#{access}-table" %>'>
-    <thead>
-      <tr>
-        <th><%= t(".#{access}.agent_name") %></th>
-        <th><%= t(".#{access}.type") %></th>
-        <th><%= t(".#{access}.action") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <%# OVERRIDE: use custom method to filter by access as well as filter out rolify Roles %>
-      <% @form.filter_access_grants_by_access(filter).each do |g| %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Filter out Role accesses as they should never be removed %>
+<div class="mb-4">
+  <h3 class="h4"><%= t(".#{access}.title") %></h3>
+  <p><%= t(".#{access}.help") %></p>
+  <%# OVERRIDE: use custom method to filter by access as well as filter out rolify Roles %>
+  <% if @form.filter_access_grants_by_access(filter).any? %>
+    <%# OVERRIDE: use custom access-specific class in order to differentiate between access tables %>
+    <table class='table table-striped share-status <%= "#{access}-table" %>'>
+      <thead>
         <tr>
-          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
-          <td><%= g.agent_type.titleize %></td>
-          <td>
-            <%# OVERRIDE: remove disabled class from button to fix styling %>
-            <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
-              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
-            <% else %>
-              <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-danger' %>
-            <% end %>
-          </td>
+          <th><%= t(".#{access}.agent_name") %></th>
+          <th><%= t(".#{access}.type") %></th>
+          <th><%= t(".#{access}.action") %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% else %>
-  <p><em><%= t(".#{access}.empty") %></em></p>
-<% end %>
-<%= button_tag t('.allow_all_registered'),
-                class: 'btn btn-info',
-                data: { behavior: 'add-registered-users' } if access == 'depositors' %>
+      </thead>
+      <tbody>
+        <%# OVERRIDE: use custom method to filter by access as well as filter out rolify Roles %>
+        <% @form.filter_access_grants_by_access(filter).each do |g| %>
+          <tr>
+            <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
+            <td><%= g.agent_type.titleize %></td>
+            <td>
+              <%# OVERRIDE: remove disabled class from button to fix styling %>
+              <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
+                <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
+              <% else %>
+                <%= button_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <p><em><%= t(".#{access}.empty") %></em></p>
+  <% end %>
+  <%= button_tag t('.allow_all_registered'),
+                  class: 'btn btn-primary',
+                  data: { behavior: 'add-registered-users' } if access == 'depositors' %>
+</div>
diff --git a/app/views/hyrax/admin/admin_sets/_form_participants.html.erb b/app/views/hyrax/admin/admin_sets/_form_participants.html.erb
index 5e33a06c1..60c684a83 100644
--- a/app/views/hyrax/admin/admin_sets/_form_participants.html.erb
+++ b/app/views/hyrax/admin/admin_sets/_form_participants.html.erb
@@ -1,10 +1,10 @@
-<%# OVERRIDE Hyrax v3.4.2 Use Hyrax::Groups for groups select box %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Use Hyrax::Groups for groups select box %>
 <div id="participants" class="tab-pane">
-  <div class="panel panel-default labels">
-    <div class="panel-body">
-      <h2><%= t('.add_participants') %></h2>
+  <div class="card labels edit-sharing-tab">
+    <div class="card-body">
+      <h2 class="h3"><%= t('.add_participants') %></h2>
       <% access_options = options_for_select([['Manager', 'manage'], ['Depositor', 'deposit'], ['Viewer', 'view']]) %>
-      <%= simple_form_for @form.permission_template,
+      <%= simple_form_for collection_permission_template_form_for(form: @form),
                           url: [hyrax, :admin, @form, :permission_template],
                           html: { id: 'group-participants-form' } do |f| %>
         <div class="clearfix spacer">
@@ -27,14 +27,14 @@
                           { prompt: "Select a role..." },
                           class: 'form-control' %>
 
-              <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
+              <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
             </div>
           </div>
         <% end %>
         </div>
       <% end %>
 
-      <%= simple_form_for @form.permission_template,
+      <%= simple_form_for collection_permission_template_form_for(form: @form),
                           url: [hyrax, :admin, @form, :permission_template],
                           html: { id: 'user-participants-form' } do |f| %>
         <%= f.fields_for 'access_grants_attributes',
@@ -53,19 +53,19 @@
                             { prompt: "Select a role..." },
                             class: 'form-control' %>
 
-              <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info' %>
-              <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
+              <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-secondary ml-2' %>
+              <p class="form-text"><%= t('hyrax.admin.admin_sets.form.note') %></p>
             </div>
           </div>
         <% end %>
       <% end %>
 
-      <fieldset class="admin-set-participants">
-        <legend><%= t(".current_participants") %></legend>
+      <h2 class="h3"><%= t(".current_participants") %></h2>
+      <fieldset class="admin-set-participants section-collection-sharing">
         <%= render 'form_participant_table', access: 'managers', filter: :manage? %>
         <%= render 'form_participant_table', access: 'depositors', filter: :deposit? %>
         <%= render 'form_participant_table', access: 'viewers', filter: :view? %>
       </fieldset>
-    </div>
+    </div><!-- /.card-body -->
   </div>
 </div>
diff --git a/app/views/hyrax/admin/appearances/_banner_image_form.html.erb b/app/views/hyrax/admin/appearances/_banner_image_form.html.erb
index c92d3b4c0..a5a0ee11e 100644
--- a/app/views/hyrax/admin/appearances/_banner_image_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_banner_image_form.html.erb
@@ -1,19 +1,20 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body">
+  <div class="card-body">
     <% require_image = @form.banner_image? ? false : true %>
     <%# Upload Banner Image %>
     <%= f.input :banner_image, as: :file, wrapper: :vertical_file_input, required: require_image, hint: t('hyrax.admin.appearances.show.forms.banner_image.hint') %>
     <%= f.input :banner_image_text, required: true, as: :text, label: 'Banner image alt text' %>
-    <%= image_tag @form.banner_image.url, class: "img-responsive" if @form.banner_image? %>
+    <%= image_tag @form.banner_image.url, class: "img-fluid" if @form.banner_image? %>
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer">
+    <%= f.submit class: 'btn btn-primary float-right' %>
   </div>
 <% end %>
+
 <% if @form.banner_image? %>
-  <div class="panel-footer">
+  <div class="card-footer">
     <%= simple_form_for @form.site, url: main_app.site_path(@form.site) do |f| %>
       <%= f.submit 'Remove banner image', class: 'btn btn-danger', name: :remove_banner_image %>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/admin/appearances/_color_input.html.erb b/app/views/hyrax/admin/appearances/_color_input.html.erb
index b8a7783b8..7b735a4c5 100644
--- a/app/views/hyrax/admin/appearances/_color_input.html.erb
+++ b/app/views/hyrax/admin/appearances/_color_input.html.erb
@@ -9,7 +9,7 @@
   <div class='col-lg-2'>
     <%= link_to 'Restore Default',
         '#color',
-        class: "btn btn-default restore-default-color #{'with-color-hint' if !missing_translation(hint)}",
+        class: "btn btn-secondary restore-default-color #{'with-color-hint' if !missing_translation(hint)}",
         data: { default_target: color_name } %>
   </div>
 </div>
diff --git a/app/views/hyrax/admin/appearances/_custom_css_form.html.erb b/app/views/hyrax/admin/appearances/_custom_css_form.html.erb
index 6fdea57c6..f4f5d980f 100644
--- a/app/views/hyrax/admin/appearances/_custom_css_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_custom_css_form.html.erb
@@ -1,5 +1,5 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body">
+  <div class="card-body">
     <%= f.input :custom_css_block, required: false, as: :text, label: 'Add Custom CSS Below' %>
     <script>
       var custom_css_block = document.getElementById('admin_appearance_custom_css_block')
@@ -12,7 +12,7 @@
       });
     </script>
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right', data: { confirm: t('hyrax.admin.appearances.show.forms.custom_css.confirm') } %>
+  <div class="card-footer">
+    <%= f.submit class: 'btn btn-primary float-right', data: { confirm: t('hyrax.admin.appearances.show.forms.custom_css.confirm') } %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/admin/appearances/_default_colors_form.html.erb b/app/views/hyrax/admin/appearances/_default_colors_form.html.erb
index 69c66108f..323ac98fc 100644
--- a/app/views/hyrax/admin/appearances/_default_colors_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_default_colors_form.html.erb
@@ -1,11 +1,11 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body defaultable-colors">
+  <div class="card-body defaultable-colors">
     <% @form.default_colors.each do |color_name, hex| %>
       <%= render 'color_input', f: f, color_name: color_name, hex: hex %>
     <% end %>
   </div>
-  <div class="panel-footer">
-    <%= link_to 'Restore All Defaults', '#color', class: 'btn btn-default restore-all-default-colors' %>
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer">
+    <%= link_to 'Restore All Defaults', '#color', class: 'btn btn-secondary restore-all-default-colors' %>
+    <%= f.submit class: 'btn btn-primary float-right' %>
   </div>
 <% end %>
diff --git a/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb b/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb
index 04e6192b2..24abeac39 100644
--- a/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_default_fonts_form.html.erb
@@ -1,17 +1,17 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body defaultable-fonts">
+  <div class="card-body defaultable-fonts">
     <% df = @form.default_fonts %>
     <% font = f.object.body_font %>
 
     <%= f.input :body_font, label: 'Select Body Font', required: false, input_html: { class: 'font-fields', data: { default_value: df['body_font'] } } %>
-    <%= link_to 'Restore Default', '#font', class: 'btn btn-default restore-default-font', data: { default_target: 'body_font' } %>
+    <%= link_to 'Restore Default', '#font', class: 'btn btn-secondary restore-default-font', data: { default_target: 'body_font' } %>
 
     <%= f.input :headline_font, label: 'Select Header Font', required: false, input_html: { class: 'font-fields', data: { default_value: df['headline_font'] } } %>
-    <%= link_to 'Restore Default', '#font', class: 'btn btn-default restore-default-font', data: { default_target: 'headline_font' } %>
+    <%= link_to 'Restore Default', '#font', class: 'btn btn-secondary restore-default-font', data: { default_target: 'headline_font' } %>
 
   </div>
-  <div class="panel-footer">
-    <%= link_to 'Restore All Defaults', '#font', class: 'btn btn-default restore-all-default-fonts' %>
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer">
+    <%= link_to 'Restore All Defaults', '#font', class: 'btn btn-secondary restore-all-default-fonts' %>
+    <%= f.submit class: 'btn btn-primary float-right' %>
   </div>
 <% end %>
diff --git a/app/views/hyrax/admin/appearances/_default_images_form.html.erb b/app/views/hyrax/admin/appearances/_default_images_form.html.erb
index 8e409fff5..dc2da00e3 100644
--- a/app/views/hyrax/admin/appearances/_default_images_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_default_images_form.html.erb
@@ -1,20 +1,20 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body">
+  <div class="card-body">
     <%= f.input :default_collection_image, as: :file, wrapper: :vertical_file_input, hint: t('hyrax.admin.appearances.show.forms.default_images.hint'), required: false %>
     <%= f.input :default_collection_image_text, as: :text, label: 'Default collection image alt text', required: false %>
-    <%= image_tag @form.default_collection_image.url, class: "img-responsive" if @form.default_collection_image? %>
+    <%= image_tag @form.default_collection_image.url, class: "img-fluid" if @form.default_collection_image? %>
 
     <%= f.input :default_work_image, as: :file, wrapper: :vertical_file_input, hint: t('hyrax.admin.appearances.show.forms.default_images.hint'), required: false %>
     <%= f.input :default_work_image_text, as: :text, label: 'Default work image alt text', required: false %>
-    <%= image_tag @form.default_work_image.url, class: "img-responsive" if @form.default_work_image? %>
+    <%= image_tag @form.default_work_image.url, class: "img-fluid" if @form.default_work_image? %>
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer">
+    <%= f.submit class: 'btn btn-primary float-right' %>
   </div>
 <% end %>
 
 <% if @form.default_collection_image? || @form.default_work_image? %>
-  <div class="panel-footer">
+  <div class="card-footer">
     <% if @form.default_collection_image? %>
       <%= simple_form_for @form.site, url: main_app.site_path(@form.site) do |f| %>
         <%= f.submit 'Remove default collection image', class: 'btn btn-danger', name: :remove_default_collection_image %>
@@ -26,4 +26,4 @@
       <% end %>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/admin/appearances/_directory_image_form.html.erb b/app/views/hyrax/admin/appearances/_directory_image_form.html.erb
index cc29927ee..18f6b25fb 100644
--- a/app/views/hyrax/admin/appearances/_directory_image_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_directory_image_form.html.erb
@@ -1,19 +1,19 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body">
+  <div class="card-body">
     <% require_image = @form.directory_image? ? false : true %>
     <%# Upload Directory Image %>
     <%= f.input :directory_image, as: :file, wrapper: :vertical_file_input, required: require_image, hint: t('hyrax.admin.appearances.show.forms.directory_image.hint') %>
     <%= f.input :directory_image_text, required: true, as: :text, label: 'Directory image alt text' %>
-    <%= image_tag @form.directory_image.url, class: "img-responsive" if @form.directory_image? %>
+    <%= image_tag @form.directory_image.url, class: "img-fluid" if @form.directory_image? %>
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer">
+    <%= f.submit class: 'btn btn-primary float-right' %>
   </div>
 <% end %>
 <% if @form.directory_image? %>
-  <div class="panel-footer">
+  <div class="card-footer">
     <%= simple_form_for @form.site, url: main_app.site_path(@form.site) do |f| %>
       <%= f.submit 'Remove directory image', class: 'btn btn-danger', name: :remove_directory_image %>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/admin/appearances/_favicon_form.html.erb b/app/views/hyrax/admin/appearances/_favicon_form.html.erb
index 1b526ff10..157a2c404 100644
--- a/app/views/hyrax/admin/appearances/_favicon_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_favicon_form.html.erb
@@ -1,17 +1,17 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body">
+  <div class="card-body">
     <% require_image = @form.favicon? ? false : true %>
     <%= f.input :favicon, as: :file, wrapper: :vertical_file_input, hint: t('hyrax.admin.appearances.show.forms.favicon.hint') %>
-    <%= image_tag @form.favicon.url, class: "img-responsive" if @form.favicon? %>
+    <%= image_tag @form.favicon.url, class: "img-fluid" if @form.favicon? %>
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer">
+    <%= f.submit class: 'btn btn-primary float-right' %>
   </div>
 <% end %>
 <% if @form.favicon? %>
-  <div class="panel-footer">
+  <div class="card-footer">
     <%= simple_form_for @form.site, url: main_app.site_path(@form.site) do |f| %>
       <%= f.submit 'Remove favicon', class: 'btn btn-danger', name: :remove_favicon %>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/admin/appearances/_logo_image_form.html.erb b/app/views/hyrax/admin/appearances/_logo_image_form.html.erb
index 3b21357f4..2d1bc9be4 100644
--- a/app/views/hyrax/admin/appearances/_logo_image_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_logo_image_form.html.erb
@@ -1,19 +1,19 @@
 <%= simple_form_for @form, url: admin_appearance_path do |f| %>
-  <div class="panel-body">
+  <div class="card-body">
     <% require_image = @form.logo_image? ? false : true %>
     <%# Upload Logo Image %>
     <%= f.input :logo_image, as: :file, wrapper: :vertical_file_input, required: require_image, hint: t('hyrax.admin.appearances.show.forms.logo_image.hint') %>
     <%= f.input :logo_image_text, required: true, as: :text, label: 'Logo image alt text' %>
-    <%= image_tag @form.logo_image.url, class: "img-responsive" if @form.logo_image? %>
+    <%= image_tag @form.logo_image.url, class: "img-fluid" if @form.logo_image? %>
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer">
+    <%= f.submit class: 'btn btn-primary float-right' %>
   </div>
 <% end %>
 <% if @form.logo_image? %>
-  <div class="panel-footer">
+  <div class="card-footer">
     <%= simple_form_for @form.site, url: main_app.site_path(@form.site) do |f| %>
       <%= f.submit 'Remove logo image', class: 'btn btn-danger', name: :remove_logo_image %>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/admin/appearances/_theme_form.html.erb b/app/views/hyrax/admin/appearances/_theme_form.html.erb
index d79a03c13..2b60e7453 100644
--- a/app/views/hyrax/admin/appearances/_theme_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_theme_form.html.erb
@@ -1,5 +1,5 @@
 <%= simple_form_for @form.site, url: main_app.site_path(@form.site) do |f| %>
-  <div class="panel-body">
+  <div class="card-body">
     <div class="row">
       <div class="col-sm-6">
         <% home_options = @home_theme_names.map { |g| [g[0], g[1], {'data-image' => image_path("themes/#{g[1]}/#{g[1]}.jpg")}] } %>
@@ -23,23 +23,7 @@
         </ul>
       </div>
       <div id="home-wireframe" class="col-sm-6">
-        <%= image_tag "themes/default_home/default_home", class: "img-responsive" %>
-      </div>
-    </div>
-    <hr />
-    <div class="row">
-      <div class="col-sm-6">
-        <% search_options = @search_themes.map { |s| [s[0], s[1], { 'data-image' => image_path("themes/search/#{s[1]}.jpg") }] } %>
-        <%= f.input :search_theme, label: 'Search Results Page Theme' do %>
-          <%= f.select :search_theme, search_options, {}, { prompt: 'Select search results page theme...', class: 'form-control' } %>
-        <% end %>
-        <h4>Search Results Theme notes:</h4>
-        <ul>
-          <li>This will select a default view for the search results page. Users can select their preferred views on the search results page that will override this selection.</li>
-        </ul>
-      </div>
-      <div id="search-wireframe" class="col-sm-6">
-        <%= image_tag "themes/search/list_view.jpg", class: "img-responsive" %>
+        <%= image_tag "themes/default_home/default_home", class: "img-fluid" %>
       </div>
     </div>
     <hr />
@@ -56,7 +40,7 @@
         </ul>
       </div>
       <div id="show-wireframe" class="col-sm-6">
-        <%= image_tag "themes/default_show/default_show", class: "img-responsive" %>
+        <%= image_tag "themes/default_show/default_show", class: "img-fluid" %>
       </div>
     </div>
     <hr />
diff --git a/app/views/hyrax/admin/appearances/show.html.erb b/app/views/hyrax/admin/appearances/show.html.erb
index 8194f2890..cd37788ab 100644
--- a/app/views/hyrax/admin/appearances/show.html.erb
+++ b/app/views/hyrax/admin/appearances/show.html.erb
@@ -4,88 +4,88 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs" id="admin-set-controls">
+    <div class="card tabs" id="admin-set-controls">
       <ul class="nav nav-tabs" role="tablist">
-        <li class="active">
-          <a href="#logo_image" role="tab" data-toggle="tab"><%= t('.tabs.logo') %></a>
+        <li class="nav-item">
+          <a class="nav-link active" href="#logo_image" role="tab" data-toggle="tab"><%= t('.tabs.logo') %></a>
         </li>
-        <li>
-          <a href="#favicon" role="tab" data-toggle="tab"><%= t('.tabs.favicon') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#favicon" role="tab" data-toggle="tab"><%= t('.tabs.favicon') %></a>
         </li>
-        <li>
-          <a href="#banner_image" role="tab" data-toggle="tab"><%= t('.tabs.banner_image') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#banner_image" role="tab" data-toggle="tab"><%= t('.tabs.banner_image') %></a>
         </li>
-        <li>
-          <a href="#directory_image" role="tab" data-toggle="tab"><%= t('.tabs.directory_image') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#directory_image" role="tab" data-toggle="tab"><%= t('.tabs.directory_image') %></a>
         </li>
-        <li>
-          <a href="#default_images" role="tab" data-toggle="tab"><%= t('.tabs.default_images') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#default_images" role="tab" data-toggle="tab"><%= t('.tabs.default_images') %></a>
         </li>
-        <li>
-          <a href="#color" role="tab" data-toggle="tab"><%= t('.tabs.colors') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#color" role="tab" data-toggle="tab"><%= t('.tabs.colors') %></a>
         </li>
-        <li>
-          <a href="#font" role="tab" data-toggle="tab"><%= t('.tabs.fonts') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#font" role="tab" data-toggle="tab"><%= t('.tabs.fonts') %></a>
         </li>
-        <li>
-          <a href="#css" role="tab" data-toggle="tab"><%= t('.tabs.custom_css') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#css" role="tab" data-toggle="tab"><%= t('.tabs.custom_css') %></a>
         </li>
-        <li>
-          <a href="#themes" role="tab" data-toggle="tab"><%= t('.tabs.themes') %></a>
+        <li class="nav-item">
+          <a class="nav-link" href="#themes" role="tab" data-toggle="tab"><%= t('.tabs.themes') %></a>
         </li>
       </ul>
       <div class="tab-content">
 
         <div id="logo_image" class="tab-pane active">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'logo_image_form' %>
           </div>
         </div>
 
         <div id="favicon" class="tab-pane">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'favicon_form' %>
           </div>
         </div>
 
         <div id="banner_image" class="tab-pane">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'banner_image_form' %>
           </div>
         </div>
 
         <div id="directory_image" class="tab-pane">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'directory_image_form' %>
           </div>
         </div>
 
         <div id="default_images" class="tab-pane" data-alert="<%= I18n.t('hyrax.admin.appearances.show.forms.default_images.alert') %>">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'default_images_form' %>
           </div>
         </div>
 
         <div id="color" class="tab-pane">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'default_colors_form' %>
           </div>
         </div>
 
         <div id="font" class="tab-pane">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'default_fonts_form' %>
           </div>
         </div>
 
         <div id="css" class="tab-pane">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'custom_css_form' %>
           </div>
         </div>
 
         <div id="themes" class="tab-pane">
-          <div class="panel panel-default labels">
+          <div class="card">
             <%= render 'theme_form' %>
           </div>
         </div>
diff --git a/app/views/hyrax/admin/collection_types/_form_participants.html.erb b/app/views/hyrax/admin/collection_types/_form_participants.html.erb
index 52e3b0658..7e0c7bdc4 100644
--- a/app/views/hyrax/admin/collection_types/_form_participants.html.erb
+++ b/app/views/hyrax/admin/collection_types/_form_participants.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax v3.4.2 Make group field a select instead of text input %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Make group field a select instead of text input %>
 <h3><%= t('.add_participants') %></h3>
 <p><%= t('.instructions') %></p>
 <% access_options = options_for_select([
@@ -14,9 +14,9 @@
                           html: { id: 'group-participants-form' },
                           as: :collection_type_participant do |f| %>
             <div class="form-inline add-participants-form">
-            <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %>:</label>
+            <label class="col-md-2 col-4 col-form-label"><%= t('.add_group') %>:</label>
 
-            <div class="col-md-10 col-xs-8 form-group">
+            <div class="col-md-10 col-8 form-group">
               <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
               <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::GROUP_TYPE %>
               <%# OVERRIDE: change from text_field to select %>
@@ -43,9 +43,9 @@
                           html: { id: 'user-participants-form' },
                           as: :collection_type_participant do |f| %>
             <div class="form-inline add-participants-form">
-              <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %>:</label>
+              <label class="col-md-2 col-4 col-form-label"><%= t('.add_user') %>:</label>
 
-              <div class="col-md-10 col-xs-8 form-group">
+              <div class="col-md-10 col-8 form-group">
                 <%= f.hidden_field :hyrax_collection_type_id, value: @collection_type_participant.hyrax_collection_type_id %>
                 <%= f.hidden_field :agent_type, value: Hyrax::CollectionTypeParticipant::USER_TYPE %>
                 <%= f.text_field :agent_id,
diff --git a/app/views/hyrax/admin/stats/show.html.erb b/app/views/hyrax/admin/stats/show.html.erb
index 273caa4a7..4996fe330 100644
--- a/app/views/hyrax/admin/stats/show.html.erb
+++ b/app/views/hyrax/admin/stats/show.html.erb
@@ -1,21 +1,29 @@
 <% content_for :page_header do %>
   <h1><span class="fa fa-edit"></span> Statistics for <%= application_name %></h1>
 <% end %>
-  
-  <div class="panel panel-default tabs">
+
+  <div class="card tabs">
     <!-- Nav tabs -->
     <ul id="statistics-tabs" class="nav nav-tabs" role="tablist">
-      <li role="presentation" class="active"><a href="#collections" aria-controls="collections" role="tab" data-toggle="tab">Collections</a></li>
-      <li role="presentation"><a href="#works" aria-controls="works" role="tab" data-toggle="tab">Works</a></li>
-      <li role="presentation"><a href="#downloads" aria-controls="downloads" role="tab" data-toggle="tab">Downloads</a></li>
-      <li role="presentation"><a href="#users" aria-controls="users" role="tab" data-toggle="tab">Users</a></li>
+      <li class="nav-item">
+        <a class="nav-link active" href="#collections" role="tab" data-toggle="tab">Collections</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#works" role="tab" data-toggle="tab">Works</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#downloads" role="tab" data-toggle="tab">Downloads</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#users" role="tab" data-toggle="tab">Users</a>
+      </li>
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content">
-      <div role="tabpanel" class="tab-pane active" id="collections">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+      <div class="tab-pane active" id="collections">
+        <div class="card labels">
+          <div class="card-body">
             <h2>Collections over time</h2>
             <%=
               graph_tag('collection-graph', [Hyrax::Statistics::Collections::OverTime.new.points], {
@@ -34,8 +42,8 @@
         </div>
       </div>
       <div role="tabpanel" class="tab-pane" id="works">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+        <div class="card labels">
+          <div class="card-body">
             <h2>Works over time</h2>
             <%=
               graph_tag('works-graph', [Hyrax::Statistics::Works::OverTime.new.points], {
@@ -62,21 +70,20 @@
         </div>
       </div>
       <div role="tabpanel" class="tab-pane" id="downloads">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+        <div class="card labels">
+          <div class="card-body">
             ...
           </div>
         </div>
       </div>
       <div role="tabpanel" class="tab-pane" id="users">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+        <div class="card labels">
+          <div class="card-body">
             <%= render "hyrax/admin/stats/stats_by_date" %>
             <%= render "hyrax/admin/stats/top_data" %>
           </div>
         </div>
       </div>
-    </div>
       <script>
         Blacklight.onLoad(function() {
           var stats = require('statistics_tab_manager');
@@ -84,5 +91,5 @@
           new stats.Tab('#works');
         });
       </script>
-
+    </div>
   </div>
diff --git a/app/views/hyrax/admin/users/index.html.erb b/app/views/hyrax/admin/users/index.html.erb
index dc12474c7..9d5d33dbe 100644
--- a/app/views/hyrax/admin/users/index.html.erb
+++ b/app/views/hyrax/admin/users/index.html.erb
@@ -9,14 +9,14 @@
 <% end %>
 
 <% if can? :create, User %>
-  <div class="panel panel-default users-invite">
-    <div class="panel-heading">
+  <div class="card users-invite">
+    <div class="card-header">
         <%= t('.invite_users') %>
     </div>
 
-    <div class="panel-body">
+    <div class="card-body">
       <%# user_invitation_path is provided by devise_invitable %>
-      <%= simple_form_for :user,  url: main_app.user_invitation_path, html: { class: 'form-inline pull-left' } do |f| %>
+      <%= simple_form_for :user,  url: main_app.user_invitation_path, html: { class: 'form-inline d-inline-flex' } do |f| %>
         <div class="form-group">
           <%= f.hint :email %>
           <%= f.label :email, class: "control-label", required: false %>
@@ -33,12 +33,12 @@
   </div>
 <% end %>
 
-<div class="panel panel-default users-listing">
-  <div class="panel-heading">
+<div class="card users-listing">
+  <div class="card-header">
       <%= t('hyrax.admin.users.index.describe_users_html', count: @presenter.user_count) %>
   </div>
 
-  <div class="panel-body">
+  <div class="card-body">
     <div class="table-responsive">
       <table class="table table-striped datatable">
         <thead>
diff --git a/app/views/hyrax/admin/workflow_roles/index.html.erb b/app/views/hyrax/admin/workflow_roles/index.html.erb
index 4d642f0ec..1c99b0682 100644
--- a/app/views/hyrax/admin/workflow_roles/index.html.erb
+++ b/app/views/hyrax/admin/workflow_roles/index.html.erb
@@ -1,19 +1,19 @@
-<%# OVERRIDE Hyrax v3.4.2 Add workflow roles to groups %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Add workflow roles to groups %>
 <% provide :page_header do %>
   <h1><span class="fa fa-users" aria-hidden="true"></span>  <%= t("hyrax.admin.workflow_roles.header") %></h1>
 <% end %>
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class='panel-body'>
+    <div class="card">
+      <div class='card-body'>
         <%# OVERRIDE: New form for adding workflow roles to groups %>
         <!-- BEGIN Assign Role to Group -->
-        <div class='panel panel-default'>
-          <div class='panel-heading'>
-            <h2 class='panel-title h2'><%= t('.new_group_role') %></h2>
+        <div class='card'>
+          <div class='card-header'>
+            <h2 class='card-title h2'><%= t('.new_group_role') %></h2>
           </div>
-          <div class='panel-body'>
+          <div class='card-body'>
             <%= simple_form_for Hyrax::Forms::WorkflowResponsibilityGroupForm.new, url: hyrax.admin_workflow_roles_path, html: { id: :new_sipity_group_workflow_responsibility } do |f| %>
               <%= f.input :group_id, as: :select, collection: f.object.group_options, label_method: :humanized_name, value_method: :id %>
               <%= f.input :workflow_role_id, as: :select, collection: f.object.workflow_role_options, input_html: { id: :sipity_workflow_responsibility_group_workflow_role_id } %>
@@ -24,11 +24,11 @@
         <!-- END Assign Role to Group -->
 
         <!-- BEGIN Assign Role to User -->
-        <div class='panel panel-default'>
-          <div class='panel-heading'>
-            <h2 class='panel-title h2'><%= t('.new_user_role') %></h2>
+        <div class='card'>
+          <div class='card-header'>
+            <h2 class='card-title h2'><%= t('.new_user_role') %></h2>
           </div>
-          <div class='panel-body'>
+          <div class='card-body'>
             <%= simple_form_for Hyrax::Forms::WorkflowResponsibilityForm.new, url: hyrax.admin_workflow_roles_path do |f| %>
               <%= f.input :user_id, as: :select, collection: f.object.user_options %>
               <%= f.input :workflow_role_id, as: :select, collection: f.object.workflow_role_options %>
@@ -44,15 +44,15 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class='panel-body'>
+    <div class="card">
+      <div class='card-body'>
         <%# OVERRIDE: Add section for current group roles %>
         <!-- BEGIN Current Group Roles -->
-        <div class='panel panel-default'>
-          <div class='panel-heading'>
-            <h2 class='panel-title h2'><%= t('.current_group_roles') %></h2>
+        <div class='card'>
+          <div class='card-header'>
+            <h2 class='card-title h2'><%= t('.current_group_roles') %></h2>
           </div>
-          <div class='panel-body'>
+          <div class='card-body'>
             <table class='table table-striped datatable group-workflow-roles-table'>
               <thead>
                 <th><%= t('.header.group_name') %></th>
@@ -89,11 +89,11 @@
         <!-- END Current Group Roles -->
 
         <!-- BEGIN Current User Roles -->
-        <div class='panel panel-default'>
-          <div class='panel-heading'>
-            <h2 class='panel-title h2'><%= t('.current_user_roles') %></h2>
+        <div class='card'>
+          <div class='card-header'>
+            <h2 class='card-title h2'><%= t('.current_user_roles') %></h2>
           </div>
-          <div class='panel-body'>
+          <div class='card-body'>
             <table class='table table-striped datatable user-workflow-roles-table'>
               <thead>
                 <th><%= t('.header.email') %></th>
diff --git a/app/views/hyrax/base/_form_share.html.erb b/app/views/hyrax/base/_form_share.html.erb
index 732cbe199..b9988386e 100644
--- a/app/views/hyrax/base/_form_share.html.erb
+++ b/app/views/hyrax/base/_form_share.html.erb
@@ -1,7 +1,7 @@
-<%# OVERRIDE: Hyrax 2.5.1 to use Hyrax::Groups for groups select box %>
+<%# OVERRIDE: Hyrax v5.0.0rc2 to use Hyrax::Groups for groups select box %>
 
 <p><%= t('.directions') %></p>
-<h2><%= t('.add_sharing') %></h2>
+<h2 class="h3 mt-4"><%= t('.add_sharing') %></h2>
 
 <% depositor = f.object.depositor %>
 
@@ -29,7 +29,7 @@
     <label for="new_group_permission_skel" class="sr-only">Access type to grant</label>
     <%= select_tag 'new_group_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
 
-    <button class="btn btn-default" id="add_new_group_skel">
+    <button class="btn btn-secondary ml-2" id="add_new_group_skel">
       <span>Add<span class="sr-only"> this group</span></span>
     </button>
     <br /><span id="directory_group_result"></span>
@@ -45,7 +45,7 @@
     <%= text_field_tag 'new_user_name_skel', nil %>
     <label for="new_user_permission_skel" class="sr-only">Access type to grant</label>
     <%= select_tag 'new_user_permission_skel', options_for_select(Hyrax.config.permission_options), class: 'form-control' %>
-    <button class="btn btn-default" id="add_new_user_skel">
+    <button class="btn btn-secondary ml-2" id="add_new_user_skel">
       <span>Add<span class="sr-only"> this <%= t('hyrax.account_label') %></span></span>
     </button>
     <br /> <span id="directory_user_result"></span>
diff --git a/app/views/hyrax/base/_show_actions.html.erb b/app/views/hyrax/base/_show_actions.html.erb
index b726f7dba..07151faa2 100644
--- a/app/views/hyrax/base/_show_actions.html.erb
+++ b/app/views/hyrax/base/_show_actions.html.erb
@@ -1,21 +1,21 @@
-<%# OVERRIDE Hyrax v3.4.2 Adjust permission checks and add analytics button %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Adjust permission checks and add analytics button %>
 <div class="show-actions">
   <% if presenter.editor? %>
-      <%= link_to "Edit", edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>
+      <%= link_to t('.edit'), edit_polymorphic_path([main_app, presenter]), class: 'btn btn-secondary' %>
       <%# OVERRIDE: wrap Delete button in #can? check %>
       <% if current_ability.can?(:delete, presenter.solr_document) %>
         <%= link_to "Delete", [main_app, presenter], class: 'btn btn-danger', data: { confirm: "Delete this #{presenter.human_readable_type}?" }, method: :delete %>
       <% end %>
       <% if presenter.member_presenters.size > 1 %>
-          <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-default' %>
+          <%= link_to t("hyrax.file_manager.link_text"), polymorphic_path([main_app, :file_manager, presenter]), class: 'btn btn-secondary' %>
       <% end %>
       <% if presenter.valid_child_concerns.length > 0 %>
         <div class="btn-group">
-          <button type="button" class="btn btn-default dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <button type="button" class="btn btn-secondary dropdown-toggle" type="button" id="dropdown-menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Attach Child <span class="caret"></span></button>
             <ul class="dropdown-menu">
               <% presenter.valid_child_concerns.each do |concern| %>
-                <li>
+                <li class="dropdown-item">
                   <%= link_to "Attach #{concern.human_readable_type}", polymorphic_path([main_app, :new, :hyrax, :parent, concern.model_name.singular.to_sym], parent_id: presenter.id) %>
                 </li>
               <% end %>
@@ -26,22 +26,22 @@
   <% if presenter.show_deposit_for?(collections: @user_collections) %>
       <input type="checkbox"  style="display:none" name="batch_document_ids[]" id="batch_document_<%= presenter.id %>" value="<%= presenter.id %>" class="batch_document_selector" checked="checked" />
       <%= button_tag t('hyrax.dashboard.my.action.add_to_collection'),
-                     class: 'btn btn-default submits-batches submits-batches-add',
+                     class: 'btn btn-secondary submits-batches submits-batches-add',
                      data: { toggle: "modal", target: "#collection-list-container" } %>
   <% end %>
   <% if presenter.work_featurable? %>
       <%= link_to "Feature", hyrax.featured_work_path(presenter, format: :json),
           data: { behavior: 'feature' },
-          class: presenter.display_unfeature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
+          class: presenter.display_unfeature_link? ? 'btn btn-secondary collapse' : 'btn btn-secondary' %>
 
       <%= link_to "Unfeature", hyrax.featured_work_path(presenter, format: :json),
           data: { behavior: 'unfeature' },
-          class: presenter.display_feature_link? ? 'btn btn-default collapse' : 'btn btn-default' %>
+          class: presenter.display_feature_link? ? 'btn btn-secondary collapse' : 'btn btn-secondary' %>
   <% end %>
   <% if Hyrax.config.analytics? %>
       <% # turbolinks needs to be turned off or the page will use the cache and the %>
       <% # analytics graph will not show unless the page is refreshed. %>
-      <%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %>
+      <%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>
     <% end %>
 </div>
 
diff --git a/app/views/hyrax/base/show.html.erb b/app/views/hyrax/base/show.html.erb
index 01ccf18ca..47e5b202f 100644
--- a/app/views/hyrax/base/show.html.erb
+++ b/app/views/hyrax/base/show.html.erb
@@ -8,11 +8,11 @@
   <div class="col-sm-12">
     <%= render 'work_type', presenter: @presenter %>
   </div>
-  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
+  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-12">
     <%= render 'work_title', presenter: @presenter %>
     <%= render 'show_actions', presenter: @presenter %>
-    <div class="panel panel-default">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
           <% if @presenter.iiif_viewer? %>
@@ -31,22 +31,22 @@
           </div>
         </div>
       </div>
-    </div><!-- /panel -->
+    </div><!-- /card -->
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title"><%= t('hyrax.base.show.relationships') %></h1>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title"><%= t('hyrax.base.show.relationships') %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= render 'relationships', presenter: @presenter %>
       </div>
     </div>
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h1 class="panel-title"><%= t('.items') %></h1>
+    <div class="card">
+      <div class="card-header">
+        <h2 class="card-title"><%= t('.items') %></h2>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= render 'items', presenter: @presenter %>
       </div>
     </div>
diff --git a/app/views/hyrax/contact_form/new.html.erb b/app/views/hyrax/contact_form/new.html.erb
index 18ddba15c..b008f454b 100644
--- a/app/views/hyrax/contact_form/new.html.erb
+++ b/app/views/hyrax/contact_form/new.html.erb
@@ -1,4 +1,4 @@
-<%# Hyrax 3.4.2 override to add negative captcha %>
+<%# OVERRIDE Hyrax v5.0.0rc2 override to add negative captcha %>
 <% provide :page_title, I18n.t('hyrax.contact_form.title') %>
 
 <div class="alert alert-info">
@@ -18,35 +18,36 @@
 <% end %>
 
 <%= form_for @contact_form, url: hyrax.contact_form_index_path,
-                            html: { class: 'form-horizontal' } do |f| %>
+                            html: { class: '' } do |f| %>
   <%= raw negative_captcha(@captcha) %>
   <%= f.text_field :contact_method, class: 'hide' %>
-  <div class="form-group">
-    <%= f.label :category, t('hyrax.contact_form.type_label'), class: "col-sm-2 control-label" %>
+
+  <div class="form-group row">
+    <%= f.label :category, t('hyrax.contact_form.type_label'), class: "col-sm-2 col-form-label" %>
     <div class="col-sm-10">
       <%= f.select 'category', options_for_select(contact_form_issue_type_options), { include_blank: t('hyrax.contact_form.select_type') }, {class: 'form-control', required: true } %>
     </div>
   </div>
 
-  <div class="form-group">
-    <%= negative_label_tag(@captcha, :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 control-label" ) %>
-    <div class="col-sm-10"><%= negative_text_field_tag(@captcha, :name, value: nm, class: 'form-control', required: true ) %></div>
+  <div class="form-group row">
+    <%= f.label :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 col-form-label" %>
+    <div class="col-sm-10"><%= f.text_field :name, value: nm, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="form-group">
-    <%= negative_label_tag(@captcha, :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 control-label" ) %>
-    <div class="col-sm-10"><%= negative_text_field_tag(@captcha, :email, value: em, class: 'form-control', required: true ) %></div>
+  <div class="form-group row">
+    <%= f.label :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 col-form-label" %>
+    <div class="col-sm-10"><%= f.text_field :email, value: em, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="form-group">
-    <%= f.label :subject, t('hyrax.contact_form.subject_label'), class: "col-sm-2 control-label" %>
+  <div class="form-group row">
+    <%= f.label :subject, t('hyrax.contact_form.subject_label'), class: "col-sm-2 col-form-label" %>
     <div class="col-sm-10"><%= f.text_field :subject, class: 'form-control', required: true %></div>
   </div>
 
-  <div class="form-group">
-    <%= negative_label_tag(@captcha, :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 control-label" ) %>
-    <div class="col-sm-10"><%= negative_text_area_tag(@captcha, :message, rows: 4, class: 'form-control', required: true ) %></div>
+  <div class="form-group row">
+    <%= f.label :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 col-form-label" %>
+    <div class="col-sm-10"><%= f.text_area :message, rows: 4, class: 'form-control', required: true %></div>
   </div>
 
   <%= f.submit value: t('hyrax.contact_form.button_label'), class: "btn btn-primary" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/content_blocks/_form.html.erb b/app/views/hyrax/content_blocks/_form.html.erb
index 76d7e0d26..e9375879d 100644
--- a/app/views/hyrax/content_blocks/_form.html.erb
+++ b/app/views/hyrax/content_blocks/_form.html.erb
@@ -1,32 +1,44 @@
-<%# Copied from Hyrax v2.9.0 to add home_text content block form - Adding themes %>
+<%# Copied from Hyrax v5.0.0rc2 to add home_text content block form - Adding themes %>
 <%# imported from hyrax 3.0.0.pre.rc1 %>
 <%= render "shared/nav_safety_modal" %>
-<div class="panel panel-default tabs">
+<div class="card tabs">
   <ul class="nav nav-tabs" role="tablist">
-    <li class="active">
-      <a href="#announcement_text" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.announcement_text') %></a>
+    <li id="announcement-nav-item" class="nav-item">
+      <a href="#announcement_text" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.announcement_text') %>
+      </a>
     </li>
-    <li>
-      <a href="#marketing" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.marketing_text') %></a>
+    <li id="marketing-nav-item" class="nav-item">
+      <a href="#marketing" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.marketing_text') %>
+      </a>
     </li>
-    <li>
-      <a href="#home_text" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.home_text') %></a>
+    <li id="home-text-nav-item" class="nav-item">
+      <a href="#home_text" role="tab" data-toggle="tab" class="nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.home_text') %>
+      </a>
     </li>
-    <li>
-      <a href="#researcher" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.featured_researcher') %></a>
+    <li id="researcher-nav-item" class="nav-item">
+      <a href="#researcher" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.featured_researcher') %>
+      </a>
     </li>
-    <li>
-      <a href="#homepage_about_section_heading" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.homepage_about_section_heading') %></a>
+    <li id="homepage-about-heading-nav-item" class="nav-item">
+      <a href="#homepage_about_section_heading" role="tab" data-toggle="tab" class="nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.homepage_about_section_heading') %>
+      </a>
     </li>
-    <li>
-      <a href="#homepage_about_section_content" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t(:'hyrax.content_blocks.tabs.homepage_about_section_content') %></a>
+    <li id="homepage-about-content-nav-item" class="nav-item">
+      <a href="#homepage_about_section_content" role="tab" data-toggle="tab" class="nav-safety-confirm">
+        <%= t(:'hyrax.content_blocks.tabs.homepage_about_section_content') %>
+      </a>
     </li>
   </ul>
   <div class="tab-content">
-    <div id="announcement_text" class="tab-pane active">
-      <div class="panel panel-default labels">
+    <div id="announcement_text" class="tab-pane show active">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:announcement), url: hyrax.content_block_path(ContentBlock.for(:announcement)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :announcement %><br />
                 <%# the following line was changed from hyrax to give some context for what this context block does %>
@@ -34,17 +46,17 @@
                 <%= f.text_area :announcement, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
     </div>
     <div id="marketing" class="tab-pane">
-      <div class="panel panel-default labels">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:marketing), url: hyrax.content_block_path(ContentBlock.for(:marketing)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :marketing %><br />
                 <%# the following line was changed from hyrax to give some context for what this context block does %>
@@ -52,18 +64,18 @@
                 <%= f.text_area :marketing, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
     </div>
     <%# Copied from Hyrax v2.9.0 to add home_text content block form - Adding themes %>
     <div id="home_text" class="tab-pane">
-      <div class="panel panel-default labels">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:home_text), url: hyrax.content_block_path(ContentBlock.for(:home_text)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :home_text %><br />
                 <%# the following line was added to hyku for home page text for themes that use or allow home page text %>
@@ -71,17 +83,17 @@
                 <%= f.text_area :home_text, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
     </div>
     <div id="researcher" class="tab-pane">
-      <div class="panel panel-default labels">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:researcher), url: hyrax.content_block_path(ContentBlock.for(:researcher)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :researcher %><br />
                 <%# the following line was changed from hyrax to give some context for what this context block does %>
@@ -89,17 +101,17 @@
                 <%= f.text_area :researcher, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
     </div>
     <div id="homepage_about_section_heading" class="tab-pane">
-      <div class="panel panel-default labels">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:homepage_about_section_heading), url: hyrax.content_block_path(ContentBlock.for(:homepage_about_section_heading)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :homepage_about_section_heading %><br />
                 <%# the following line was changed from hyrax to give some context for what this context block does %>
@@ -107,17 +119,17 @@
                 <%= f.text_area :homepage_about_section_heading, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
     </div>
     <div id="homepage_about_section_content" class="tab-pane">
-      <div class="panel panel-default labels">
+      <div class="card labels">
         <%= simple_form_for ContentBlock.for(:homepage_about_section_content), url: hyrax.content_block_path(ContentBlock.for(:homepage_about_section_content)), html: {class: 'nav-safety'} do |f| %>
-          <div class="panel-body">
+          <div class="card-body">
             <div class="field form-group">
                 <%= f.label :homepage_about_section_content %><br />
                 <%# the following line was changed from hyrax to give some context for what this context block does %>
@@ -125,9 +137,9 @@
                 <%= f.text_area :homepage_about_section_content, value: f.object.value, class: 'form-control tinymce', rows: 20, cols: 120 %>
             </div>
           </div>
-          <div class="panel-footer">
-            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-default pull-right' %>
-            <%= f.button :submit, class: 'btn btn-primary pull-right' %>
+          <div class="card-footer d-flex justify-content-end">
+            <%= f.button :submit, class: 'btn btn-primary text-white mr-2' %>
+            <%= link_to t(:'hyrax.content_blocks.cancel'), hyrax.admin_admin_sets_path, class: 'btn btn-light' %>
           </div>
         <% end %>
       </div>
diff --git a/app/views/hyrax/dashboard/_sidebar.html.erb b/app/views/hyrax/dashboard/_sidebar.html.erb
index c91d9f0f4..4e9797e94 100644
--- a/app/views/hyrax/dashboard/_sidebar.html.erb
+++ b/app/views/hyrax/dashboard/_sidebar.html.erb
@@ -1,8 +1,10 @@
+<%# OVERIDE Hyrax v5.0.0rc2 to use Hyku::MenuPresenter and add title attribute to link %>
+
 <% menu = Hyku::MenuPresenter.new(self) %>
 <div class="sidebar-toggle"><span class="fa fa-chevron-circle-right"></span></div>
 <nav aria-label="sidebar-nav">
-  <ul class="nav nav-pills nav-stacked">
-    <li>
+  <ul class="nav nav-pills flex-column">
+    <li class="nav-item">
       <div class="profile">
         <div class="profile-image">
           <%= image_tag current_user.avatar.url(:thumb), width: 100 if current_user.avatar.present? %>
@@ -12,8 +14,10 @@
         </div>
       </div>
     </li>
-    <li>
-      <%= link_to hyrax.dashboard_path, title: t('hyrax.admin.sidebar.dashboard') do %>
+    <li class="nav-item">
+      <%= link_to hyrax.dashboard_path,
+                  class: "nav-link",
+                  title: t('hyrax.admin.sidebar.dashboard') do %>
         <span class="fa fa-home" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.dashboard') %></span>
       <% end %>
     </li>
diff --git a/app/views/hyrax/dashboard/collections/_form.html.erb b/app/views/hyrax/dashboard/collections/_form.html.erb
index 6915e4590..23a8a1681 100644
--- a/app/views/hyrax/dashboard/collections/_form.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form.html.erb
@@ -1,34 +1,42 @@
-<%# OVERRIDE Hyrax 2.9.1 to make it say 'Default thumbnail' in the thumbnail select box instead of 'undefined' %>
+<%# OVERRIDE Hyrax v5.0.0rc2 to make it say 'Default thumbnail' in the thumbnail select box instead of 'undefined' %>
 <%= render "shared/nav_safety_modal" %>
-<div class="panel panel-default tabs" id="collection-edit-controls">
-  <ul class="nav nav-tabs" role="tablist">
-    <li class="active">
-      <a href="#description" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.description') %></a>
+<div class="tabs mt-4" id="collection-edit-controls">
+  <ul class="nav nav-tabs" id="dashboard-collection-tab" role="tablist">
+    <li class="nav-item">
+      <a href="#description" role="tab" data-toggle="tab" class="nav-link active nav-safety-confirm">
+        <%= t('.tabs.description') %>
+      </a>
     </li>
     <% if @form.persisted? %>
       <% if collection_brandable?(collection: @collection) %>
-      <li>
-        <a href="#branding" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.branding') %></a>
+      <li class="nav-item">
+        <a href="#branding" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+          <%= t('.tabs.branding') %>
+        </a>
       </li>
       <% end %>
       <% if collection_discoverable?(collection: @collection) %>
-      <li>
-        <a href="#discovery" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.discovery') %></a>
+      <li class="nav-item">
+        <a href="#discovery" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+          <%= t('.tabs.discovery') %>
+        </a>
       </li>
       <% end %>
       <% if collection_sharable?(collection: @collection) %>
-      <li>
-        <a href="#sharing" role="tab" data-toggle="tab" class="nav-safety-confirm"><%= t('.tabs.sharing') %></a>
+      <li class="nav-item">
+        <a href="#sharing" role="tab" data-toggle="tab" class="nav-link nav-safety-confirm">
+          <%= t('.tabs.sharing') %>
+        </a>
       </li>
       <% end %>
     <% end %>
   </ul>
 
   <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor nav-safety', data: { behavior: 'collection-form', 'param-key' => @form.model_name.param_key } } do |f| %>
-    <div class="tab-content">
-      <div id="description" class="tab-pane active">
-        <div class="panel panel-default labels">
-          <div class="panel-body">
+    <div class="tab-content card" id="dashboard-collection-tab-content">
+      <div id="description" class="tab-pane show active">
+        <div class="labels">
+          <div class="card-body">
 
             <div id="base-terms">
               <% f.object.primary_terms.each do |term| %>
@@ -58,7 +66,7 @@
             <% if f.object.display_additional_fields? %>
               <%= link_to t('hyrax.collection.form.additional_fields'),
                       '#extended-terms',
-                      class: 'btn btn-default additional-fields',
+                      class: 'btn btn-secondary additional-fields',
                       data: { toggle: 'collapse' },
                       role: "button",
                       'aria-expanded'=> "false",
@@ -88,8 +96,8 @@
       <% if @form.persisted? %>
         <% if collection_brandable?(collection: @collection) %>
           <div id="branding" class="tab-pane">
-            <div class="panel panel-default labels">
-              <div class="panel-body">
+            <div class="card labels">
+              <div class="card-body">
                 <%= render 'form_branding', f: f %>
               </div>
             </div>
@@ -98,8 +106,8 @@
 
         <% if collection_discoverable?(collection: @collection) %>
           <div id="discovery" class="tab-pane">
-            <div class="panel panel-default labels">
-              <div class="panel-body">
+            <div class="card labels">
+              <div class="card-body">
                 <%= render 'form_discovery', f: f %>
               </div>
             </div>
@@ -108,8 +116,8 @@
 
         <% if collection_sharable?(collection: @collection) %>
           <div id="sharing" class="tab-pane">
-            <div class="panel panel-default labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
-              <div class="panel-body">
+            <div class="card labels" id="collection_permissions" data-param-key="<%= f.object.model_name.param_key %>">
+              <div class="card-body">
                 <%= render 'form_share', f: f %>
               </div>
             </div>
@@ -117,7 +125,7 @@
         <% end %>
       <% end %>
 
-      <div class="panel-footer">
+      <div class="card-footer">
         <% if @collection.persisted? %>
           <%= f.submit t(:'hyrax.collection.select_form.update'), class: 'btn btn-primary', onclick: "confirmation_needed = false;", id: "update_submit", name: "update_collection" %>
           <%= link_to t(:'helpers.action.cancel'), hyrax.dashboard_collection_path(@collection), class: 'btn btn-link' %>
diff --git a/app/views/hyrax/dashboard/collections/_form_branding.html.erb b/app/views/hyrax/dashboard/collections/_form_branding.html.erb
index 38bf18487..14df747e2 100644
--- a/app/views/hyrax/dashboard/collections/_form_branding.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_branding.html.erb
@@ -1,4 +1,4 @@
- <!-- OVERRIDE Hyrax v3.4.1 to add text for collection banner image 
+ <!-- OVERRIDE Hyrax v5.0.0rc2 to add text for collection banner image
     also added image tags to show logo images... js templates branding to show them seems to be broken
     uses Hyrax::Forms::CollectionForm -->
 
@@ -15,29 +15,30 @@
 
     <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
-      <div class="col-sm-3">
+      <div class="col-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
         <span class="btn btn-success fileinput-button">
-          <span class="glyphicon glyphicon-plus"></span>
+          <span class="fa fa-plus"></span>
           <span><%= t('.choose_file') %></span>
           <input type="file" name="files[]" single />
         </span>
-      </div> <!-- end col-xs-4 -->
+      </div> <!-- end col-4 -->
 
       <!-- The global progress state -->
-      <div class="col-xs-8 fileupload-progress branding-banner-progress fade">
+      <div class="col-8 fileupload-progress branding-banner-progress fade">
         <!-- The global progress bar -->
-        <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-          <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+        <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+          <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
         </div>
         <!-- The extended global progress state -->
         <div class="progress-extended">&nbsp;</div>
-      </div> <!-- end col-xs-5 fileupload-progress fade -->
+      </div> <!-- end col-8 fileupload-progress fade -->
     </div> <!-- end row fileupload-buttonbar -->
 
     <div class="row branding-banner-list">
-      <div class="col-xs-12">
+      <div class="col-12">
         <div class="container">
+        <%# Where the request to display the branding comes from. %>
         <% if f.object.banner_info[:file] %>
           <div id="banner">
             <div class="row branding-banner-row">
@@ -55,7 +56,7 @@
 
               <div class="col-sm-2">
                 <button class="btn btn-danger delete branding-banner-remove" data-type="DELETE" data-url="/" onclick=$("#banner").remove();>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
                     <%= t('.previous') %>
@@ -68,7 +69,7 @@
             <% if f.object.banner_info[:relative_path] %>
             <div class="banner-image">
               <i><%= image_tag(f.object.banner_info[:relative_path],
-                               height: "100",
+                               size: "800x100",
                                alt: f.object.banner_info[:alttext].presence || f.object.banner_info[:file]) %></i>
             </div>
             <% end %>
@@ -97,28 +98,28 @@
 
     <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
-      <div class="col-xs-4">
+      <div class="col-4">
         <!-- The fileinput-button span is used to style the file input field as button -->
         <span class="btn btn-success fileinput-button">
-          <span class="glyphicon glyphicon-plus"></span>
+          <span class="fa fa-plus"></span>
           <span><%= t('.choose_file') %></span>
           <input type="file" name="files[]" single />
         </span>
-      </div> <!-- end col-xs-4 -->
+      </div> <!-- end col-4 -->
 
       <!-- The global progress state -->
-      <div class="col-xs-8 fileupload-progress branding-logo-progress fade">
+      <div class="col-8 fileupload-progress branding-logo-progress fade">
         <!-- The global progress bar -->
-        <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-          <div class="progress-bar progress-bar-success" style="width:0%;"></div>
+        <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+          <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
         </div>
         <!-- The extended global progress state -->
         <div class="progress-extended">&nbsp;</div>
-      </div> <!-- end col-xs-8 fileupload-progress branding-logo-progress fade -->
+      </div> <!-- end col-8 fileupload-progress branding-logo-progress fade -->
     </div> <!-- end row fileupload-buttonbar -->
 
     <div class="row branding-logo-list">
-      <div class="col-xs-12">
+      <div class="col-12">
         <div class="container">
           <% i = 0 %>
           <% f.object.logo_info.each_with_index do |linfo, i| %>
@@ -144,7 +145,7 @@
 
               <div class="col-sm-2">
                 <button class="btn btn-danger delete branding-logo-remove" data-type="DELETE" data-url="/" onclick=$("#logorow_<%= i %>").remove();>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                    <span class="sr-only">
                     <%= t('.previous') %>
@@ -159,7 +160,7 @@
 
         <!-- The global file processing state -->
         <span class="fileupload-process"></span>
-      </div> <!-- end col-xs-12 -->
+      </div> <!-- end col-12 -->
     </div> <!-- end row branding-logo-list -->
   </div> <!-- end fileuploadlogo -->
-</div> <!-- end set-access-controls -->
\ No newline at end of file
+</div> <!-- end set-access-controls -->
diff --git a/app/views/hyrax/dashboard/collections/_form_discovery.html.erb b/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
index 5225832e6..7b9fa4c14 100644
--- a/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax v3.4.2
+<%# OVERRIDE Hyrax v5.0.0rc2
     - Handle new :manage_discovery ability
     - Reformat input tags for legibility %>
 
@@ -8,8 +8,8 @@
   <p><%= t('.para2') %></p>
 
   <%# OVERRIDE: add conditional title %>
-  <div class="form-group" <% if cannot?(:manage_discovery, @collection) %>title="<%= t('permissions.collections.cannot.manage_discovery') %>"<% end %>>
-    <label class="radio">
+  <div class="form-check" <% if cannot?(:manage_discovery, @collection) %>title="<%= t('permissions.collections.cannot.manage_discovery') %>"<% end %>>
+    <label class="form-check-label">
       <input
         type="radio"
         id="visibility_open"
@@ -26,7 +26,7 @@
       <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
     </label>
 
-    <label class="radio">
+    <label class="form-check-label">
       <input
         type="radio"
         id="visibility_registered"
@@ -43,7 +43,7 @@
       <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
     </label>
 
-    <label class="radio">
+    <label class="form-check-label">
       <input
         type="radio"
         id="visibility_restricted"
diff --git a/app/views/hyrax/dashboard/collections/_form_share.html.erb b/app/views/hyrax/dashboard/collections/_form_share.html.erb
index f5671e8fb..0d9cf722b 100644
--- a/app/views/hyrax/dashboard/collections/_form_share.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_share.html.erb
@@ -1,91 +1,90 @@
-<%# OVERRIDE Hyrax v3.4.2 Use Hyrax::Groups for groups select box %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Use Hyrax::Groups for groups select box %>
 <% access_options = options_for_select([
-    [t('hyrax.dashboard.collections.form_share.access_options.manager'), 'manage'],
-    [t('hyrax.dashboard.collections.form_share.access_options.depositor'), 'deposit'],
-    [t('hyrax.dashboard.collections.form_share.access_options.viewer'), 'view']]) %>
+  [t('hyrax.dashboard.collections.form_share.access_options.manager'), t('manage')],
+  [t('hyrax.dashboard.collections.form_share.access_options.depositor'), t('deposit')],
+  [t('hyrax.dashboard.collections.form_share.access_options.viewer'), t('view')]]) %>
 
 <div id="participants" class="tab-pane">
-  <div class="panel panel-default labels edit-sharing-tab">
-    <div class="panel-body">
+  <div class="edit-sharing-tab">
+    <section class="section-add-sharing">
+      <p><%= t('.note') %></p>
+      <h3><%= t('.add_sharing') %></h3>
 
-      <section class="section-add-sharing">
-        <p><%= t('.note') %></p>
-        <h3><%= t('.add_sharing') %></h3>
+      <!-- Add group form -->
+      <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
+        <%= simple_form_for collection_permission_template_form_for(form: @form),
+                            url: [hyrax, :dashboard, @form, :permission_template],
+                            html: { id: 'group-participants-form' } do |f| %>
 
-        <!-- Add group form -->
-        <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
-          <%= simple_form_for @form.permission_template,
-                              url: [hyrax, :dashboard, @form, :permission_template],
-                              html: { id: 'group-participants-form' } do |f| %>
-            <div class="clearfix spacer">
-              <%= f.fields_for 'access_grants_attributes',
-                               f.object.access_grants.build(agent_type: 'group'),
-                               index: 0 do |builder| %>
+          <div class="form-inline add-sharing-form sharing-row-form">
+            <%= f.fields_for 'access_grants_attributes',
+                              f.object.access_grants.build(agent_type: 'group'),
+                              index: 0 do |builder| %>
 
-                <div class="form-inline add-sharing-form">
-                  <label class="col-md-2 col-xs-4 control-label"><%= t('.add_group') %>:</label>
-                  <div class="col-md-10 col-xs-8 form-group">
-                    <%= builder.hidden_field :agent_type %>
+              <div class="form-group mr-2">
+                <label class="mr-2"><%= t('.add_group') %>:</label>
+                <%= builder.hidden_field :agent_type %>
+                <%= builder.text_field :agent_id,
+                                        placeholder: t('.search_for_a_group'),
+                                        class: 'form-control search-input' %>
+              </div>
+              <div class="form-group">
+                <label class="mr-2">as</label>
                     <%# OVERRIDE: Change select to use Hyrax::Groups %>
                     <%= builder.select :agent_id,
                                 Hyrax::Group.all.map { |g| [g.humanized_name, g.name] },
-                                { prompt: "Select a group..." },
+                                { prompt: t('.select_a_group') },
                                 class: 'form-control' %>
-                    as
-                    <%= builder.select :access,
-                                       access_options,
-                                       { prompt: "Select a role..." },
-                                       class: 'form-control' %>
-
-                    <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button', :disabled => true %>
-                  </div>
-                </div>
-              <% end %>
-            </div>
-          <% end %>
-        </div>
+              </div>
+            <% end %>
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button ml-2', :disabled => true %>
 
-        <!-- Add user form -->
-        <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
-          <%= simple_form_for @form.permission_template,
-                              url: [hyrax, :dashboard, @form, :permission_template],
-                              html: { id: 'user-participants-form' } do |f| %>
-            <div class="clearfix spacer">
+          </div><!-- /.form-inline -->
+        <% end %>
+      </div>
 
-              <%= f.fields_for 'access_grants_attributes',
-                               f.object.access_grants.build(agent_type: 'user'),
-                               index: 0 do |builder| %>
+      <!-- Add user form -->
+      <div class="form-add-sharing-wrapper" data-id="<%= @form.id %>">
+        <%= simple_form_for collection_permission_template_form_for(form: @form),
+                            url: [hyrax, :dashboard, @form, :permission_template],
+                            html: { id: 'user-participants-form' } do |f| %>
 
-              <div class="form-inline add-users">
-                <label class="col-md-2 col-xs-4 control-label"><%= t('.add_user') %>:</label>
-                <div class="col-md-10 col-xs-8 form-group">
-                  <%= builder.hidden_field :agent_type %>
-                  <%= builder.text_field :agent_id,
-                                         placeholder: "Search for a user..." %>
-                  as
-                  <%= builder.select :access,
-                                     access_options,
-                                     { prompt: "Select a role..." },
-                                     class: 'form-control' %>
+          <div class="form-inline sharing-row-form add-users">
+            <%= f.fields_for 'access_grants_attributes',
+                              f.object.access_grants.build(agent_type: 'user'),
+                              index: 0 do |builder| %>
 
-                  <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button', :disabled => true %>
-                </div>
+              <div class="form-group">
+                <label class="mr-2"><%= t('.add_user') %>:</label>
+                <%= builder.hidden_field :agent_type %>
+                <%= builder.text_field :agent_id,
+                                        placeholder: t('.search_for_a_user') %>
+              </div>
+              <div class="form-group">
+                <label class="mx-2">as</label>
+                <%= builder.select :access,
+                                    access_options,
+                                    { prompt: t('.select_a_role') },
+                                    class: 'form-control' %>
               </div>
-              <% end %>
-            </div>
-          <% end %>
-        </div>
+            <% end %>
+
+            <%= f.submit t('helpers.submit.hyrax_permission_template_access.create'), class: 'btn btn-info edit-collection-add-sharing-button ml-2', :disabled => true %>
+
+          </div> <!-- /.form-inline -->
+        <% end %>
+      </div>
+
+      <p class="form-text mt-2"><em><%= t('hyrax.admin.admin_sets.form.note') %></em></p>
+    </section>
 
-        <p class="help-block"><%= t('hyrax.admin.admin_sets.form.note') %></p>
-      </section>
+    <h2 class="h3"><%= t(".current_shared") %></h2>
+    <section class="section-collection-sharing">
 
-      <section class="section-collection-sharing">
-        <legend><%= t(".current_shared") %></legend>
-        <%= render 'form_share_table', access: 'managers', filter: :manage? %>
-        <%= render 'form_share_table', access: 'depositors', filter: :deposit? %>
-        <%= render 'form_share_table', access: 'viewers', filter: :view? %>
-      </section>
 
-    </div>
+      <%= render 'form_share_table', access: 'managers', filter: :manage? %>
+      <%= render 'form_share_table', access: 'depositors', filter: :deposit? %>
+      <%= render 'form_share_table', access: 'viewers', filter: :view? %>
+    </section>
   </div>
 </div>
diff --git a/app/views/hyrax/dashboard/collections/_form_share_table.html.erb b/app/views/hyrax/dashboard/collections/_form_share_table.html.erb
index 32b6f3dbc..e610153c7 100644
--- a/app/views/hyrax/dashboard/collections/_form_share_table.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_share_table.html.erb
@@ -1,36 +1,39 @@
-<%# OVERRIDE Hyrax v3.4.2 Filter out Role accesses as they should never be removed %>
-<h3><%= t(".#{access}.title") %></h3>
-<p><%= t(".#{access}.help") %></p>
-<p><%= t(".#{access}.help_with_works", type_title: @collection.collection_type.title) if @collection.share_applies_to_new_works? && access != 'depositors' %></p>
-<%# OVERRIDE: use custom filtering method to filter out access_grants for Collection Roles %>
-<% if @form.filter_access_grants_by_access(filter).any? %>
-  <%# OVERRIDE: use custom access-specific class in order to differentiate between access tables %>
-  <table class='table table-striped share-status <%= "#{access}-table" %>'>
-    <thead>
-      <tr>
-        <th><%= t(".#{access}.agent_name") %></th>
-        <th><%= t(".#{access}.type") %></th>
-        <th><%= t(".#{access}.action") %></th>
-      </tr>
-    </thead>
-    <tbody>
-    <%# OVERRIDE: use custom filtering method to filter out access_grants for Collection Roles %>
-    <% @form.filter_access_grants_by_access(filter).each do |g| %>
-      <tr>
-        <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
-        <td><%= g.agent_type.titleize %></td>
-        <td>
-          <%# OVERRIDE: only disable button if it is for the admin group's MANAGE access %>
-          <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
-            <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
-          <% else %>
-            <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-<% else %>
-  <p><em><%= t(".#{access}.empty") %></em></p>
-<% end %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Filter out Role accesses as they should never be removed %>
+<div class="mb-4">
+
+  <h3 class="h4"><%= t(".#{access}.title") %></h3>
+  <p><%= t(".#{access}.help") %></p>
+  <p><%= t(".#{access}.help_with_works", type_title: @collection_type.title) if @collection_type.share_applies_to_new_works? && access != 'depositors' %></p>
+  <%# OVERRIDE: use custom filtering method to filter out access_grants for Collection Roles %>
+  <% if @form.filter_access_grants_by_access(filter).any? %>
+    <%# OVERRIDE: use custom access-specific class in order to differentiate between access tables %>
+    <table class='table table-striped share-status <%= "#{access}-table" %>'>
+      <thead>
+        <tr>
+          <th><%= t(".#{access}.agent_name") %></th>
+          <th><%= t(".#{access}.type") %></th>
+          <th><%= t(".#{access}.action") %></th>
+        </tr>
+      </thead>
+      <tbody>
+      <%# OVERRIDE: use custom filtering method to filter out access_grants for Collection Roles %>
+      <% @form.filter_access_grants_by_access(filter).each do |g| %>
+        <tr>
+          <td data-agent="<%= g.agent_id %>"><%= g.label %></td>
+          <td><%= g.agent_type.titleize %></td>
+          <td>
+            <%# OVERRIDE: only disable button if it is for the admin group's MANAGE access %>
+            <% if g.admin_group? && g.access == Hyrax::PermissionTemplateAccess::MANAGE %>
+              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger disabled', disabled: true, title: t('hyrax.admin.admin_sets.form.permission_destroy_errors.admin_group') %>
+            <% else %>
+              <%= link_to t(".#{access}.remove"), hyrax.admin_permission_template_access_path(g), method: :delete, class: 'btn btn-sm btn-danger' %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <p><em><%= t(".#{access}.empty") %></em></p>
+  <% end %>
+</div>
diff --git a/app/views/hyrax/dashboard/collections/_list_collections.html.erb b/app/views/hyrax/dashboard/collections/_list_collections.html.erb
index 2aa00e907..e09609066 100644
--- a/app/views/hyrax/dashboard/collections/_list_collections.html.erb
+++ b/app/views/hyrax/dashboard/collections/_list_collections.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax 3.5.0 to add appropriate alt tag %>
+<%# OVERRIDE Hyrax v5.0.0rc2 to add appropriate alt tag %>
 
 <% # used by All and Managed Collections tabs %>
 <% id = collection_presenter.id %>
@@ -37,7 +37,7 @@
 
       <%# Expand arrow %>
       <a href="#" class="small show-more" title="Click for more details">
-        <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
+        <i id="expand_<%= id %>" class="fa fa-chevron-right" aria-hidden="true"></i>
         <span class="sr-only"> <%= "#{t("hyrax.dashboard.my.sr.detail_label")} #{collection_presenter.title_or_label}" %></span>
       </a>
     </div>
diff --git a/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb b/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb
index b8d696ba8..eec369b21 100644
--- a/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb
+++ b/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax v3.4.2 Restrict who can deposit new works through collections %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Restrict who can deposit new works through collections %>
 <h2 class="sr-only"><%= t('hyrax.collection.actions.header') %></h2>
 <div class="text-right">
   <%# OVERRIDE: add check for :manage_items_in_collection permission %>
@@ -8,7 +8,7 @@
         <%= link_to t('hyrax.collection.actions.add_new_work.label'),
                     '#',
                     title: t('hyrax.collection.actions.add_new_work.desc'),
-                    data: { behavior: "select-work", target: "#worktypes-to-create", 'create-type' => 'single', add_works_to_collection: presenter.id },
+                    data: { behavior: "select-work", toggle: 'modal', target: "#worktypes-to-create", 'create-type' => 'single', add_works_to_collection: presenter.id },
                     class: 'btn btn-primary deposit-new-work-through-collection' %>
       <%# OVERRIDE: add #create_any_work_types? check %>
       <% elsif @presenter.create_any_work_types? # simple link to the first work type %>
diff --git a/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb b/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
index 9536b69a8..2df61e46f 100644
--- a/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
+++ b/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
@@ -1,20 +1,22 @@
-<%# OVERRIDE Hyrax v3.4.2 Restrict who can remove works from collections %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Restrict who can remove works from collections %>
 <% id = document.id %>
 <tr id="document_<%= id %>">
   <td>&nbsp;
     <% if current_user and document.depositor != current_user.user_key %>
-      <i class="glyphicon glyphicon-share-alt" />
+      <i class="fa fa-share" />
     <% end %>
   </td>
   <td>
     <div class="media">
       <%= link_to [main_app, document], "class" => "media-left", "aria-hidden" => "true" do %>
-        <%= render_thumbnail_tag document, { class: "hidden-xs file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true } %>
+        <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
+          { class: "d-none d-md-block file_listing_thumbnail", alt: document.title_or_label }, { suppress_link: true }
+        ) %>
       <% end %>
       <div class="media-body">
         <p class="media-heading">
           <strong><%= link_to document.title_or_label, [main_app, document], id: "src_copy_link#{id}", class: "#{'document-title' if document.title_or_label == document.label}" %></strong>
-          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right"></i></a>
+          <a href="#" class="small" title="Click for more details"><i id="expand_<%= id %>" class="fa fa-chevron-right"></i></a>
         </p>
         <%= render_other_collection_links(document, @presenter.id) %>
       </div>
@@ -26,21 +28,21 @@
     <%= render_visibility_link(document) %>
   </td>
     <%# OVERRIDE: add check for :manage_items_in_collection permission %>
-   <% if current_user && can?(:edit, @collection) && can?(:manage_items_in_collection, @collection) %>
+    <% if current_user && can?(:edit, @collection) && can?(:manage_items_in_collection, @collection) %>
     <td class="text-center">
-      <%= button_for_remove_from_collection @collection, document, label: "Remove", btn_class: "btn-danger btn-xs" %>
+      <%= button_for_remove_from_collection @collection, document, label: "Remove", btn_class: "btn-danger btn-sm" %>
     </td>
   <% end %>
 </tr>
 <tr id="detail_<%= id %>"> <!--  document detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2"><%= t('.creator') %></dt>
-      <dd class="col-xs-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
-      <dt class="col-xs-3 col-lg-2"><%=  t('.depositor') %></dt>
-      <dd class="col-xs-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
-      <dt class="col-xs-3 col-lg-2"><%= t('.edit_access') %></dt>
-      <dd class="col-xs-9 col-lg-10">
+      <dt class="col-3 col-lg-2"><%= t('.creator') %></dt>
+      <dd class="col-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
+      <dt class="col-3 col-lg-2"><%=  t('.depositor') %></dt>
+      <dd class="col-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
+      <dt class="col-3 col-lg-2"><%= t('.edit_access') %></dt>
+      <dd class="col-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
           <br />
diff --git a/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb b/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb
index 57712e092..8eea2e28f 100644
--- a/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb
+++ b/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax v3.4.2 Restrict who can remove parent collections from subcollections %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Restrict who can remove parent collections from subcollections %>
 <li
   data-id="<%= id %>"
   data-parent-id="<%= document.id %>"
@@ -10,10 +10,10 @@
     <% if can? :edit, id %>
       <%# OVERRIDE: add check for :manage_items_in_collection %>
       <% if can?(:edit, document.id) && can?(:manage_items_in_collection, document.id) %>
-        <button class="btn btn-xs btn-danger remove-from-collection-button"><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
+        <button class="btn btn-sm btn-danger remove-from-collection-button"><%= t('hyrax.collections.show.buttons.remove_from_collection') %></button>
       <% else %>
         <%= link_to "#",
-                    class: 'btn btn-xs btn-danger remove-parent-from-collection-deny-button',
+                    class: 'btn btn-sm btn-danger remove-parent-from-collection-deny-button',
                     title: t('hyrax.collections.show.buttons.remove_from_collection') do %>
             <%= t('hyrax.collections.show.buttons.remove_from_collection') %>
         <% end %>
diff --git a/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb b/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb
index a26bd9a82..da9a286a5 100644
--- a/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb
+++ b/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax v3.4.2 Restrict who can remove subcollections from collection %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Restrict who can remove subcollections from collection %>
 <% if @subcollection_docs.nil? || @subcollection_docs.empty? %>
 <div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_subcollections') %></div>
 <% else %>
@@ -15,7 +15,7 @@
       </div>
       <%# OVERRIDE: add :manage_items_in_collection check %>
       <% if can?(:edit, document.id) && can?(:manage_items_in_collection, id) %>
-        <button class="btn btn-xs btn-danger remove-subcollection-button"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
+      <button class="btn btn-sm btn-danger remove-subcollection-button"><%= t('hyrax.collections.show.buttons.remove_this_sub_collection') %></button>
       <% end %>
     </div>
   </li>
@@ -25,5 +25,5 @@
 <% end %>
 
 <% if can? :edit, id %>
-  <%= render 'modal_remove_sub_collection' %>
+<%= render 'modal_remove_sub_collection' %>
 <% end %>
diff --git a/app/views/hyrax/dashboard/sidebar/_activity.html.erb b/app/views/hyrax/dashboard/sidebar/_activity.html.erb
index a75c4eb07..770f0b449 100644
--- a/app/views/hyrax/dashboard/sidebar/_activity.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_activity.html.erb
@@ -1,85 +1,97 @@
-  <li class="h5"><%= t('hyrax.admin.sidebar.activity') %></li>
+<%# OVERRIDE Hyrax v5.0.0rc2 to add title attribute to nav links %>
+<li class="h5 nav-item"><%= t('hyrax.admin.sidebar.activity') %></li>
 
-  <li>
-    <%= menu.collapsable_section t('hyrax.admin.sidebar.repository_activity'),
-                                 icon_class: "fa fa-line-chart",
-                                 id: 'collapseRepositoryActivity',
-                                 open: menu.repository_activity_section?,
-                                 title: t('hyrax.admin.sidebar.repository_activity') do %>
-      <%= menu.nav_link(hyrax.dashboard_path,
-                        title: t('hyrax.admin.sidebar.activity_summary')) do %>
-        <span class="fa fa-dashboard"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.activity_summary') %></span>
-      <% end %>
-      <% if menu.show_admin_menu_items? %>
-        <%= menu.nav_link(main_app.status_path,
-                          title: t('hyrax.admin.sidebar.system_status')) do %>
-          <span class="fa fa-flag"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.system_status') %></span>
-        <% end %>
+<li class="nav-item">
+  <%= menu.collapsable_section t('hyrax.admin.sidebar.repository_activity'),
+                                icon_class: "fa fa-line-chart",
+                                id: 'collapseRepositoryActivity',
+                                open: menu.repository_activity_section?,
+                                title: t('hyrax.admin.sidebar.repository_activity') do %>
+    <%= menu.nav_link(hyrax.dashboard_path,
+                      class: "nav-link",
+                      title: t('hyrax.admin.sidebar.activity_summary')) do %>
+      <span class="fa fa-dashboard"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.activity_summary') %></span>
+    <% end %>
+    <% if menu.show_admin_menu_items? %>
+      <%= menu.nav_link(main_app.status_path,
+                        class: "nav-link",
+                        title: t('hyrax.admin.sidebar.system_status')) do %>
+        <span class="fa fa-flag"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.system_status') %></span>
       <% end %>
     <% end %>
-  </li>
+  <% end %>
+</li>
 
-  <li>
-    <%= menu.collapsable_section t('hyrax.admin.sidebar.user_activity'),
-                                 icon_class: "fa fa-line-chart",
-                                 id: 'collapseUserActivity',
-                                 open: menu.user_activity_section?,
-                                 title: t('hyrax.admin.sidebar.user_activity') do %>
-      <%= menu.nav_link(hyrax.dashboard_profile_path(current_user),
-                        also_active_for: hyrax.edit_dashboard_profile_path(current_user),
-                        title: t('hyrax.admin.sidebar.profile')) do %>
-        <span class="fa fa-id-card" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.profile') %></span>
-      <% end %>
+<li class="nav-item">
+  <%= menu.collapsable_section t('hyrax.admin.sidebar.user_activity'),
+                                icon_class: "fa fa-line-chart",
+                                id: 'collapseUserActivity',
+                                open: menu.user_activity_section?,
+                                title: t('hyrax.admin.sidebar.user_activity') do %>
+    <%= menu.nav_link(hyrax.dashboard_profile_path(current_user),
+                      class: "nav-link",
+                      also_active_for: hyrax.edit_dashboard_profile_path(current_user),
+                      title: t('hyrax.admin.sidebar.profile')) do %>
+      <span class="fa fa-id-card" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.profile') %></span>
+    <% end %>
 
-      <%= menu.nav_link(hyrax.notifications_path,
-                        title: t('hyrax.admin.sidebar.notifications')) do %>
-        <span class="fa fa-bell" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.notifications') %></span>
-      <% end %>
+    <%= menu.nav_link(hyrax.notifications_path,
+                      class: "nav-link",
+                      title: t('hyrax.admin.sidebar.notifications')) do %>
+      <span class="fa fa-bell" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.notifications') %></span>
+    <% end %>
 
-      <%= menu.nav_link(hyrax.transfers_path,
-                        title: t('hyrax.admin.sidebar.transfers')) do %>
-        <span class="fa fa-arrows-h" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.transfers') %></span>
-      <% end %>
+    <%= menu.nav_link(hyrax.transfers_path,
+                      class: "nav-link",
+                      title: t('hyrax.admin.sidebar.transfers')) do %>
+      <span class="fa fa-arrows-h" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.transfers') %></span>
+    <% end %>
 
-      <% if Flipflop.proxy_deposit? %>
-        <%= menu.nav_link(hyrax.depositors_path,
-                          title: t('hyrax.dashboard.manage_proxies')) do %>
-          <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.dashboard.manage_proxies') %></span>
-        <% end %>
+    <% if Flipflop.proxy_deposit? %>
+      <%= menu.nav_link(hyrax.depositors_path,
+                        class: "nav-link",
+                        title: t('hyrax.dashboard.manage_proxies')) do %>
+        <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.dashboard.manage_proxies') %></span>
       <% end %>
     <% end %>
-  </li>
+  <% end %>
+</li>
 
-  <% if can? :read, :admin_dashboard %>
+<% if can? :read, :admin_dashboard %>
+  <li class="nav-item">
     <%= menu.nav_link(hyrax.admin_stats_path,
+                      class: "nav-link",
                       title: t('hyrax.admin.sidebar.statistics')) do %>
       <span class="fa fa-bar-chart" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.statistics') %></span>
     <% end %>
-  <% end %>
-
-  <% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
-    <li>
-      <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
-                                   icon_class: "fa fa-pie-chart",
-                                   id: 'collapseAnalytics',
-                                   open: menu.analytics_reporting_section?,
-                                   title: t('hyrax.admin.sidebar.analytics') do %>
-        <% if can? :read, :admin_dashboard %>
-          <%= menu.nav_link(hyrax.admin_analytics_collection_reports_path,
-                            onclick: "dontChangeAccordion(event);",
-                            title: t('hyrax.admin.sidebar.collections_report')) do %>
-            <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections_report') %></span>
-          <% end %>
-        <% end %>
+  </li>
+<% end %>
 
-        <%= menu.nav_link(hyrax.admin_analytics_work_reports_path,
+<% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
+  <li class="nav-item">
+    <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
+                                  icon_class: "fa fa-pie-chart",
+                                  id: 'collapseAnalytics',
+                                  open: menu.analytics_reporting_section?,
+                                  title: t('hyrax.admin.sidebar.analytics') do %>
+      <% if can? :read, :admin_dashboard %>
+        <%= menu.nav_link(hyrax.admin_analytics_collection_reports_path,
+                          class: "nav-link",
                           onclick: "dontChangeAccordion(event);",
-                          title: t('hyrax.admin.sidebar.works_report')) do %>
-          <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works_report') %></span>
+                          title: t('hyrax.admin.sidebar.collections_report')) do %>
+          <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections_report') %></span>
         <% end %>
+      <% end %>
 
+      <%= menu.nav_link(hyrax.admin_analytics_work_reports_path,
+                        class: "nav-link",
+                        onclick: "dontChangeAccordion(event);",
+                        title: t('hyrax.admin.sidebar.works_report')) do %>
+        <span class="fa fa-file" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works_report') %></span>
       <% end %>
-    </li>
-  <% end %>
 
-  <%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :activity %>
+    <% end %>
+  </li>
+<% end %>
+
+<%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :activity %>
diff --git a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
index ec2bce02c..8e31594a1 100644
--- a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
@@ -1,63 +1,76 @@
+<%# OVERRIDE Hyrax v5.0.0rc2 add accoun settings and title attributes %>
+
 <% if menu.show_configuration? %>
-  <li class="h5"><%= t('hyrax.admin.sidebar.configuration') %></li>
+  <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.configuration') %></li>
   <% if can? :manage, Site %>
-    <li>
+    <li class="nav-item">
       <%= menu.collapsable_section t('hyrax.admin.sidebar.settings'),
                                    icon_class: "fa fa-cog",
                                    id: 'collapseSettings',
                                    open: menu.settings_section?,
                                    title: t('hyrax.admin.sidebar.settings') do %>
         <%= menu.nav_link(main_app.edit_admin_account_path,
+                          class: "nav-link",
                           title: t('hyrax.admin.sidebar.account')) do %>
           <span class="fa fa-gear"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.account') %></span>
         <% end %>
 
-        <%= menu.nav_link(main_app.identity_providers_path) do %>
+        <%= menu.nav_link(main_app.identity_providers_path, class: "nav-link") do %>
           <span class="fa fa-key"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.identity_providers') %></span>
         <% end %>
 
         <%= menu.nav_link(main_app.edit_site_labels_path,
+                          class: "nav-link",
                           title: t('hyrax.admin.sidebar.labels')) do %>
           <span class="fa fa-institution"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.labels') %></span>
         <% end %>
         <% if can?(:update, :appearance) %>
           <%= menu.nav_link(hyrax.admin_appearance_path,
+                            class: "nav-link",
                             title: t('hyrax.admin.sidebar.appearance')) do %>
             <span class="fa fa-paint-brush" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.appearance') %></span>
           <% end %>
         <% end %>
         <% if can?(:manage, :collection_types) %>
           <%= menu.nav_link(hyrax.admin_collection_types_path,
+                            class: "nav-link",
                             title: t('hyrax.admin.sidebar.collection_types')) do %>
             <span class="fa fa-folder-open" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collection_types') %></span>
           <% end %>
         <% end %>
         <% if can?(:manage, Hyrax::Feature) %>
           <%= menu.nav_link(hyrax.edit_pages_path,
+                            class: "nav-link",
                             title: t('hyrax.admin.sidebar.pages')) do %>
             <span class="fa fa-file-text-o" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.pages') %></span>
           <% end %>
           <%= menu.nav_link(hyrax.edit_content_blocks_path,
+                            class: "nav-link",
                             title: t('hyrax.admin.sidebar.content_blocks')) do %>
             <span class="fa fa-square-o" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.content_blocks') %></span>
           <% end %>
           <%= menu.nav_link(hyrax.admin_features_path,
+                            class: "nav-link",
                             title: t('hyrax.admin.sidebar.technical')) do %>
             <span class="fa fa-wrench" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.technical') %></span>
           <% end %>
           <%= menu.nav_link('/admin/work_types/edit',
+                            class: "nav-link",
                             title: t('hyku.admin.work_types')) do %>
             <span class="fa  fa-address-book"></span> <span class="sidebar-action-text"><%= t('hyku.admin.work_types') %></span>
           <% end %>
         <% end %>
+      <% end %>
     </li>
   <% end %>
+
   <% if can?(:manage, Sipity::WorkflowResponsibility) %>
     <%= menu.nav_link(hyrax.admin_workflow_roles_path,
+                      class: "nav-link",
                       title: t('hyrax.admin.sidebar.workflow_roles')) do %>
        <span class="fa fa-users" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_roles') %></span>
     <% end %>
-    <% end # end of configuration block %>
-    <%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :configuration %>
-  <% end %>
+  <% end # end of configuration block %>
+
+  <%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :configuration %>
 <% end %>
diff --git a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
index 556de0170..fde8c553d 100644
--- a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
@@ -1,7 +1,8 @@
 <%# override from bulkrax to make bulkrax a feature flipper %>
-<li class="h5"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
+<li class="h5 nav-item"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
 
 <%= menu.nav_link(hyrax.my_collections_path,
+                  class: "nav-link",
                   onclick: "dontChangeAccordion(event);",
                   also_active_for: hyrax.dashboard_collections_path,
                   title: t('hyrax.admin.sidebar.collections')) do %>
@@ -9,6 +10,7 @@
 <% end %>
 
 <%= menu.nav_link(hyrax.my_works_path,
+                  class: "nav-link",
                   onclick: "dontChangeAccordion(event);",
                   also_active_for: hyrax.dashboard_works_path,
                   title: t('hyrax.admin.sidebar.works')) do %>
@@ -17,11 +19,13 @@
 
 <% if ENV.fetch('HYKU_BULKRAX_ENABLED', 'true') == 'true' %>
   <%= menu.nav_link(bulkrax.importers_path,
+                    class: "nav-link",
                     title: t('bulkrax.admin.sidebar.importers')) do %>
     <span class="fa fa-cloud-upload" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('bulkrax.admin.sidebar.importers') %></span>
   <% end %>
 
   <%= menu.nav_link(bulkrax.exporters_path,
+                    class: "nav-link",
                     title: t('bulkrax.admin.sidebar.exporters')) do %>
     <span class="fa fa-cloud-download" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('bulkrax.admin.sidebar.exporters') %></span>
   <% end %>
diff --git a/app/views/hyrax/dashboard/sidebar/_tasks.html.erb b/app/views/hyrax/dashboard/sidebar/_tasks.html.erb
index 30a932867..d10a64591 100644
--- a/app/views/hyrax/dashboard/sidebar/_tasks.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_tasks.html.erb
@@ -1,9 +1,12 @@
+<%# OVERRIDE Hyrax v5.0.0rc2 to add Groups and title attributes %>
+
 <% if menu.show_task? %>
-  <li class="h5"><%= t('hyrax.admin.sidebar.tasks') %></li>
+  <li class="h5 nav-item"><%= t('hyrax.admin.sidebar.tasks') %></li>
 <% end %>
 
 <% if can? :review, :submissions %>
   <%= menu.nav_link(hyrax.admin_workflows_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     title: t('hyrax.admin.sidebar.workflow_review')) do %>
     <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_review') %></span>
@@ -12,6 +15,7 @@
 
 <% if can? :read, User %>
   <%= menu.nav_link(hyrax.admin_users_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     title: t('hyrax.admin.sidebar.users')) do %>
     <span class="fa fa-user" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.users') %></span>
@@ -20,6 +24,7 @@
 
 <% if can? :read, Hyrax::Group %>
     <%= menu.nav_link(main_app.admin_groups_path,
+                      class: "nav-link",
                       title: t('hyrax.admin.sidebar.manage_groups')) do %>
         <span class="fa fa-users"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.manage_groups') %></span>
     <% end %>
@@ -27,12 +32,14 @@
 
 <% if can? :read, :admin_dashboard %>
   <%= menu.nav_link(hyrax.embargoes_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     title: t('hyrax.embargoes.index.manage_embargoes')) do %>
     <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.embargoes.index.manage_embargoes') %></span>
   <% end %>
 
   <%= menu.nav_link(hyrax.leases_path,
+                    class: "nav-link",
                     onclick: "dontChangeAccordion(event);",
                     title: t('hyrax.leases.index.manage_leases')) do %>
     <span class="fa fa-flag" aria-hidden="true"></span> <span class="sidebar-action-text"><%= t('hyrax.leases.index.manage_leases') %></span>
diff --git a/app/views/hyrax/dashboard/works/_list_works.html.erb b/app/views/hyrax/dashboard/works/_list_works.html.erb
index 4c0405c59..275a3031a 100644
--- a/app/views/hyrax/dashboard/works/_list_works.html.erb
+++ b/app/views/hyrax/dashboard/works/_list_works.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax 3.5.0 to add appropriate alt tag %>
+<%# OVERRIDE Hyrax v5.0.0rc2 to add appropriate alt tag %>
 
 <tr id="document_<%= document.id %>">
   <td>
@@ -8,7 +8,12 @@
   <td>
     <div class='media'>
       <%= link_to [main_app, document], class: 'media-left' do %>
-        <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail', alt: block_for(name: 'default_work_image_text') || "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
+        <%# OVERRIDE begin %>
+        <%= document_presenter(document)&.thumbnail&.thumbnail_tag(
+          { class: 'd-none d-md-block file_listing_thumbnail', alt: block_for(name: 'default_work_image_text') || "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" },
+          { suppress_link: true }
+        ) %>
+        <%# OVERRIDE end %>
       <% end %>
 
       <div class='media-body'>
diff --git a/app/views/hyrax/homepage/_explore_collections.html.erb b/app/views/hyrax/homepage/_explore_collections.html.erb
index 3a93a347c..77e343781 100644
--- a/app/views/hyrax/homepage/_explore_collections.html.erb
+++ b/app/views/hyrax/homepage/_explore_collections.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE from Hyrax 2.9.0 to add featured collection functionality %>
+<%# OVERRIDE from Hyrax v5.0.0rc2 to add featured collection functionality %>
 
 <% featured_collection = f.object.presenter %>
 <tr>
@@ -7,7 +7,7 @@
       <div>
         <%= link_to [hyrax, featured_collection] do %>
           <%= render_thumbnail_tag(featured_collection,
-                                   { class: 'img-responsive hidden-xs file_listing_thumbnail', alt: "#{featured_collection.title_or_label} #{ t('hyrax.homepage.admin_sets.thumbnail')}" },
+                                   { class: 'img-fluid d-none d-sm-block file_listing_thumbnail', alt: "#{featured_collection.title_or_label} #{ t('hyrax.homepage.admin_sets.thumbnail')}" },
                                    {suppress_link: true}
           ) %>
         <% end %>
@@ -17,7 +17,6 @@
           <%= featured_collection.title.first %>
         <% end %>
       </div>
-      </div>
     </div>
   </td>
 </tr>
diff --git a/app/views/hyrax/homepage/_featured_collection_fields.html.erb b/app/views/hyrax/homepage/_featured_collection_fields.html.erb
index 16b89026b..70b1cfc49 100644
--- a/app/views/hyrax/homepage/_featured_collection_fields.html.erb
+++ b/app/views/hyrax/homepage/_featured_collection_fields.html.erb
@@ -2,16 +2,16 @@
   <div class="sr-only">
     <%= t('hyrax.homepage.featured_collections.document.title_label') %>
   </div>
-    <div class= 'homepage-work-thumbnail'>
+  <div class='homepage-work-thumbnail'>
+    <%= link_to [hyrax, featured] do %>
+      <%= render_thumbnail_tag(featured.solr_document, {suppress_link: true}) %>
+    <% end %>
+  </div>
+  <div>
+    <h5>
       <%= link_to [hyrax, featured] do %>
-          <%= render_thumbnail_tag(featured.solr_document, {suppress_link: true}) %>
-        <% end %>
-    </div>
-    <div>
-      <h5>
-        <%= link_to [hyrax, featured] do %>
-          <%= featured.title.first %>
-        <% end %>
-      </h5>
-    </div>
-</div>
\ No newline at end of file
+        <%= featured.title.first %>
+      <% end %>
+    </h5>
+  </div>
+</div>
diff --git a/app/views/hyrax/homepage/_featured_collection_section.html.erb b/app/views/hyrax/homepage/_featured_collection_section.html.erb
index 728832826..509ba7e87 100644
--- a/app/views/hyrax/homepage/_featured_collection_section.html.erb
+++ b/app/views/hyrax/homepage/_featured_collection_section.html.erb
@@ -1,18 +1,18 @@
-  <% if @featured_collection_list.empty? %>
-    <p id='no-collections'><%= t('hyrax.homepage.featured_collections.no_collections') %></p>
-  <% elsif can? :update, FeaturedCollection %>
+<% if @featured_collection_list.empty? %>
+  <p id='no-collections'><%= t('hyrax.homepage.featured_collections.no_collections') %></p>
+<% elsif can? :update, FeaturedCollection %>
   <%= form_for [main_app, @featured_collection_list] do |f| %>
-    <div class="panel-group dd" id="ff">
+    <div class="card-group dd" id="ff">
       <ol id="featured_works">
         <%= f.fields_for :featured_collections do |featured| %>
           <%= render 'sortable_featured_collections', f: featured %>
         <% end %>
       </ol>
     </div>
-    <%= f.submit("Save order", class: 'btn btn-default') %>
+    <%= f.submit("Save order", class: 'btn btn-secondary') %>
   <% end %>
-  <% else %>
-    <table class="table table-striped collection-highlights">
+<% else %>
+  <table class="table table-striped collection-highlights">
     <tbody>
       <%= form_for [main_app, @featured_collection_list] do |f| %>
         <%= f.fields_for :featured_collections do |featured| %>
@@ -21,12 +21,11 @@
       <% end %>
     </tbody>
   </table>
-  <% end %>
+<% end %>
 <ul class="list-inline collection-highlights-list">
   <li>
     <%= link_to t('hyrax.homepage.admin_sets.link'),
-            main_app.search_catalog_path(f: { human_readable_type_sim: ["Collection"]}),
-            class: 'btn btn-default' %>
+                main_app.search_catalog_path(f: { human_readable_type_sim: ["Collection"]}),
+                class: 'btn btn-secondary' %>
   </li>
 </ul>
-
diff --git a/app/views/hyrax/homepage/_featured_fields.html.erb b/app/views/hyrax/homepage/_featured_fields.html.erb
index 4c5e2e630..3a16f1dca 100644
--- a/app/views/hyrax/homepage/_featured_fields.html.erb
+++ b/app/views/hyrax/homepage/_featured_fields.html.erb
@@ -1,10 +1,12 @@
-<%# OVERRIDE Hyrax 2.9.1 to remove the hardcorded image width %>
+<%# OVERRIDE Hyrax v5.0.0rc2 to remove the hardcorded image width %>
 <div>
   <div class="featured-item-title">
     <span class="sr-only"><%= t('hyrax.homepage.featured_works.document.title_label') %></span>
     <h3>
       <%= link_to [main_app, featured] do %>
+        <%# OVERRIDE begin %>
         <%= render_thumbnail_tag(featured, {alt: "#{featured.title.first.to_s} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) + featured.title.first %>
+        <%# OVERRIDE end %>
       <% end %>
     </h3>
   </div>
diff --git a/app/views/hyrax/homepage/_home_content.html.erb b/app/views/hyrax/homepage/_home_content.html.erb
index ec03f25d9..a58739be2 100644
--- a/app/views/hyrax/homepage/_home_content.html.erb
+++ b/app/views/hyrax/homepage/_home_content.html.erb
@@ -1,49 +1,64 @@
-<%# Override from hyrax 2.5.1 to add feature flags to show/hide:
+<%# Override from Hyrax v5.0.0rc2 to add feature flags to show/hide:
   featured researcher
   featured works
   recently_uploaded
   also, to render featured collections
 %>
 
-<div class="<%= @presenter.display_featured_works? || @presenter.display_recently_uploaded? ? 'home-tabs-left col-sm-6' : ''%>">
+<div class="<%= @presenter.display_featured_works? || @presenter.display_recently_uploaded? ? 'home-tabs-left col-md-6' : '' %>">
   <ul id="homeTabs" class="nav nav-tabs" role="list">
     <%# add check for featured works %>
     <% if @presenter.display_featured_works? %>
-      <li class="active"><a href="#featured_container" data-toggle="tab" id="featureTab"><%= t('hyrax.homepage.featured_works.tab_label') %></a></li>
+      <li class="nav-item">
+        <a class="nav-link active" href="#featured_container" data-toggle="tab" id="featureTab">
+          <%= t('hyrax.homepage.featured_works.tab_label') %>
+        </a>
+      </li>
     <% end %>
     <%# add check for recently uploaded %>
     <% if @presenter.display_recently_uploaded? %>
-      <li class="<%= @presenter.display_featured_works? ? '' : 'active' %>"><a href="#recently_uploaded" data-toggle="tab" id="recentTab"><%= t('hyrax.homepage.recently_uploaded.tab_label') %></a></li>
+      <li class="nav-item <%= @presenter.display_featured_works? ? '' : 'active' %>">
+        <a class="nav-link" href="#recently_uploaded" data-toggle="tab" id="recentTab">
+          <%= t('hyrax.homepage.recently_uploaded.tab_label') %>
+        </a>
+      </li>
     <% end %>
   </ul>
 
   <div class="tab-content">
     <%# add check for featured works %>
     <% if @presenter.display_featured_works? %>
-      <div class="tab-pane fade in active" id="featured_container" role="tabpanel" aria-labelledby="featureTab">
+      <div class="tab-pane show active" id="featured_container" role="tabpanel" aria-labelledby="featureTab">
         <%= render 'featured_works' %>
       </div>
     <% end %>
     <%# add check for recently_uploaded %>
     <% if @presenter.display_recently_uploaded? %>
-      <div class="<%= @presenter.display_featured_works? ? 'tab-pane fade' : 'tab-pane active in' %>" id="recently_uploaded" role="tabpanel" aria-labelledby="recentTab">
+      <div class="tab-pane <%= @presenter.display_featured_works? ? '' : 'show active' %>" id="recently_uploaded" role="tabpanel" aria-labelledby="recentTab">
         <%= render 'recently_uploaded', recent_documents: @recent_documents %>
       </div>
-      <% end %>
+    <% end %>
   </div>
-</div><!-- /.col-xs-6 -->
+</div><!-- /.col-md-6 -->
 
-<div class="home-tabs-right col-sm-6">
+<div class="home-tabs-right col-md-6">
   <ul class="nav nav-tabs" role="list">
-    <li class="active"><a aria-expanded="true" href="#tab-col2-first" data-toggle="tab"><%= t('hyrax.homepage.admin_sets.title') %></a></li>
-    <%# add check for featured researcher %>
+    <li class="nav-item active">
+      <a class="nav-link" aria-expanded="true" href="#tab-col2-first" data-toggle="tab">
+        <%= t('hyrax.homepage.admin_sets.title') %>
+      </a>
+    </li>
     <% if @presenter.display_featured_researcher? %>
-      <li class=""><a aria-expanded="false" href="#tab-col2-second" data-toggle="tab"><%= t('hyrax.homepage.featured_researcher.tab_label') %></a></li>
+      <li class="nav-item">
+        <a class="nav-link" aria-expanded="false" href="#tab-col2-second" data-toggle="tab">
+          <%= t('hyrax.homepage.featured_researcher.tab_label') %>
+        </a>
+      </li>
     <% end %>
   </ul>
 
   <div class="tab-content">
-    <div class="tab-pane active" id="tab-col2-first">
+    <div class="tab-pane show active" id="tab-col2-first">
       <h2 class="sr-only"><%= t('hyrax.homepage.admin_sets.title') %></h2>
       <%= render 'featured_collection_section' %>
     </div>
diff --git a/app/views/hyrax/homepage/_home_text.html.erb b/app/views/hyrax/homepage/_home_text.html.erb
index 596f12d9a..558fd86ea 100644
--- a/app/views/hyrax/homepage/_home_text.html.erb
+++ b/app/views/hyrax/homepage/_home_text.html.erb
@@ -1,7 +1,9 @@
-# frozen_string_literal: true
-
 <% if display_content_block? @home_text %>
-  <div class="home_page_text">
-    <%= displayable_content_block @home_text, class: 'col-sm-3 home_page_text' %>
+  <div class="row">
+    <div class="col-sm-3">
+      <div class="home_page_text">
+        <%= displayable_content_block @home_text %>
+      </div>
+    </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/hyrax/homepage/_sortable_featured_collections.html.erb b/app/views/hyrax/homepage/_sortable_featured_collections.html.erb
index 620f7b8e7..95f99cf43 100644
--- a/app/views/hyrax/homepage/_sortable_featured_collections.html.erb
+++ b/app/views/hyrax/homepage/_sortable_featured_collections.html.erb
@@ -3,17 +3,17 @@
   <div class="dd-handle dd3-handle">
     <%= t 'hyrax.homepage.featured_works.drag' %>
   </div>
-  <div class="dd3-content panel panel-default">
+  <div class="dd3-content card">
     <%= f.hidden_field :id %>
     <%= f.hidden_field :order, data: { property: "order" } %>
-    <div class="main row">
-      <div class="col-sm-12">
+    <div class="card-body row">
+      <div class="col-md-12">
         <% if can? :destroy, FeaturedCollection %>
-          <h3 class="pull-right">
+          <h3 class="float-right">
             <%= link_to main_app.featured_collection_path(presenter, format: :json),
               title: "Remove collection from feature section",
               data: {behavior: 'unfeature'} do %>
-              <i class='glyphicon glyphicon-remove'></i>
+              <i class='fas fa-times'></i>
             <% end %>
             <p class="sr-only"><%= t 'helpers.action.remove' %></p>
           </h3>
diff --git a/app/views/hyrax/my/_collection_action_menu.html.erb b/app/views/hyrax/my/_collection_action_menu.html.erb
index f5f92ca9a..ea9fa8e62 100644
--- a/app/views/hyrax/my/_collection_action_menu.html.erb
+++ b/app/views/hyrax/my/_collection_action_menu.html.erb
@@ -1,15 +1,14 @@
-<%# OVERRIDE Hyrax v3.4.2 Adjust collection deletion permissions %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Adjust collection deletion permissions %>
 <% id = collection_presenter.id %>
 <% ul_id = 'collection-action-dropdown-ul-' + id %>
 
 <div class="btn-group">
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= id %>" aria-haspopup="true" aria-expanded="false" aria-controls="<%= ul_id %>">
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
-    <%= t("hyrax.dashboard.my.action.select") %> <span class="caret" aria-hidden="true"></span>
+    <%= t("hyrax.dashboard.my.action.select") %>
   </button>
-
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= id %>">
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= link_to hyrax.dashboard_collection_path(id),
                   class: 'itemicon itemedit',
                   title: t("hyrax.dashboard.my.action.view_collection") do %>
@@ -17,7 +16,7 @@
       <% end %>
     </li>
     <% if can? :edit, collection_presenter.solr_document %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to hyrax.edit_dashboard_collection_path(id),
                     class: 'itemicon itemedit',
                     title: t("hyrax.dashboard.my.action.edit_collection")  do %>
@@ -25,7 +24,7 @@
         <% end %>
       </li>
     <% else %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to "#",
                     class: 'itemicon itemedit edit-collection-deny-button',
                     title: t("hyrax.dashboard.my.action.edit_collection") do %>
@@ -33,7 +32,7 @@
         <% end %>
       </li>
     <% end %>
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%# OVERRIDE: change hasaccess to check if a user can destroy the solr_doc, not just if they can edit it %>
       <%= link_to "#",
                   class: 'itemicon itemtrash delete-collection-button',
@@ -45,9 +44,11 @@
       <% end %>
     </li>
 
+    <%# OVERRIDE begin %>
     <% if Hyrax::CollectionType.any_nestable? %>
+    <%# OVERRIDE end %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to "#",
                     class: 'itemicon add-to-collection',
                     title: t("hyrax.dashboard.my.action.add_to_collection"),
diff --git a/app/views/hyrax/my/_work_action_menu.html.erb b/app/views/hyrax/my/_work_action_menu.html.erb
index 70e94b17f..61a02efc1 100644
--- a/app/views/hyrax/my/_work_action_menu.html.erb
+++ b/app/views/hyrax/my/_work_action_menu.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax v3.4.2 Adjust #can? permission checks %>
+<%# OVERRIDE Hyrax v5.0.0rc2 Adjust #can? permission checks %>
 <% ul_id = 'admin-set-action-dropdown-ul-' + document.id %>
 
 <div class="btn-group">
@@ -6,43 +6,43 @@
   <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" type="button" id="dropdownMenu_<%= document.id %>" aria-haspopup="true" aria-expanded="false" aria-controls="<%= ul_id %>">
     <span class="sr-only"><%= t("hyrax.dashboard.my.sr.press_to") %> </span>
     <%= t("hyrax.dashboard.my.action.select") %>
-    <span class="caret" aria-hidden="true"></span>
   </button>
 
   <ul role="menu" id="<%= ul_id %>" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu_<%= document.id %>">
 
     <% if can? :edit, document.id %>
-      <li role="menuitem" tabindex="-1">
-        <%= link_to [main_app, :edit, document] do %>
-          <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
+        <%= link_to [main_app, :edit, document],
+                    id: 'action-edit-work' do %>
+          <i class="fa fa-pencil" aria-hidden="true"></i>
           <span> <%= t("hyrax.dashboard.my.action.edit_work") %> </span>
         <% end %>
       </li>
     <% end %>
 
-    <%# OVERRIDE: add separate #can? check for :delete instead of checking for :edit %>
     <% if can? :delete, document %>
-      <li role="menuitem" tabindex="-1">
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to [main_app, document],
                     method: :delete,
+                    id: 'action-delete-work',
                     data: {
                       confirm: t("hyrax.dashboard.my.action.work_confirmation", application_name: application_name) } do %>
-          <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
+          <i class="fa fa-trash" aria-hidden="true"></i>
           <span> <%= t("hyrax.dashboard.my.action.delete_work") %> </span>
         <% end %>
       </li>
     <% end %>
 
-    <li role="menuitem" tabindex="-1">
+    <li class="dropdown-item" role="menuitem" tabindex="-1">
       <%= display_trophy_link(current_user, document.id) do |text| %>
-        <i class="glyphicon glyphicon-star" aria-hidden="true"></i> <%= text %>
+        <i class="fa fa-star" aria-hidden="true"></i> <%= text %>
       <% end %>
     </li>
 
     <% if can? :transfer, document.id %>
-      <li role="menuitem" tabindex="-1">
-        <%= link_to(hyrax.new_work_transfer_path(document.id), class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
-          <i class="glyphicon glyphicon-transfer" aria-hidden="true"></i>
+      <li class="dropdown-item" role="menuitem" tabindex="-1">
+        <%= link_to(hyrax.new_work_transfer_path(document.id), id: 'action-transfer-work', class: 'itemicon itemtransfer', title: t("hyrax.dashboard.my.action.transfer")) do %>
+          <i class="fa fa-exchange" aria-hidden="true"></i>
           <span> <%= t("hyrax.dashboard.my.action.transfer") %> </span>
         <% end %>
       </li>
diff --git a/app/views/hyrax/my/collections/_list_collections.html.erb b/app/views/hyrax/my/collections/_list_collections.html.erb
index 7450a51e3..31efaec0f 100644
--- a/app/views/hyrax/my/collections/_list_collections.html.erb
+++ b/app/views/hyrax/my/collections/_list_collections.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax 3.5.0 to add appropriate alt tag %>
+<%# OVERRIDE Hyrax v5.0.0rc2 to add appropriate alt tag %>
 
 <% # used by Your Collections tab %>
 <% id = collection_presenter.id %>
@@ -39,7 +39,7 @@
 
       <%# Expand arrow %>
       <a href="#" class="small show-more" title="Click for more details">
-        <i id="expand_<%= id %>" class="glyphicon glyphicon-chevron-right" aria-hidden="true"></i>
+        <i id="expand_<%= id %>" class="fa fa-chevron-right" aria-hidden="true"></i>
         <span class="sr-only"> <%= "#{t("hyrax.dashboard.my.sr.detail_label")} #{collection_presenter.title_or_label}" %></span>
       </a>
     </div>
diff --git a/app/views/hyrax/my/works/_list_works.html.erb b/app/views/hyrax/my/works/_list_works.html.erb
index 7b3424bad..d2a422778 100644
--- a/app/views/hyrax/my/works/_list_works.html.erb
+++ b/app/views/hyrax/my/works/_list_works.html.erb
@@ -1,4 +1,4 @@
-<%# OVERRIDE Hyrax 3.5.0 to add appropriate alt tag %>
+<%# OVERRIDE Hyrax v5.0.0rc2 to add appropriate alt tag %>
 
 <tr id="document_<%= document.id %>">
 
@@ -9,14 +9,14 @@
 
   <td>
     <div class='media'>
+      <%# OVERRIDE begin %>
       <%= link_to [main_app, document], class: 'media-left' do %>
         <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail', alt: block_for(name: 'default_work_image_text') || "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
       <% end %>
+      <%# OVERRIDE end %>
 
       <div class='media-body'>
-        <div class='media-heading'>
-
-          <%= link_to [main_app, document], id: "src_copy_link#{document.id}", class: 'document-title' do %>
+        <%= link_to [main_app, document], id: "src_copy_link#{document.id}", class: 'document-title' do %>
             <span class="sr-only">
               <%= t("hyrax.dashboard.my.sr.show_label") %>
             </span>
@@ -25,8 +25,6 @@
 
           <br />
           <%= render_collection_links(document) %>
-
-        </div>
       </div>
     </div>
   </td>
diff --git a/app/views/hyrax/uploads/_js_templates_branding.html.erb b/app/views/hyrax/uploads/_js_templates_branding.html.erb
index 7acaa6611..be00d2b19 100644
--- a/app/views/hyrax/uploads/_js_templates_branding.html.erb
+++ b/app/views/hyrax/uploads/_js_templates_branding.html.erb
@@ -1,8 +1,8 @@
- <!-- OVERRIDE Hyrax v3.4.0 to add text for collection banner image -->
+<!-- OVERRIDE Hyrax v5.0.0rc2 to add text for collection banner image -->
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade">
+    <tr class="template-upload fade show">
       <td>
         <span class="preview"></span>
       </td>
@@ -38,7 +38,7 @@
 <!-- The template to display the banner once upload is complete -->
 <script id="template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade">
+        <span class="template-download fade show">
           <div id="banner">
             <div class="row branding-banner-row">
               <div class="col-sm-3">
@@ -47,20 +47,18 @@
                   <input type="hidden" name="banner_files[]" value="{%=file.id%}">
                 </span>
                 {% if (file.error) { %}
-                  <span><span class="label label-danger"><%= t('.error') %></span> {%=file.error%}</span>
+                  <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
                 {% } %}
               </div>
 
-
               <div class="col-sm-4 branding-banner-input">
-                <label for="banner_text"><%= t('.alt_text') %>
-                  <input id="banner_text" type="text" name="banner_text[]" class="branding-banner-input" single>
-                </label>
+                <label for="banner_text"><%= t('.alt_text') %></label>
+                <input id="banner_text" type="text" name="banner_text[]" class="form-control branding-banner-input" single>
               </div>
 
               <div class="col-sm-2">
                 <button class="btn btn-link remove branding-banner-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" onclick=$("#banner").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="glyphicon glyphicon-remove"></span>
+                  <span class="fa fa-times"></span>
                   <span class="controls-remove-text"><%= t('.remove') %></span>
                   <span class="sr-only">
                     <%= t('.previous') %>
@@ -77,7 +75,7 @@
 <!-- The template to display logo in the table once upload is complete -->
 <script id="logo-template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-            <span class="template-download fade">
+            <span class="template-download fade show">
             <div class="row branding-logo-row">
               <div class="col-sm-3">
                 <span class="preview">
@@ -96,7 +94,7 @@
                 </span>
 
                 {% if (file.error) { %}
-                    <span><span class="label label-danger">Error</span> {%=file.error%}</span>
+                    <span><span class="badge badge-danger">Error</span> {%=file.error%}</span>
                 {% } %}
               </div>
 
@@ -112,7 +110,7 @@
               <div class="col-sm-2 text-right">
                 <span class="input-group-btn field-controls">
             <button class="btn btn-sm btn-danger delete branding-logo-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                    <span class="glyphicon glyphicon-remove"></span>
+                    <span class="fa fa-times"></span>
                     <span class="controls-remove-text">Remove</span>
                     <span class="sr-only">
                       <%= t('.previous') %>
@@ -125,4 +123,4 @@
             </div>
             </span>
 {% } %}
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/hyrax/users/_vitals.html.erb b/app/views/hyrax/users/_vitals.html.erb
deleted file mode 100644
index a5631a8a8..000000000
--- a/app/views/hyrax/users/_vitals.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%# override Hyrax 2.5 - fix Collections Created and Works Created links. Confirmed can be removed after Hyrax 3.0 %>
-<div class="list-group-item">
-  <span class="glyphicon glyphicon-time" aria-hidden="true"></span> <%= t("hyrax.dashboard.stats.joined_on") %> <%= user.created_at.to_date.strftime("%b %d, %Y") %>
-</div>
-
-<div class="list-group-item">
-  <span class="badge"><%= number_of_collections(user) %></span>
-  <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span>
-  <%= link_to_field('', '', t("hyrax.dashboard.stats.collections"), {generic_type: "Collection", depositor: user.to_s}) %>
-</div>
-
-<div class="list-group-item">
-  <span class="badge"><%= number_of_works(user) %></span>
-  <span class="glyphicon glyphicon-upload" aria-hidden="true"></span>
-  <%= link_to_field('', '', t("hyrax.dashboard.stats.works"), {generic_type: "Work", depositor: user.to_s}) %>
-
-  <ul class="views-downloads-dashboard list-unstyled">
-      <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("hyrax.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>
-      <li><span class="badge badge-optional"><%= user.total_file_downloads %></span> <%= t("hyrax.dashboard.stats.file_downloads").pluralize(user.total_file_downloads) %></li>
-  </ul>
-</div>
diff --git a/app/views/identity_providers/_form.html.erb b/app/views/identity_providers/_form.html.erb
index fd2d41430..5958f3105 100644
--- a/app/views/identity_providers/_form.html.erb
+++ b/app/views/identity_providers/_form.html.erb
@@ -1,6 +1,6 @@
-<div class="panel panel-default">
-  <%= simple_form_for(@identity_provider) do |f| %>
-    <div class="panel-body">
+<%= simple_form_for(@identity_provider) do |f| %>
+  <div class="card">
+    <div class="card-body">
       <% if @identity_provider.errors.any? %>
         <div id="error_explanation">
           <h2><%= pluralize(@identity_provider.errors.count, "error") %> prohibited this authentication provider from being saved:</h2>
@@ -48,12 +48,11 @@
 
     </div>
 
-    <div class="panel-footer text-right">
+    <div class="card-footer text-right">
       <% if IdentityProvider.count.nonzero? %>
-        <%= link_to 'Delete', identity_provider, method: :delete, data: { confirm: 'Are you sure?' }, class:
-      'btn btn-danger' %>
+        <%= link_to 'Delete', identity_provider, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
       <% end %>
       <%= f.submit class: 'btn btn-primary action-save' %>
     </div>
-  <% end %>
-</div>
+  </div>
+<% end %>
diff --git a/app/views/identity_providers/index.html.erb b/app/views/identity_providers/index.html.erb
index 594fe23d5..d56219c3d 100644
--- a/app/views/identity_providers/index.html.erb
+++ b/app/views/identity_providers/index.html.erb
@@ -4,8 +4,8 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <table class="table table-striped datatable">
           <thead>
             <tr>
@@ -22,8 +22,11 @@
                 <td><%= u.name %></td>
                 <td><%= u.provider %></td>
                 <td><%= u.updated_at %></td>
-                <td><%= image_tag u.logo_image.url(:thumb), class: "img-responsive", alt: u.logo_image_text if u.logo_image? %></td>
-                <td class="col-md-2"><%= link_to t('.edit'), edit_identity_provider_path(u) %>&nbsp;|&nbsp;<%= link_to t('helpers.action.delete'), identity_provider_path(u), method: :delete, data: { confirm: t('.confirm_delete') } %></td>
+                <td><%= image_tag u.logo_image.url(:thumb), class: "img-fluid", alt: u.logo_image_text if u.logo_image? %></td>
+                <td class="col-md-2">
+                  <%= link_to t('.edit'), edit_identity_provider_path(u) %>&nbsp;|&nbsp;
+                  <%= link_to t('helpers.action.delete'), identity_provider_path(u), method: :delete, data: { confirm: t('.confirm_delete') } %>
+                </td>
               </tr>
             <% end %>
           </tbody>
diff --git a/app/views/labels/edit.html.erb b/app/views/labels/edit.html.erb
index 270c44efb..604efc337 100644
--- a/app/views/labels/edit.html.erb
+++ b/app/views/labels/edit.html.erb
@@ -4,40 +4,39 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
+    <div class="card">
       <%= form_for(@site, url: site_labels_path) do |f| %>
-        <div class="panel-heading">
-          <h3 class="panel-title">General Repository Labels</h3>
+        <div class="card-header">
+          <h3 class="card-title">General Repository Labels</h3>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
           <% if @site.errors.any? %>
-              <div id="error_explanation">
-                  <h2><%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:</h2>
-
-                  <ul>
-                      <% @site.errors.full_messages.each do |message| %>
-                          <li><%= message %></li>
-                      <% end %>
-                  </ul>
-              </div>
+            <div id="error_explanation">
+              <h2><%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:</h2>
+              <ul>
+                <% @site.errors.full_messages.each do |message| %>
+                  <li><%= message %></li>
+                <% end %>
+              </ul>
+            </div>
           <% end %>
           <div class="field form-group">
-              <%= f.label :application_name %><br>
-              <%= f.text_field :application_name, class: 'form-control'%>
+            <%= f.label :application_name %><br>
+            <%= f.text_field :application_name, class: 'form-control'%>
           </div>
 
           <div class="field form-group">
-              <%= f.label :institution_name %><br>
-              <%= f.text_field :institution_name, class: 'form-control'%>
+            <%= f.label :institution_name %><br>
+            <%= f.text_field :institution_name, class: 'form-control'%>
           </div>
 
           <div class="field form-group">
-              <%= f.label :institution_name_full %><br>
-              <%= f.text_field :institution_name_full, class: 'form-control'%>
+            <%= f.label :institution_name_full %><br>
+            <%= f.text_field :institution_name_full, class: 'form-control'%>
           </div>
         </div>
-        <div class="panel-footer">
-          <%= f.submit class: 'btn btn-primary pull-right' %>
+        <div class="card-footer text-right">
+          <%= f.submit class: 'btn btn-primary' %>
         </div>
       <% end %>
     </div>
diff --git a/app/views/layouts/hyrax.html.erb b/app/views/layouts/hyrax.html.erb
index 448eba3d3..0387e147f 100644
--- a/app/views/layouts/hyrax.html.erb
+++ b/app/views/layouts/hyrax.html.erb
@@ -12,15 +12,15 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: nil %>
     <%= content_for(:navbar) %>
     <%= content_for(:precontainer_content) %>
     <div id="content-wrapper" class="container" role="main">
       <%= render '/flash_msg' %>
-      <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
+      <%= render_breadcrumbs builder: Hyrax.config.breadcrumb_builder %>
       <% if content_for?(:page_header) %>
         <div class="row">
-          <div class="col-xs-12 main-header">
+          <div class="col-12 main-header">
             <%= yield(:page_header) %>
           </div>
         </div>
diff --git a/app/views/proprietor/accounts/edit.html.erb b/app/views/proprietor/accounts/edit.html.erb
index 56b82d6ad..b835d66a1 100644
--- a/app/views/proprietor/accounts/edit.html.erb
+++ b/app/views/proprietor/accounts/edit.html.erb
@@ -4,9 +4,9 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default account-form">
+    <div class="card account-form">
       <%= simple_form_for @account, url: [:proprietor, @account], html: { class: 'form' } do |f| %>
-        <div class="panel-body">
+        <div class="card-body">
           <% if @account.errors.any? %>
             <div id="error_explanation" class="alert alert-danger">
               <h2><%= pluralize(@account.errors.count, "error") %> prohibited this account from being saved:</h2>
@@ -28,7 +28,7 @@
             <%= f.simple_fields_for :domain_names do |domain_name| %>
               <%= render 'domain_name_fields', f: domain_name %>
             <% end %>
-            <div 'class='links'>
+            <div class='links'>
               <%= link_to_add_association 'add domain name', f, :domain_names %>
             </div>
           </div>
@@ -44,7 +44,7 @@
               <%= f.simple_fields_for :full_account_cross_searches do |full_account_cross_search| %>
                 <%= render 'full_account_cross_search_fields', f: full_account_cross_search %>
               <% end %>
-              <div 'class='links'>
+              <div class='links'>
                 <%= link_to_add_association 'Add account to search', f, :full_account_cross_searches %>
               </div>
             </div>
@@ -52,12 +52,12 @@
 
           <% unless @account.search_only? %>
             <h3><%= t(".data_cite_endpoint") %></h3>
-					  <%= f.simple_fields_for :data_cite_endpoint do |s| %>
-						  <%= s.input :mode, collection: ['test', 'production'], required: false  %>
-						  <%= s.input :prefix, required: false  %>
-						  <%= s.input :username, required: false  %>
-						  <%= s.input :password, input_html: { value: @account.data_cite_endpoint.password }, required: false  %>
-					  <% end %>
+            <%= f.simple_fields_for :data_cite_endpoint do |s| %>
+              <%= s.input :mode, collection: ['test', 'production'], required: false  %>
+              <%= s.input :prefix, required: false  %>
+              <%= s.input :username, required: false  %>
+              <%= s.input :password, input_html: { value: @account.data_cite_endpoint.password }, required: false  %>
+            <% end %>
           <% end %>
 
           <h3><%= t(".solr_endpoint") %></h3>
@@ -73,6 +73,8 @@
             <% end %>
           <% end %>
 
+        </div>
+        <div class="card-footer">
           <%= f.submit class: 'btn btn-primary' %>
           <%= link_to t('simple_form.cancel'), proprietor_accounts_path, class: 'btn btn-link action-cancel' %>
         </div>
diff --git a/app/views/proprietor/accounts/index.html.erb b/app/views/proprietor/accounts/index.html.erb
index 16f437202..c13171f48 100644
--- a/app/views/proprietor/accounts/index.html.erb
+++ b/app/views/proprietor/accounts/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :page_header do %>
   <h1><span class="fa fa-gears"></span> <%= t('.header') %></h1>
-  <div class="pull-right">
+  <div class="float-right">
     <%= link_to new_proprietor_account_path, class: 'btn btn-primary' do %>
       <span class="fa fa-edit"></span> <%= t('.create_new') %>
     <% end %>
@@ -9,8 +9,8 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <table class="table table-striped datatable">
           <thead>
             <tr>
@@ -25,7 +25,11 @@
               <tr>
                 <td><%= account.tenant %></td>
                 <td><%= account.cname %></td>
-                <td class="col-md-2"><%= link_to t('.manage'), [:proprietor, account] %>&nbsp;|&nbsp;<%= link_to t('helpers.action.edit'), [:edit, :proprietor, account] %>&nbsp;|&nbsp;<%= link_to t('helpers.action.delete'), [:proprietor, account], method: :delete, data: { confirm: t('.confirm_delete') } %></td>
+                <td class="col-md-2">
+                  <%= link_to t('.manage'), [:proprietor, account] %>&nbsp;|&nbsp;
+                  <%= link_to t('helpers.action.edit'), [:edit, :proprietor, account] %>&nbsp;|&nbsp;
+                  <%= link_to t('helpers.action.delete'), [:proprietor, account], method: :delete, data: { confirm: t('.confirm_delete') } %>
+                </td>
               </tr>
             <% end %>
           </tbody>
diff --git a/app/views/proprietor/accounts/new.html.erb b/app/views/proprietor/accounts/new.html.erb
index b46843908..416c2bf18 100644
--- a/app/views/proprietor/accounts/new.html.erb
+++ b/app/views/proprietor/accounts/new.html.erb
@@ -4,37 +4,37 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default account-form">
+    <div class="card account-form">
       <%= simple_form_for @account, url: [:proprietor, @account], html: { class: 'form' } do |f| %>
-        <div class="panel-body">
-            <% if @account.errors.any? %>
-              <div id="error_explanation" class="alert alert-danger">
-                <%= pluralize(@account.errors.count, "error") %> prohibited this repository from being saved:
-                <ul>
-                  <% @account.errors.messages.each do |key, messages| %>
-                    <li><%= key %> &quot;<%= @account.errors.details[key].first[:value] %>&quot; <%= messages.join(' and ') %></li>
-                  <% end %>
-                </ul>
-              </div>
-            <% end %>
+        <div class="card-body">
+          <% if @account.errors.any? %>
+            <div id="error_explanation" class="alert alert-danger">
+              <%= pluralize(@account.errors.count, "error") %> prohibited this repository from being saved:
+              <ul>
+                <% @account.errors.messages.each do |key, messages| %>
+                  <li><%= key %> &quot;<%= @account.errors.details[key].first[:value] %>&quot; <%= messages.join(' and ') %></li>
+                <% end %>
+              </ul>
+            </div>
+          <% end %>
 
-            <%= f.input :name %>
-            <%= f.input :search_only %>
+          <%= f.input :name %>
+          <%= f.input :search_only %>
 
-            <div class='hide' id='full_account_cross_container'>
-              <div id='full_acount_cross_searches'>
-                <%= f.simple_fields_for :full_account_cross_searches do |full_account_cross_search| %>
-                  <%= render 'full_account_cross_search_fields', f: full_account_cross_search %>
-                <% end %>
-                <div 'class='links'>
-                  <%= link_to_add_association 'Add account to search', f, :full_account_cross_searches %>
-                </div>
+          <div class='hide' id='full_account_cross_container'>
+            <div id='full_acount_cross_searches'>
+              <%= f.simple_fields_for :full_account_cross_searches do |full_account_cross_search| %>
+                <%= render 'full_account_cross_search_fields', f: full_account_cross_search %>
+              <% end %>
+              <div class='links'>
+                <%= link_to_add_association 'Add account to search', f, :full_account_cross_searches %>
               </div>
             </div>
-
-            <%= f.submit class: 'btn btn-primary' %>
-            <%= link_to t('simple_form.cancel'), proprietor_accounts_path, class: 'btn btn-link action-cancel' %>
           </div>
+
+          <%= f.submit class: 'btn btn-primary' %>
+          <%= link_to t('simple_form.cancel'), proprietor_accounts_path, class: 'btn btn-link action-cancel' %>
+        </div>
       <% end %>
     </div>
   </div>
diff --git a/app/views/proprietor/accounts/show.html.erb b/app/views/proprietor/accounts/show.html.erb
index 5f8c7ddfa..c36ad8ea0 100644
--- a/app/views/proprietor/accounts/show.html.erb
+++ b/app/views/proprietor/accounts/show.html.erb
@@ -4,14 +4,14 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
+    <div class="card">
+      <div class="card-header">
         <div class="row">
-          <div class="col-sm-10">
+          <div class="col-md-10">
             <h2><%= @account.cname %></h2>
           </div>
-          <div class="col-sm-2">
-            <div class="pull-right">
+          <div class="col-md-2">
+            <div class="float-right">
               <%= link_to edit_proprietor_account_path(@account), class: 'btn btn-primary' do %>
                 <span class="fa fa-edit"></span> <%= t('.edit') %>
               <% end %>
@@ -19,7 +19,7 @@
           </div>
         </div>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= simple_form_for @account, url: [:proprietor, @account], namespace: "add_form", html: { class: 'form' } do |f| %>
           <div class="form-group">
             <%= f.label :admin_emails, class: "control-label" %>
@@ -41,21 +41,21 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <ul class="nav nav-tabs">
-        <li class="active">
-          <a href="#current-admins-tab">
-            <h2 class="panel-title display-page"><%= t('.current_admins.header') %></h2>
+    <div class="card">
+      <ul class="nav nav-tabs" id="accountTabs" role="tablist">
+        <li class="nav-item">
+          <a class="nav-link active" id="current-admins-tab-link" data-toggle="tab" href="#current-admins-tab" role="tab" aria-controls="current-admins" aria-selected="true">
+            <%= t('.current_admins.header') %>
           </a>
         </li>
-        <li>
-          <a href="#all-users-tab">
-            <h2 class="panel-title display-page"><%= t('.current_admins.all_users') %></h2>
+        <li class="nav-item">
+          <a class="nav-link" id="all-users-tab-link" data-toggle="tab" href="#all-users-tab" role="tab" aria-controls="all-users" aria-selected="false">
+            <%= t('.current_admins.all_users') %>
           </a>
         </li>
       </ul>
 
-      <div class="panel-body">
+      <div class="card-body">
         <div class="tab-content clearfix">
           <div class="tab-pane active" id="current-admins-tab">
           <% if @current_superusers.present? %>
diff --git a/app/views/proprietor/users/edit.html.erb b/app/views/proprietor/users/edit.html.erb
index a5534a6df..6f0705c5b 100644
--- a/app/views/proprietor/users/edit.html.erb
+++ b/app/views/proprietor/users/edit.html.erb
@@ -4,9 +4,9 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default user-form">
+    <div class="card user-form">
       <%= simple_form_for @user, url: [:proprietor, @user], html: { class: 'form' } do |f| %>
-        <div class="panel-body">
+        <div class="card-body">
           <% if @user.errors.any? %>
             <div id="error_explanation" class="alert alert-danger">
               <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
diff --git a/app/views/proprietor/users/index.html.erb b/app/views/proprietor/users/index.html.erb
index c3aad68e2..bbbaed592 100644
--- a/app/views/proprietor/users/index.html.erb
+++ b/app/views/proprietor/users/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :page_header do %>
   <h1><span class="fa fa-gears"></span> <%= t('.header') %></h1>
-  <div class="pull-right">
+  <div class="float-right">
     <%= link_to new_proprietor_user_path, class: 'btn btn-primary' do %>
       <span class="fa fa-edit"></span> <%= t('.create_new') %>
     <% end %>
@@ -9,8 +9,8 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <table class="table table-striped datatable">
           <thead>
             <tr>
@@ -33,7 +33,11 @@
                 <td><%= user.title %></td>
                 <td><%= user.affiliation %></td>
                 <td><%= user.is_superadmin %></td>
-                <td class="col-md-2"><%= link_to t('.manage'), proprietor_user_path(user) %>&nbsp;|&nbsp;<%= link_to t('helpers.action.edit'), edit_proprietor_user_path(user) %>&nbsp;|&nbsp;<%= link_to t('helpers.action.delete'), proprietor_user_path(user), method: :delete, data: { confirm: t('.confirm_delete') } %></td>
+                <td class="col-md-2">
+                  <%= link_to t('.manage'), proprietor_user_path(user) %>&nbsp;|&nbsp;
+                  <%= link_to t('helpers.action.edit'), edit_proprietor_user_path(user) %>&nbsp;|&nbsp;
+                  <%= link_to t('helpers.action.delete'), proprietor_user_path(user), method: :delete, data: { confirm: t('.confirm_delete') } %>
+                </td>
               </tr>
             <% end %>
           </tbody>
diff --git a/app/views/proprietor/users/new.html.erb b/app/views/proprietor/users/new.html.erb
index 43eaa34f7..33d86907e 100644
--- a/app/views/proprietor/users/new.html.erb
+++ b/app/views/proprietor/users/new.html.erb
@@ -4,26 +4,26 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default user-form">
+    <div class="card user-form">
       <%= simple_form_for @user, url: [:proprietor, @user], html: { class: 'form' } do |f| %>
-        <div class="panel-body">
-            <% if @user.errors.any? %>
-              <div id="error_explanation" class="alert alert-danger">
-                <%= pluralize(@user.errors.count, "error") %> prohibited this repository from being saved:
-                <ul>
-                  <% @user.errors.messages.each do |key, messages| %>
-                    <% next unless messages.present? %>
-                    <li><%= key %> <%= messages.join(' and ') %></li>
-                  <% end %>
-                </ul>
-              </div>
-            <% end %>
+        <div class="card-body">
+          <% if @user.errors.any? %>
+            <div id="error_explanation" class="alert alert-danger">
+              <%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:
+              <ul>
+                <% @user.errors.messages.each do |key, messages| %>
+                  <% next unless messages.present? %>
+                  <li><%= key %> <%= messages.join(' and ') %></li>
+                <% end %>
+              </ul>
+            </div>
+          <% end %>
 
-            <%= render 'form', user: @user, f: f %>
+          <%= render 'form', user: @user, f: f %>
 
-            <%= f.submit class: 'btn btn-primary' %>
-            <%= link_to t('simple_form.cancel'), proprietor_users_path, class: 'btn btn-link action-cancel' %>
-          </div>
+          <%= f.submit class: 'btn btn-primary' %>
+          <%= link_to t('simple_form.cancel'), proprietor_users_path, class: 'btn btn-link action-cancel' %>
+        </div>
       <% end %>
     </div>
   </div>
diff --git a/app/views/proprietor/users/show.html.erb b/app/views/proprietor/users/show.html.erb
index f8527e83b..0171e62d1 100644
--- a/app/views/proprietor/users/show.html.erb
+++ b/app/views/proprietor/users/show.html.erb
@@ -4,14 +4,14 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
+    <div class="card">
+      <div class="card-header">
         <div class="row">
           <div class="col-sm-10">
             <h2><%= @user.display_name %> (<%= @user.email %>)</h2>
           </div>
           <div class="col-sm-2">
-            <div class="pull-right">
+            <div class="float-right">
               <%= link_to edit_proprietor_user_path(@user), class: 'btn btn-primary' do %>
                 <span class="fa fa-edit"></span> <%= t('.edit') %>
               <% end %>
@@ -19,7 +19,7 @@
           </div>
         </div>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <%= simple_form_for @user, url: [:proprietor, @user], html: { class: 'form' } do |f| %>
           <div class="form-group">
             <%= f.association :roles, as: :check_boxes %>
diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
index 9645c8c45..1f40a34d8 100644
--- a/app/views/roles/index.html.erb
+++ b/app/views/roles/index.html.erb
@@ -4,8 +4,8 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-body">
+    <div class="card">
+      <div class="card-body">
         <table class="table table-striped datatable">
           <thead>
             <tr>
@@ -19,11 +19,11 @@
                 <td><%= u.email %></td>
                 <td>
                   <%= simple_form_for u, wrapper: :horizontal_form, url: site_role_path(u.id) do |f| %>
-                    <label>
-                      <span class="sr-only">Roles</span>
+                    <div class="form-group">
+                      <label class="sr-only">Roles</label>
                       <%= f.collection_select :site_roles, Role.site, :name, :name, { selected: u.site_roles.pluck(:name) }, { multiple: true, class: 'form-control' } %>
-                    </label>
-                    <%= f.submit class: 'btn btn-primary' %>
+                    </div>
+                    <%= f.submit 'Update', class: 'btn btn-primary' %>
                   <% end %>
                 </td>
               </tr>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index b05feab29..4f91e83c3 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,12 +1,12 @@
 <% current_year = Time.now.year %>
-<footer class="navbar navbar-inverse site-footer">
+<footer class="navbar navbar-dark bg-dark site-footer">
   <div class="container-fluid">
-    <div class="navbar-text text-left">
-        <p><%= t('hyrax.footer.service_html') %></p>
-        <p>Hyku v<%= Hyku::VERSION %></p>
+    <div class="navbar-text d-flex justify-content-start">
+      <p><%= t('hyrax.footer.service_html') %></p>
+      <p>Hyku v<%= Hyku::VERSION %></p>
     </div>
-    <div class="navbar-right">
-      <div class="navbar-text text-right">
+    <div class="ml-auto">
+      <div class="navbar-text d-flex justify-content-end">
         <p><%= t('hyrax.footer.copyright_html', current_year: current_year) %></p>
         <p><%= t('hyrax.background_attribution_html') %></p>
         <% unless user_signed_in? %>
diff --git a/app/views/single_signon/index.html.erb b/app/views/single_signon/index.html.erb
index 32d52b7b1..b7b1e3008 100644
--- a/app/views/single_signon/index.html.erb
+++ b/app/views/single_signon/index.html.erb
@@ -1,22 +1,23 @@
 <h1 class='text-center'>Select a Single Sign On Provider</h1>
 
-<%- if devise_mapping.omniauthable? %>
-  <%- @identity_providers.each do |ip| %>
-    <div class='col-xs-3 col-centered'>
-      <%= button_to omniauth_authorize_path(resource_name, ip.provider, ip.id), form_class: 'button_to col-centered', class: 'sso-button' do %>
-        <div class='<%= ip.provider %>-box'>
-          <%= image_tag ip.logo_image.url(:medium), class: "img-responsive", alt: ip.logo_image_text if ip.logo_image? %>
-          <br />
-          <%= t('.sign_in_with_provider', provider: ip.name) %><br />
-        </div>
-        <span class='sso-button-fake btn btn-primary'>Sign In</span>
-      <% end %>
-    </div>
-  <% end -%>
-<% end -%>
+<% if devise_mapping.omniauthable? %>
+  <div class="row justify-content-center">
+    <% @identity_providers.each do |ip| %>
+      <div class='col-md-3 text-center'>
+        <%= button_to omniauth_authorize_path(resource_name, ip.provider, ip.id), form_class: 'button_to', class: 'sso-button btn btn-primary btn-block' do %>
+          <div class='<%= ip.provider %>-box'>
+            <%= image_tag ip.logo_image.url(:medium), class: "img-fluid", alt: ip.logo_image_text if ip.logo_image? %>
+            <br />
+            <%= t('.sign_in_with_provider', provider: ip.name) %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
 
 <% if @identity_providers.count == 1 %>
-<script>
-   $('form.button_to').submit();
-</script>
+  <script>
+     $('form.button_to').submit();
+  </script>
 <% end %>
diff --git a/app/views/splash/index.html.erb b/app/views/splash/index.html.erb
index 89b379ab0..1fae1dea6 100644
--- a/app/views/splash/index.html.erb
+++ b/app/views/splash/index.html.erb
@@ -6,9 +6,9 @@
     <p><%= t('application.tagline') %></p>
     <p>
       <% if !admin_only_tenant_creation? || can?(:manage, Account) %>
-        <%= link_to t('hyku.splash.account_signup'), account_sign_up_path, class: 'btn btn-lg btn-sign-up' %>
+        <%= link_to t('hyku.splash.account_signup'), account_sign_up_path, class: 'btn btn-lg btn-primary' %>
       <% elsif !user_signed_in? %>
-        <%= link_to t('hyku.splash.account_login'), main_app.new_user_session_path, class: 'btn btn-lg btn-sign-up' %>
+        <%= link_to t('hyku.splash.account_login'), main_app.new_user_session_path, class: 'btn btn-lg btn-primary' %>
       <% else %>
         <%= t('hyku.splash.account_denied') %>
       <% end %>
@@ -17,22 +17,22 @@
 </section>
 
 <section class="product-features">
-  <div class="row grid-row">
-    <div class="col-xs-12 col-sm-4 grid-item">
+  <div class="row">
+    <div class="col-12 col-md-4">
       <h2 class="heading"><%= t('hyku.splash.left_heading') %></h2>
       <p>
           <%= t('hyku.splash.left_text') %>
       </p>
     </div>
 
-    <div class="col-xs-12 col-sm-4 grid-item">
+    <div class="col-12 col-md-4">
       <h2 class="heading"><%= t('hyku.splash.center_heading') %></h2>
       <p>
           <%= t('hyku.splash.center_text') %>
       </p>
     </div>
 
-    <div class="col-xs-12 col-sm-4 grid-item">
+    <div class="col-12 col-md-4">
       <h2 class="heading"><%= t('hyku.splash.right_heading') %></h2>
       <p>
           <%= t('hyku.splash.right_text') %>
diff --git a/app/views/status/index.html.erb b/app/views/status/index.html.erb
index 1be32c083..8a2ce2b2b 100644
--- a/app/views/status/index.html.erb
+++ b/app/views/status/index.html.erb
@@ -4,16 +4,16 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="panel-title"><%= t(:'.services') %></h3>
+    <div class="card">
+      <div class="card-header">
+        <h3 class="card-title"><%= t(:'.services') %></h3>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <ul class="list-group">
-            <%= render partial: 'service', locals: { name: 'Fedora', status: current_account.fcrepo_endpoint.ping } %>
-            <%= render partial: 'service', locals: { name: 'Solr', status: current_account.solr_endpoint.ping } %>
-            <%= render partial: 'service', locals: { name: 'Redis', status: current_account.redis_endpoint.ping } %>
-            <%= render partial: 'service', locals: { name: 'Database', status: ActiveRecord::Base.connection.active? } %>
+          <%= render partial: 'service', locals: { name: 'Fedora', status: current_account.fcrepo_endpoint.ping } %>
+          <%= render partial: 'service', locals: { name: 'Solr', status: current_account.solr_endpoint.ping } %>
+          <%= render partial: 'service', locals: { name: 'Redis', status: current_account.redis_endpoint.ping } %>
+          <%= render partial: 'service', locals: { name: 'Database', status: ActiveRecord::Base.connection.active? } %>
         </ul>
       </div>
     </div>
diff --git a/app/views/themes/cultural_repository/_collections_section.html.erb b/app/views/themes/cultural_repository/_collections_section.html.erb
index 4168bcd42..e5d22126a 100644
--- a/app/views/themes/cultural_repository/_collections_section.html.erb
+++ b/app/views/themes/cultural_repository/_collections_section.html.erb
@@ -1,8 +1,8 @@
-<div class="container mb-40"><!--- BEGIN COLLECTIONS SECTION -->
+<div class="container mb-4"><!--- BEGIN COLLECTIONS SECTION -->
   <div class="row">
-    <div class="col-sm-12 cultural-repository collections-container"> <!-- can toggle on/off -->
+    <div class="col-12 cultural-repository collections-container"> <!-- can toggle on/off -->
       <h4>Featured Collections</h4>
-      <%= render 'featured_collection_section'%>
+      <%= render 'featured_collection_section' %>
     </div>
   </div>
 </div><!--- END COLLECTIONS SECTION -->
diff --git a/app/views/themes/cultural_repository/_facets.html.erb b/app/views/themes/cultural_repository/_facets.html.erb
index 1025f8dc4..d2fcd50c1 100644
--- a/app/views/themes/cultural_repository/_facets.html.erb
+++ b/app/views/themes/cultural_repository/_facets.html.erb
@@ -1,19 +1,17 @@
 <% # main container for facets/limits menu -%>
-<% if has_facet_values?  %>
+<% if has_facet_values? %>
 <div id="facets" class="cultural-repository facets sidenav">
-  <div class="top-panel-heading panel-heading">
-    <button type="button" class="facets-toggle" data-toggle="collapse" data-target="#facet-panel-collapse">
+  <div class="top-panel-heading">
+    <button type="button" class="facets-toggle navbar-toggler" data-toggle="collapse" data-target="#facet-panel-collapse" aria-expanded="false" aria-controls="facet-panel-collapse">
       <span class="sr-only">Toggle facets</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
+      <span class="navbar-toggler-icon"></span>
     </button>
     <h2 class='facets-heading'>
       Browse by
     </h2>
   </div>
-  <div id="facet-panel-collapse" class="collapse panel-group">
+  <div id="facet-panel-collapse" class="collapse">
     <%= render_facet_partials %>
   </div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/cultural_repository/_featured_works_home_text_section.html.erb b/app/views/themes/cultural_repository/_featured_works_home_text_section.html.erb
index 2758f9c9f..1fe6cbc00 100644
--- a/app/views/themes/cultural_repository/_featured_works_home_text_section.html.erb
+++ b/app/views/themes/cultural_repository/_featured_works_home_text_section.html.erb
@@ -1,24 +1,24 @@
-<div class="container mb-40"><!--- BEGIN FEATURED WORKS/HOME TEXT SECTION -->
+<div class="container mb-4"><!--- BEGIN FEATURED WORKS/HOME TEXT SECTION -->
   <div class="row">
-    <!-- Mobile style - Homepage Text Block - when on sm and xs render full width col-sm-12 -->
-    <div class="hidden-lg hidden-md col-sm-12 cultural-repository fill-height-flex">
+    <!-- Mobile style - Homepage Text Block - when on sm and below render full width col-12 -->
+    <div class="d-lg-none d-md-none col-12 cultural-repository fill-height-flex">
       <%= render 'themes/cultural_repository/home_text' if controller_name == 'homepage' %>
     </div>
-    <% if display_content_block? @home_text %> <!-- if the content block is displayed then display the featured works section to be a 4 column layout on min-width medium col-md-8 and full width on sm and xs col-sm-12 -->
-      <div class="col-sm-12 col-md-8 cultural-repository featured-works-container">
+    <% if display_content_block? @home_text %> <!-- if the content block is displayed then display the featured works section to be a 4 column layout on min-width medium col-md-8 and full width on sm and below col-12 -->
+      <div class="col-12 col-md-8 cultural-repository featured-works-container">
         <%= render 'themes/cultural_repository/layouts/share_your_work_row' if controller_name == 'homepage' %> <!-- render the sywb row in 4 column layout -->
         <h4>Featured Works</h4>
           <%= render 'themes/cultural_repository/hyrax/homepage/featured_works' %>
       </div>
-    <% else %> <!-- if the content block is not displayed the show the featured works section as a full width 6 column layout col-sm-12 -->
-      <div class="col-sm-12 cultural-repository featured-works-container">
+    <% else %> <!-- if the content block is not displayed the show the featured works section as a full width 6 column layout col-12 -->
+      <div class="col-12 cultural-repository featured-works-container">
         <%= render 'themes/cultural_repository/layouts/share_your_work_row' if controller_name == 'homepage' %> <!-- render the sywb row in 6 column layout -->
         <h4>Featured Works</h4>
         <%= render 'themes/cultural_repository/hyrax/homepage/featured_works' %>
       </div>
     <% end %>
-    <!-- Adding a desktop style for the homepage text content block, hidden on sm and xs -->
-    <div class="hidden-xs hidden-sm col-md-4 cultural-repository">
+    <!-- Adding a desktop style for the homepage text content block, hidden on sm and below -->
+    <div class="d-none d-md-block col-md-4 cultural-repository">
       <%= render 'themes/cultural_repository/home_text' if controller_name == 'homepage' %>
     </div>
   </div>
diff --git a/app/views/themes/cultural_repository/_home_text.html.erb b/app/views/themes/cultural_repository/_home_text.html.erb
index be0dbb008..0fea63d3a 100644
--- a/app/views/themes/cultural_repository/_home_text.html.erb
+++ b/app/views/themes/cultural_repository/_home_text.html.erb
@@ -1,5 +1,5 @@
 <% if display_content_block? @home_text %>
   <div class="home_page_text homepage-text-container">
-    <%= displayable_content_block @home_text, class: 'col-sm-12 home_page_text p-20' %>
+    <%= displayable_content_block @home_text, class: 'col-12 home_page_text py-2' %>
   </div>
 <% end %>
diff --git a/app/views/themes/cultural_repository/_logo.html.erb b/app/views/themes/cultural_repository/_logo.html.erb
index ab73bd3cd..18dc50279 100644
--- a/app/views/themes/cultural_repository/_logo.html.erb
+++ b/app/views/themes/cultural_repository/_logo.html.erb
@@ -1,12 +1,12 @@
-  <% if logo_image %>
-    <a id="logo" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-      <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
-      <div class="vertical-center-image">
+<% if logo_image %>
+  <a id="logo" href="<%= hyrax.root_path %>" data-no-turbolink="true">
+    <span class="fa fa-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
+    <div class="vertical-center-image">
       <%= image_tag logo_image, alt: block_for(name: 'logo_image_text') %>
-      </div>
-    </a>
-  <% else %>
-    <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-      <span class="institution_name"><%= application_name %></span>
-    </a>
-  <% end %>
+    </div>
+  </a>
+<% else %>
+  <a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
+    <span class="institution_name"><%= application_name %></span>
+  </a>
+<% end %>
diff --git a/app/views/themes/cultural_repository/_masthead.html.erb b/app/views/themes/cultural_repository/_masthead.html.erb
index c049f2629..62c1217d9 100644
--- a/app/views/themes/cultural_repository/_masthead.html.erb
+++ b/app/views/themes/cultural_repository/_masthead.html.erb
@@ -1,26 +1,25 @@
-<% # OVERRIDE: Hyrax 2.9 template to change the size of the column on line 20 from col-md-4 to col-md-6  %>
-<nav id="masthead" class="navbar navbar-inverse navbar-static-top cultural-repository-nav" role="navigation">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <%= render '/logo' %>
-    </div>
+<% # OVERRIDE: Hyrax 5.0.0rc2 template to change the size of the column on line 20 from col-md-4 to col-md-6  %>
+<header aria-label="header" class="top-header">
+  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between cultural-repository-nav <%= placement_class %>" role="navigation" aria-label="masthead">
+    <div class="container-fluid">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#top-navbar-collapse" aria-controls="top-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <%= render '/logo' %>
+      </div>
 
-    <div class="collapse navbar-collapse" id="top-navbar-collapse">
-      <% if admin_host? %>
-        <%= render '/admin_util_links' %>
-      <% else %>
-        <%= render '/user_util_links' %>
-        <div class="clear-right pull-right col-xs-12 col-md-6">
-          <%= render partial: 'catalog/search_form' %>
-        </div>
-      <% end %>
+      <div class="collapse navbar-collapse" id="top-navbar-collapse">
+        <% if admin_host? %>
+          <%= render '/admin_util_links' %>
+        <% else %>
+          <%= render '/user_util_links' %>
+          <div class="clearfix d-md-flex justify-content-end col-12 col-md-6">
+            <%= render partial: 'catalog/search_form' %>
+          </div>
+        <% end %>
+      </div>
     </div>
-  </div>
-</nav>
+  </nav>
+</header>
diff --git a/app/views/themes/cultural_repository/_recent_works_section.html.erb b/app/views/themes/cultural_repository/_recent_works_section.html.erb
index ece52b0d0..743a83059 100644
--- a/app/views/themes/cultural_repository/_recent_works_section.html.erb
+++ b/app/views/themes/cultural_repository/_recent_works_section.html.erb
@@ -1,8 +1,8 @@
-<div class="container mb-40"><!--- BEGIN RECENT WORKS SECTION -->
+<div class="container mb-40"><!-- BEGIN RECENT WORKS SECTION -->
   <div class="row">
-    <div class="col-sm-12 cultural-repository recent-works-container"> <!-- can toggle on/off -->
+    <div class="col-sm-12 cultural-repository recent-works-container">
       <h4>Recent Works</h4>
-        <%= render 'themes/cultural_repository/hyrax/homepage/recently_uploaded', recent_documents: @recent_documents %>
+      <%= render 'themes/cultural_repository/hyrax/homepage/recently_uploaded', recent_documents: @recent_documents %>
     </div>
   </div>
-</div><!--- END RECENT WORKS SECTION -->
+</div><!-- END RECENT WORKS SECTION -->
diff --git a/app/views/themes/cultural_repository/_user_util_links.html.erb b/app/views/themes/cultural_repository/_user_util_links.html.erb
index 1bc0ac210..f0f71a6c5 100644
--- a/app/views/themes/cultural_repository/_user_util_links.html.erb
+++ b/app/views/themes/cultural_repository/_user_util_links.html.erb
@@ -1,39 +1,40 @@
-
-<ul id="user_utility_links" class="cultural-repository nav navbar-nav navbar-right">
+<ul id="user_utility_links" class="cultural-repository nav navbar-nav ml-auto">
   <%= render 'shared/locale_picker' if available_translations.size > 1 %>
-  <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
-    <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
-  <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
-    <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-  <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
-    <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
-  <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
-    <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
+  <li class="nav-item <%= 'active' if current_page?(hyrax.root_path) %>">
+    <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, class: 'nav-link', aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %>
+  </li>
+  <li class="nav-item <%= 'active' if current_page?(hyrax.about_path) %>">
+    <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, class: 'nav-link', aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %>
+  </li>
+  <li class="nav-item <%= 'active' if current_page?(hyrax.help_path) %>">
+    <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, class: 'nav-link', aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %>
+  </li>
+  <li class="nav-item <%= 'active' if current_page?(hyrax.contact_path) %>">
+    <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, class: 'nav-link', aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %>
+  </li>
   <% if user_signed_in? %>
-    <li>
+    <li class="nav-item">
       <%= render_notifications(user: current_user) %>
     </li>
-    <li class="dropdown">
-      <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %>
+    <li class="nav-item dropdown">
+      <%= link_to hyrax.dashboard_profile_path(current_user), class: 'nav-link dropdown-toggle', role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %>
         <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
         <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
         <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
         <span class="fa fa-user"></span>
-        <span class="caret"></span>
       <% end %>
-      <ul class="dropdown-menu dropdown-menu-right" role="menu">
-        <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
-
-        <li class="divider"></li>
-	<% if Devise.mappings[:user]&.registerable? %>
-          <li><%= link_to t("hyku.toolbar.profile.edit_registration"), main_app.edit_user_registration_path %></li>
+      <div class="dropdown-menu dropdown-menu-right" role="menu">
+        <a class="dropdown-item" href="<%= hyrax.dashboard_path %>"><%= t("hyrax.toolbar.dashboard.menu") %></a>
+        <div class="dropdown-divider"></div>
+        <% if Devise.mappings[:user]&.registerable? %>
+          <a class="dropdown-item" href="<%= main_app.edit_user_registration_path %>"><%= t("hyku.toolbar.profile.edit_registration") %></a>
         <% end %>
-        <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
-      </ul>
-    </li><!-- /.btn-group -->
+        <a class="dropdown-item" href="<%= main_app.destroy_user_session_path %>"><%= t("hyrax.toolbar.profile.logout") %></a>
+      </div>
+    </li><!-- /.dropdown -->
   <% else %>
-    <li>
-      <%= link_to main_app.new_user_session_path do %>
+    <li class="nav-item">
+      <%= link_to main_app.new_user_session_path, class: 'nav-link' do %>
         <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
       <% end %>
     </li>
diff --git a/app/views/themes/cultural_repository/catalog/_search_form.html.erb b/app/views/themes/cultural_repository/catalog/_search_form.html.erb
index 9e6e941cf..df1b8dc81 100644
--- a/app/views/themes/cultural_repository/catalog/_search_form.html.erb
+++ b/app/views/themes/cultural_repository/catalog/_search_form.html.erb
@@ -1,47 +1,45 @@
-<% # OVERRIDE: Hyrax 2.9 template to change the size of the column on line 8 from col-sm-3 to col-sm-4  %>
+<% # OVERRIDE: Hyrax v5.0.0rc2 template to change the size of the column on line 8 from col-sm-3 to col-sm-4  %>
 
 <%= form_tag search_form_action, method: :get, class: "cultural-repository form-horizontal search-form", id: "search-form-header", role: "search" do %>
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <%= hidden_field_tag :search_field, 'all_fields' %>
-  <div class="form-group">
+  <div class="form-group row">
 
-    <label class="control-label col-sm-4" for="search-field-header">
+    <label class="col-sm-4 mb-0" for="search-field-header">
       <%= t("hyrax.search.form.q.label", application_name: application_name) %>
     </label>
 
-    <div class="input-group">
+    <div class="input-group col-sm-9">
       <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
-      <div class="input-group-btn">
+      <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>
         </button>
         <% if current_user %>
-          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+          <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
             <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
-            <span class="caret"></span>
           </button>
 
-          <ul class="dropdown-menu pull-right">
-            <li>
+          <ul class="dropdown-menu dropdown-menu-right">
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
                   data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
                   data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          <% end %>
-
-        </ul>
+          </ul>
+        <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
 
   </div><!-- /.form-group -->
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_explore_collections.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_explore_collections.html.erb
index 589a44c8d..9105edacf 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_explore_collections.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_explore_collections.html.erb
@@ -1,14 +1,14 @@
-<% # April's note: overriding Hyrax 2.9 template for client theming %>
+<% # April's note: overriding Hyrax v5.0.0rc2 template for client theming %>
 <% featured_collection = f.object.presenter %>
-  <div class="col-xs-6 col-md-2">
+<div class="col-6 col-md-2">
+  <%= link_to [hyrax, featured_collection] do %>
+    <%= render_thumbnail_tag(featured_collection, { class: "img-fluid mx-auto d-block", alt: "#{featured_collection.title.first} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %>
+  <% end %>
+  <div class="collection-item-title">
     <%= link_to [hyrax, featured_collection] do %>
-      <%= render_thumbnail_tag(featured_collection, { class: "img-responsive center-block", alt: "#{featured_collection.title.first} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %>
-      <% end %>
-    <div class="collection-item-title">
-      <%= link_to [hyrax, featured_collection] do %>
-        <h3>
-          <%= featured_collection.title.first %>
-        </h3>
-      <% end %>
-    </div>
+      <h3>
+        <%= featured_collection.title.first %>
+      </h3>
+    <% end %>
   </div>
+</div>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_facet_layout.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_facet_layout.html.erb
index 4738ca4d0..c402373db 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_facet_layout.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_facet_layout.html.erb
@@ -1,13 +1,12 @@
-
-<div class="panel panel-default facet_limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.key) %>">
-  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" aria-expanded="false" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
-    <h3 class="panel-title facet-field-heading">
+<div class="card facet_limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.key) %>">
+  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> card-header collapse-toggle" id="heading<%= facet_field_id(facet_field) %>" aria-expanded="false" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
+    <h3 class="mb-0 facet-field-heading">
       <%= link_to facet_field_label(facet_field.key), "#", :"data-turbolinks" => false, :"data-no-turbolink" => true %>
     </h3>
   </div>
-  <div id="<%= facet_field_id(facet_field) %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
-    <div class="panel-body">
+  <div id="<%= facet_field_id(facet_field) %>" class="collapse <%= should_collapse_facet?(facet_field) ? '' : 'show' %>" aria-labelledby="heading<%= facet_field_id(facet_field) %>" data-parent="#accordion">
+    <div class="card-body">
       <%= yield %>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_featured.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_featured.html.erb
index 3719c6e55..301d7ed9b 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_featured.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_featured.html.erb
@@ -1,12 +1,12 @@
-<% # April's note: overriding Hyrax 2.9 for client theming -- removed all hyrax theming %>
+<% # April's note: overriding Hyrax v5.0.0rc2 for client theming -- removed all hyrax theming %>
 <% if display_content_block? @home_text %>
   <% presenter = featured.presenter %>
-  <div class="featured-works-4-column-layout col-xs-6 col-md-3" data-id="<%= presenter.id %>">
+  <div class="featured-works-4-column-layout col-6 col-md-3" data-id="<%= presenter.id %>">
     <%= render 'themes/cultural_repository/hyrax/homepage/featured_fields', featured: presenter %>
   </div>
-  <% else %>
-    <% presenter = featured.presenter %>
-    <div class="featured-works-6-column-layout col-xs-6 col-md-2" data-id="<%= presenter.id %>">
-      <%= render 'themes/cultural_repository/hyrax/homepage/featured_fields', featured: presenter %>
-    </div>
-  <% end %>
+<% else %>
+  <% presenter = featured.presenter %>
+  <div class="featured-works-6-column-layout col-6 col-md-2" data-id="<%= presenter.id %>">
+    <%= render 'themes/cultural_repository/hyrax/homepage/featured_fields', featured: presenter %>
+  </div>
+<% end %>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_featured_fields.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_featured_fields.html.erb
index 5fb8e36f3..9e7894f2c 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_featured_fields.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_featured_fields.html.erb
@@ -1,7 +1,7 @@
-<% # Note: overriding Hyrax 2.9 for client theming -- removed item keywords and depositor from partial %>
+<% # Note: overriding Hyrax v5.0.0rc2 for client theming -- removed item keywords and depositor from partial %>
   <div>
     <%= link_to [main_app, featured] do %>
-      <%= render_thumbnail_tag(featured, {suppress_link: true}, class: 'img-responsive center-block') %>
+      <%= render_thumbnail_tag(featured, {suppress_link: true}, class: 'img-fluid mx-auto d-block') %>
     <% end %>
     <div class="featured-item-title">
       <span class="sr-only"><%= t('hyrax.homepage.featured_works.document.title_label') %></span>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_featured_works.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_featured_works.html.erb
index 561b92b6d..1e5bc8415 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_featured_works.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_featured_works.html.erb
@@ -1,20 +1,20 @@
-<% # April's note: overriding Hyrax 2.9 for client theming %>
+<% # April's note: overriding Hyrax v5.0.0rc2 for client theming %>
 <h2 class="sr-only"><%= t('hyrax.homepage.featured_works.title') %></h2>
 <% if @featured_work_list.empty? %>
   <p><%= t('hyrax.homepage.featured_works.no_works') %></p>
 <% elsif can? :update, FeaturedWork %>
   <%= form_for [hyrax, @featured_work_list] do |f| %>
-    <div class="panel-group dd" id="dd">
+    <div class="accordion" id="accordionFeaturedWorks">
       <ol id="featured_works" class="cultural-repository">
         <%= f.fields_for :featured_works do |featured| %>
           <%= render 'sortable_featured', f: featured %>
         <% end %>
       </ol>
     </div>
-    <%= f.submit("Save order", class: 'btn btn-default') %>
+    <%= f.submit("Save order", class: 'btn btn-primary') %>
   <% end %>
 <% else %>
   <div class="row cultural-repository" id="featured_works">
     <%= render partial: 'themes/cultural_repository/hyrax/homepage/featured', collection: @featured_work_list.featured_works %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_marketing.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_marketing.html.erb
index bbcc9dfcb..851abc7e3 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_marketing.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_marketing.html.erb
@@ -1,5 +1,7 @@
+<%# OVERRIDE Hyrax v5.0.0rc2 for theming %>
+
 <% if display_content_block? @marketing_text %>
-  <div class="home_marketing_text">
-    <%= displayable_content_block @marketing_text, class: 'col-sm-12 mt-reverse-mb home_marketing_text' %>
+  <div class="home_marketing_text row">
+    <%= displayable_content_block @marketing_text, class: 'col-md-12 mt-0 mb-0 home_marketing_text', role: 'complementary' %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_recent_document.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_recent_document.html.erb
index a14ae1bb9..61242d417 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_recent_document.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_recent_document.html.erb
@@ -1,9 +1,8 @@
-<%# OVERRIDE Hyrax 3.4.1 template for client theming and shared search %>
+<%# OVERRIDE Hyrax v5.0.0rc2 template for client theming and shared search %>
 <h3 class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></h3>
-<div class="recently-uploaded col-xs-6 col-md-2">
-  <%= render_thumbnail_tag recent_document, {class: 'img-responsive center-block'}, {suppress_link: true} %>
-    <div class="recent-doc-title">
-      <%= link_to recent_document.title_or_label, generate_work_url(recent_document.to_h, request) %>
-    </div>
+<div class="recently-uploaded col-6 col-md-2">
+  <%= render_thumbnail_tag recent_document, {class: 'img-fluid mx-auto d-block'}, {suppress_link: true} %>
+  <div class="recent-doc-title">
+    <%= link_to recent_document.title_or_label, generate_work_url(recent_document.to_h, request) %>
   </div>
 </div>
diff --git a/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb b/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb
index 9167e2481..3eafc99b9 100644
--- a/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb
+++ b/app/views/themes/cultural_repository/hyrax/homepage/_recently_uploaded.html.erb
@@ -1,10 +1,12 @@
+<%# OVERRIDE Hyrax v5.0.0rc2 for theming %>
+
 <h2 class="sr-only"><%= t('hyrax.homepage.recently_uploaded.title') %></h2>
 <% if recent_documents.blank? %>
   <p><%= t('.no_public') %></p>
 <% else %>
   <div id="recent_docs">
-    <ol class="list-group list-group-striped recent_uploads">
+    <ol class="list-group list-group-flush recent_uploads">
       <%= render partial: "themes/cultural_repository/hyrax/homepage/recent_document", collection: recent_documents %>
     </ol>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/cultural_repository/layouts/_share_your_work_row.html.erb b/app/views/themes/cultural_repository/layouts/_share_your_work_row.html.erb
index 812ef2297..04b217578 100644
--- a/app/views/themes/cultural_repository/layouts/_share_your_work_row.html.erb
+++ b/app/views/themes/cultural_repository/layouts/_share_your_work_row.html.erb
@@ -1,26 +1,26 @@
-<% if @presenter.display_share_button? %><%# added share your work button -- made btn-default and added btn-sm per theming, modal code to make the share your work button work is located in themes/cultural_repository/layouts/hyrax.html.erb %>
+<% if @presenter.display_share_button? %><%# added share your work button -- made btn-secondary and added btn-sm per theming, modal code to make the share your work button work is located in themes/cultural_repository/layouts/hyrax.html.erb %>
 <div class="home_share_work row">
   <div class="col-sm-12 text-center">
     <% if signed_in? %>
       <% if @presenter.create_many_work_types? %>
         <%= link_to '#',
-          class: "btn btn-default btn-sm mt-20",
+          class: "btn btn-secondary btn-sm mt-2",
           data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
-          <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+          <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
         <% end %>
       <% else # simple link to the first work type %>
         <%= link_to new_polymorphic_path([main_app, @presenter.first_work_type]),
-              class: "btn btn-default btn-sm mt-20" do %>
-          <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+              class: "btn btn-secondary btn-sm mt-2" do %>
+          <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
         <% end %>
       <% end %>
     <% else %>
       <%= link_to hyrax.my_works_path,
-        class: "btn btn-default btn-sm mt-20" do %>
-        <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+        class: "btn btn-secondary btn-sm mt-2" do %>
+        <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
       <% end %>
     <% end %>
     <p><%= link_to t(:'hyrax.pages.tabs.terms_page'), hyrax.terms_path, class: 'cr_terms'  %></p>
   </div>
 </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/cultural_repository/layouts/homepage.html.erb b/app/views/themes/cultural_repository/layouts/homepage.html.erb
index e2e20c18a..a2e33aa9b 100644
--- a/app/views/themes/cultural_repository/layouts/homepage.html.erb
+++ b/app/views/themes/cultural_repository/layouts/homepage.html.erb
@@ -1,4 +1,4 @@
-<% # OVERRIDE: Hyrax 2.9 template to remove the render of the /controls partial, removed the background gradient span, and added share your work btn %>
+<% # OVERRIDE: Hyrax v5.0.0rc2 template to remove the render of the /controls partial, removed the background gradient span, and added share your work btn %>
 <% content_for(:navbar) do %>
   <div class="image-masthead cultural-homepage">
     <!-- cultural repository homepage -->
@@ -6,13 +6,13 @@
 
     <div class="container">
       <% if controller_name == 'homepage' %>
-      <div class="col-md-3 facet-panel-background-color mt-40 mb-40-0">
+      <div class="col-md-3 facet-panel-background-color mt-3 mb-0">
         <%= render 'themes/cultural_repository/facets' %>
       </div>
       <% end %>
 
-      <div class="col-md-8 col-md-offset-1 site-title-container">
-        <div class="site-title h1 mb-40-0">
+      <div class="col-md-8 offset-md-1 site-title-container">
+        <div class="site-title h1 mb-0">
           <%= render "hyrax/homepage/marketing" %>
         </div>
       </div>
@@ -25,4 +25,4 @@
   <%= render 'hyrax/homepage/announcement' if controller_name == 'homepage' || controller_name == 'hyrax_contact_form' || controller_name == 'pages' %>
 <% end %>
 
-<%= render template: 'layouts/hyrax' %>
\ No newline at end of file
+<%= render template: 'layouts/hyrax' %>
diff --git a/app/views/themes/cultural_repository/layouts/hyrax.html.erb b/app/views/themes/cultural_repository/layouts/hyrax.html.erb
index 0b3f706cd..6b2e56b94 100644
--- a/app/views/themes/cultural_repository/layouts/hyrax.html.erb
+++ b/app/views/themes/cultural_repository/layouts/hyrax.html.erb
@@ -12,23 +12,27 @@
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
 
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: nil %>
     <%= content_for(:navbar) %>
     <%= content_for(:precontainer_content) %>
     <div id="content-wrapper" class="container" role="main">
       <% if display_content_block? @home_text %>
-        <div class="col-sm-12 col-md-8">
-            <%= render '/flash_msg' %>
+        <div class="row">
+          <div class="col-md-8">
+              <%= render '/flash_msg' %>
+          </div>
         </div>
       <% else %>
-        <div class="col-sm-12">
-            <%= render '/flash_msg' %>
+        <div class="row">
+          <div class="col-md-12">
+              <%= render '/flash_msg' %>
+          </div>
         </div>
       <% end %>
-      <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
+      <%= render_breadcrumbs builder: Hyrax.config.breadcrumb_builder %>
       <% if content_for?(:page_header) %>
         <div class="row">
-          <div class="col-xs-12 main-header">
+          <div class="col-12 main-header">
             <%= yield(:page_header) %>
           </div>
         </div>
@@ -42,4 +46,4 @@
     <%= render '/shared/select_work_type_modal', create_work_presenter: @presenter&.create_work_presenter if @presenter&.draw_select_work_modal? %>
     <%= render 'shared/modal' %>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/themes/cultural_show/hyrax/base/_work_title.html.erb b/app/views/themes/cultural_show/hyrax/base/_work_title.html.erb
index 50aaf3a89..b083f8511 100644
--- a/app/views/themes/cultural_show/hyrax/base/_work_title.html.erb
+++ b/app/views/themes/cultural_show/hyrax/base/_work_title.html.erb
@@ -1,6 +1,6 @@
 <% presenter.title.each_with_index do |title, index| %>
   <div class="row">
-    <div class="col-sm-12 text-show-title">
+    <div class="col-12 text-show-title">
       <% if index == 0 %>
         <h2><%= title %>
           <small class="text-muted"><%= presenter.permission_badge %> <%= presenter.workflow.badge %></small>
diff --git a/app/views/themes/cultural_show/hyrax/base/show.html.erb b/app/views/themes/cultural_show/hyrax/base/show.html.erb
index e69ec0e64..4c9e36172 100644
--- a/app/views/themes/cultural_show/hyrax/base/show.html.erb
+++ b/app/views/themes/cultural_show/hyrax/base/show.html.erb
@@ -3,37 +3,37 @@
 <%= render 'shared/citations' %>
 <%= render './shared/additional_citations' %>
 <div class="row">
-  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
+  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-12">
+    <div class="card">
+      <div class="card-header">
         <%= render 'work_title', presenter: @presenter %>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
-          <% if @presenter.universal_viewer? %>
-            <div class="col-sm-12 centered-media">
+          <% if @presenter.iiif_viewer? %>
+            <div class="col-12 centered-media">
               <%= render 'representative_media', presenter: @presenter, viewer: true %>
             </div>
           <% end %>
-          <div class="col-sm-12">
+          <div class="col-12">
             <%= render "show_actions", presenter: @presenter %>
           </div>
-          <div class="centered-media <%= !@presenter.universal_viewer? ? 'col-sm-6 text-center' : '' %>">
-            <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.universal_viewer? %>
+          <div class="centered-media <%= !@presenter.iiif_viewer? ? 'col-md-6 text-center' : '' %>">
+            <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.iiif_viewer? %>
           </div>
-          <div class="<%= @presenter.universal_viewer? ? 'col-sm-6' : 'col-sm-6' %>">
+          <div class="<%= @presenter.iiif_viewer? ? 'col-md-6' : 'col-md-6' %>">
             <%= render 'work_description', presenter: @presenter %>
             <%= render 'metadata', presenter: @presenter %>
           </div>
-          <div class="col-xs-12 relationships-container">
+          <div class="col-12 relationships-container">
             <div class='relationships-box'>
               <%= render 'relationships', presenter: @presenter %>
             </div>
           </div>
-          <div class="col-sm-12 work-show-items">
+          <div class="col-12 work-show-items">
             <%= render 'items', presenter: @presenter %>
-            <%# TODO: we may consider adding these partials in the future %>
+            <%# TODO: Consider adding these partials in the future %>
             <%# = render 'sharing_with', presenter: @presenter %>
             <%# = render 'user_activity', presenter: @presenter %>
           </div>
diff --git a/app/views/themes/institutional_repository/_controls.html.erb b/app/views/themes/institutional_repository/_controls.html.erb
index a0705625d..7d1a161c3 100644
--- a/app/views/themes/institutional_repository/_controls.html.erb
+++ b/app/views/themes/institutional_repository/_controls.html.erb
@@ -1,22 +1,20 @@
-<% # OVERRIDE: Hyrax 2.9 - added the admin login menu from _user_util_links partial for theming %>
-<nav class="navbar navbar-default navbar-static-top" role="navigation">
-  <div class="container-fluid">
-    <div class="row">
-      <ul class="nav navbar-nav col-sm-5">
-        <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
-          <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
-          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
-          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
-        <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
-          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
-      </ul><!-- /.nav -->
-      <% if admin_host? %>
-        <%= render '/admin_util_links' %>
-      <% else %>
-        <%= render '/user_util_links' %>
-      <% end %>
-    </div>
-  </div>
-</nav><!-- /.navbar -->
\ No newline at end of file
+<% # OVERRIDE: Hyrax v5.0.0rc2 - added the admin login menu from _user_util_links partial for theming %>
+<nav class="navbar navbar-light bg-light navbar-expand-sm justify-content-between align-items-center px-2 py-3 border-bottom" role="navigation" aria-label="Root Menu">
+  <ul class="nav navbar-nav col-sm-5">
+    <li class="nav-item <%= 'active' if current_page?(hyrax.root_path) %>">
+      <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, class: "nav-link", aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %></li>
+    <li class="nav-item <%= 'active' if current_page?(hyrax.about_path) %>">
+      <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, class: "nav-link", aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %></li>
+    <li class="nav-item <%= 'active' if current_page?(hyrax.help_path) %>">
+      <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, class: "nav-link", aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %></li>
+    <li class="nav-item <%= 'active' if current_page?(hyrax.contact_path) %>">
+      <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, class: "nav-link", aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %></li>
+  </ul><!-- /.nav -->
+  <%# OVERRIDE begin %>
+  <% if admin_host? %>
+    <%= render '/admin_util_links' %>
+  <% else %>
+    <%= render '/user_util_links' %>
+  <% end %>
+  <%# OVERRIDE end %>
+</nav><!-- /.navbar -->
diff --git a/app/views/themes/institutional_repository/_home_text.html.erb b/app/views/themes/institutional_repository/_home_text.html.erb
index 73eea06c3..729f31752 100644
--- a/app/views/themes/institutional_repository/_home_text.html.erb
+++ b/app/views/themes/institutional_repository/_home_text.html.erb
@@ -1,5 +1,5 @@
 <% if display_content_block? @home_text %>
-  <div class="home_page_text">
-    <%= displayable_content_block @home_text, class: 'col-sm-12 home_page_text mb-40 section-border' %>
+  <div class="home_page_text mb-4 section-border">
+    <%= displayable_content_block @home_text, class: 'col-12 home_page_text' %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/institutional_repository/_ir_below_stats_layout.html.erb b/app/views/themes/institutional_repository/_ir_below_stats_layout.html.erb
index 8a952d040..43a5c49d0 100644
--- a/app/views/themes/institutional_repository/_ir_below_stats_layout.html.erb
+++ b/app/views/themes/institutional_repository/_ir_below_stats_layout.html.erb
@@ -1,11 +1,11 @@
 <div class="row">
-  <div class="col-xs-12 col-md-8 institutional-repository collections-container mb-40">
-    <div class="col-sm-12">
+  <div class="col-12 col-md-8 institutional-repository collections-container mb-40">
+    <div class="col-12">
       <h3>Featured Collections</h3>
       <%= render 'featured_collection_section' %>
     </div>
   </div>
-  <div class="col-xs-12 col-md-4 institutional-repository">
+  <div class="col-12 col-md-4 institutional-repository">
     <% if display_content_block? @home_text %>
       <%= render 'themes/institutional_repository/home_text' if controller_name == 'homepage' %>
     <% end %>
@@ -16,4 +16,4 @@
       <%= render 'recently_uploaded', recent_documents: @recent_documents %>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/institutional_repository/_logo.html.erb b/app/views/themes/institutional_repository/_logo.html.erb
index b101f19cc..3663c7ef5 100644
--- a/app/views/themes/institutional_repository/_logo.html.erb
+++ b/app/views/themes/institutional_repository/_logo.html.erb
@@ -1,11 +1,11 @@
-  <% # OVERRIDE: Hyrax 2.9 - added class col-sm-4 to the logo divs for theming %>
-  <% if logo_image %>
-    <a id="logo" class="col-sm-5" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-      <span class="glyphicon glyphicon-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
-      <%= image_tag logo_image, alt: block_for(name: 'logo_image_text') %>
-    </a>
-  <% else %>
-    <a id="logo" class="col-sm-5 navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
-      <span class="institution_name"><%= application_name %></span>
-    </a>
-  <% end %>
\ No newline at end of file
+<% # OVERRIDE: Hyrax v5.0.0rc2 - added globe back to logo %>
+<% if logo_image %>
+  <a id="logo" class="col-sm-5" href="<%= hyrax.root_path %>" data-no-turbolink="true">
+    <span class="fa fa-globe" role="img" aria-label="<%= application_name %>" aria-hidden="true"></span>
+    <%= image_tag logo_image, alt: block_for(name: 'logo_image_text') %>
+  </a>
+<% else %>
+  <a id="logo" class="col-sm-5 navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
+    <span class="institution_name"><%= application_name %></span>
+  </a>
+<% end %>
diff --git a/app/views/themes/institutional_repository/_masthead.html.erb b/app/views/themes/institutional_repository/_masthead.html.erb
index 971e95415..09a06ebab 100644
--- a/app/views/themes/institutional_repository/_masthead.html.erb
+++ b/app/views/themes/institutional_repository/_masthead.html.erb
@@ -1,27 +1,26 @@
-<% # OVERRIDE: Hyrax 2.9 - added the search bar and removed the /login and locale nav menu and moved to the /controls partial for theming %>
-<nav id="masthead" class="navbar navbar-inverse navbar-static-top institutional-repsitory-nav" role="navigation">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar-collapse" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <div class="hidden-lg hidden-md"><%= render '/logo' %></div>
-    </div>
-    <div class="collapse navbar-collapse" id="top-navbar-collapse">
-      <div class="hidden-xs hidden-sm"><%= render '/logo' %></div>
-
-      <div class="institutional-repository-application-name col-sm-2">
-        <span><%= application_name %></span>
+<% # OVERRIDE: Hyrax v5.0.0rc2 - added the search bar and removed the /login and locale nav menu and moved to the /controls partial for theming %>
+<header aria-label="header" class="top-header">
+  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between cultural-repository-nav <%= placement_class %>" role="navigation" aria-label="masthead">
+    <div class="container-fluid">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#top-navbar-collapse" aria-controls="top-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="d-lg-none d-md-none"><%= render '/logo' %></div>
       </div>
+      <div class="collapse navbar-collapse" id="top-navbar-collapse">
+        <div class="d-none d-lg-block d-md-block"><%= render '/logo' %></div>
+
+        <div class="col-lg-2 col-md-2">
+          <span><%= application_name %></span>
+        </div>
 
-      <div class="searchbar-right navbar-right col-sm-5">
-        <%= render partial: 'catalog/search_form' %>
+        <div class="navbar-right col-lg-5 col-md-5">
+          <%= render partial: 'catalog/search_form' %>
+        </div>
       </div>
     </div>
-  </div>
-</nav>
-<%= render '/controls' %>
\ No newline at end of file
+  </nav>
+</header>
+<%= render '/controls' %>
diff --git a/app/views/themes/institutional_repository/_user_util_links.html.erb b/app/views/themes/institutional_repository/_user_util_links.html.erb
index 76c97540f..954b66c89 100644
--- a/app/views/themes/institutional_repository/_user_util_links.html.erb
+++ b/app/views/themes/institutional_repository/_user_util_links.html.erb
@@ -1,32 +1,30 @@
 <div>
-  <ul id="user_utility_links" class="institutional-repository nav navbar-nav navbar-right">
+  <ul id="user_utility_links" class="institutional-repository nav navbar-nav ml-auto">
     <%= render 'shared/locale_picker' if available_translations.size > 1 %>
     <% if user_signed_in? %>
-      <li>
+      <li class="nav-item">
         <%= render_notifications(user: current_user) %>
       </li>
-      <li class="dropdown">
-        <%= link_to hyrax.dashboard_profile_path(current_user), role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false} do %>
+      <li class="nav-item dropdown">
+        <%= link_to hyrax.dashboard_profile_path(current_user), class: 'nav-link dropdown-toggle', id: 'navbarDropdown', role: 'button', data: { toggle: 'dropdown' }, aria: { haspopup: true, expanded: false } do %>
           <span class="sr-only"><%= t("hyrax.toolbar.profile.sr_action") %></span>
           <span class="hidden-xs">&nbsp;<%= current_user.name %></span>
           <span class="sr-only"> <%= t("hyrax.toolbar.profile.sr_target") %></span>
           <span class="fa fa-user"></span>
-          <span class="caret"></span>
         <% end %>
-        <ul class="dropdown-menu dropdown-menu-right" role="menu">
-          <li><%= link_to t("hyrax.toolbar.dashboard.menu"), hyrax.dashboard_path %></li>
-
-          <li class="divider"></li>
-	  <% if Devise.mappings[:user]&.registerable? %>
-            <li><%= link_to t("hyku.toolbar.profile.edit_registration"), main_app.edit_user_registration_path %></li>
+        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+          <a class="dropdown-item" href="<%= hyrax.dashboard_path %>"><%= t("hyrax.toolbar.dashboard.menu") %></a>
+          <div class="dropdown-divider"></div>
+    <% if Devise.mappings[:user]&.registerable? %>
+            <a class="dropdown-item" href="<%= main_app.edit_user_registration_path %>"><%= t("hyku.toolbar.profile.edit_registration") %></a>
           <% end %>
-          <li><%= link_to t("hyrax.toolbar.profile.logout"), main_app.destroy_user_session_path %></li>
-        </ul>
-      </li><!-- /.btn-group -->
+          <a class="dropdown-item" href="<%= main_app.destroy_user_session_path %>"><%= t("hyrax.toolbar.profile.logout") %></a>
+        </div>
+      </li>
     <% else %>
-      <li>
-        <%= link_to main_app.new_user_session_path do %>
-          <span class="glyphicon glyphicon-log-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
+      <li class="nav-item">
+        <%= link_to main_app.new_user_session_path, class: 'nav-link' do %>
+          <span class="fa fa-sign-in" aria-hidden="true"></span> <%= t("hyrax.toolbar.profile.login") %>
         <% end %>
       </li>
     <% end %>
diff --git a/app/views/themes/institutional_repository/catalog/_search_form.html.erb b/app/views/themes/institutional_repository/catalog/_search_form.html.erb
index ba4093773..318b748ef 100644
--- a/app/views/themes/institutional_repository/catalog/_search_form.html.erb
+++ b/app/views/themes/institutional_repository/catalog/_search_form.html.erb
@@ -1,47 +1,45 @@
-<% # OVERRIDE: Hyrax 2.9 template to change the size of the column on line 8 from col-sm-3 to col-sm-6  %>
+<% # OVERRIDE: Hyrax v5.0.0rc2 template to change the size of the column on line 8 from col-sm-3 to col-sm-6  %>
 
 <%= form_tag search_form_action, method: :get, class: "institutional-repository form-horizontal search-form", id: "search-form-header", role: "search" do %>
-  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+  <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
   <%= hidden_field_tag :search_field, 'all_fields' %>
   <div class="form-group">
 
-    <label class="control-label col-sm-6" for="search-field-header">
+    <label class="col-sm-6 mb-0" for="search-field-header">
       <%= t("hyrax.search.form.q.label", application_name: application_name) %>
     </label>
 
-    <div class="input-group">
+    <div class="input-group col-sm-9">
       <%= text_field_tag :q, current_search_parameters , class: "q form-control", id: "search-field-header", placeholder: t("hyrax.search.form.q.placeholder") %>
 
-      <div class="input-group-btn">
+      <div class="input-group-append">
         <button type="submit" class="btn btn-primary" id="search-submit-header">
           <%= t('hyrax.search.button.html') %>
         </button>
         <% if current_user %>
-          <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+          <button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
 
             <span class="sr-only" data-search-element="label"><%= t("hyrax.search.form.option.all.label_long", application_name: application_name) %></span>
             <span aria-hidden="true"><%= t("hyrax.search.form.option.all.label_short") %></span>
-            <span class="caret"></span>
           </button>
 
-          <ul class="dropdown-menu pull-right">
-            <li>
+          <ul class="dropdown-menu dropdown-menu-right">
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.all.label_long", application_name: application_name), "#",
                   data: { "search-option" => main_app.search_catalog_path, "search-label" => t("hyrax.search.form.option.all.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_works.label_long"), "#",
                   data: { "search-option" => hyrax.my_works_path, "search-label" => t("hyrax.search.form.option.my_works.label_short") } %>
             </li>
-            <li>
+            <li class="dropdown-item">
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          <% end %>
-
-        </ul>
+          </ul>
+        <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
 
   </div><!-- /.form-group -->
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_explore_collections.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_explore_collections.html.erb
index c2843060c..126d21063 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_explore_collections.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_explore_collections.html.erb
@@ -1,14 +1,14 @@
-<%# April's note: overriding Hyrax 2.9 template for client theming %>
+<%# April's note: overriding Hyrax v5.0.0rc2 template for client theming %>
 <% featured_collection = f.object.presenter %>
-  <div class="institutional-repository-collections pb-40 col-xs-6">
+<div class="institutional-repository-collections pb-40 col-6">
+  <%= link_to [hyrax, featured_collection] do %>
+    <%= render_thumbnail_tag(featured_collection, { class: "img-fluid", alt: "#{featured_collection.title.first} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %>
+  <% end %>
+  <div class="collection-item-title">
     <%= link_to [hyrax, featured_collection] do %>
-      <%= render_thumbnail_tag(featured_collection, { class: "img-responsive", alt: "#{featured_collection.title.first} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %>
+      <h3>
+        <%= featured_collection.title.first %>
+      </h3>
     <% end %>
-    <div class="collection-item-title">
-      <%= link_to [hyrax, featured_collection] do %>
-        <h3>
-          <%= featured_collection.title.first %>
-        </h3>
-      <% end %>
-    </div>
-  </div>
\ No newline at end of file
+  </div>
+</div>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_featured_researcher.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_featured_researcher.html.erb
index cd98b8660..4595c7e7d 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_featured_researcher.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_featured_researcher.html.erb
@@ -1,7 +1,7 @@
-<div class="institutional-repository-featured-researcher col-sm-12 mb-40 section-border">
+<div class="institutional-repository-featured-researcher col-md-12 mb-4 border">
   <% if @featured_researcher.value.present? %>
       <%= displayable_content_block @featured_researcher %>
   <% else %>
       <%= t('hyrax.homepage.featured_researcher.missing') %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_ir_homepage_stats.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_ir_homepage_stats.html.erb
index 12049d1d8..5c370e951 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_ir_homepage_stats.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_ir_homepage_stats.html.erb
@@ -1,7 +1,7 @@
 <%# get the facet counts for resource types from the controller %>
 <%# facet_counts => {resource_type: count} %>
 <% facet_counts = {} %>
-<% @ir_counts['facet_counts']['facet_fields']['resource_type_sim'].each_slice(2) do | key, value| %>
+<% @ir_counts['facet_counts']['facet_fields']['resource_type_sim'].each_slice(2) do |key, value| %>
   <% facet_counts[key] = value %>
 <% end %>
 
@@ -38,7 +38,7 @@
 <% end %>
 
 <% if count_of_resource_types_greater_than_zero > 0 %>
-  <div class='stats-color-block container-fluid pt-30 pb-30 mb-40'>
+  <div class='stats-color-block container-fluid pt-3 pb-3 mb-4'>
     <div class="row">
       <div class="col-md-12">
         <% if count_of_resource_types_greater_than_zero <= 6 %>
@@ -49,4 +49,4 @@
       </div>
     </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_marketing.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_marketing.html.erb
index 84278883c..b2418be9b 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_marketing.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_marketing.html.erb
@@ -1,6 +1,6 @@
 <% # OVERRIDE: Hyrax 2.9 template to remove the classes on line 4 and add col-sm-12 %>
 <% if display_content_block? @marketing_text %>
   <div class="institutional-repository-home-marketing-text home_marketing_text">
-    <%= displayable_content_block @marketing_text, class: 'mt-40 col-sm-12' %>
+    <%= displayable_content_block @marketing_text, class: 'mt-3 col-sm-12', role: 'complementary' %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb
index 375771b7c..431647c0d 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_recent_document.html.erb
@@ -1,7 +1,7 @@
-<%# OVERRIDE Hyrax 3.4.1 template for client theming and shared search %>
+<%# OVERRIDE Hyrax v5.0.0rc2 template for client theming and shared search %>
 <h3 class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></h3>
-<div class="recently-uploaded col-xs-6 col-sm-6 col-md-6 pt-30 pb-30">
-  <%= render_thumbnail_tag recent_document, {class: 'img-responsive center-block'}, {suppress_link: true} %>
+<div class="recently-uploaded col-6 col-md-6 pt-3 pb-3">
+  <%= render_thumbnail_tag recent_document, {class: 'img-fluid mx-auto d-block'}, {suppress_link: true} %>
   <div class="recent-doc-title">
     <%= link_to recent_document.title_or_label, generate_work_url(recent_document.to_h, request) %>
   </div>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb
index 5695f1132..b7ba8ccf4 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_recently_uploaded.html.erb
@@ -1,4 +1,4 @@
-<div class="institutional-repository-recent-uploads col-sm-12 section-border mb-40 recent-uploads-div-height">
+<div class="institutional-repository-recent-uploads col-sm-12 border mb-4 recent-uploads-div-height">
   <div>
     <h2 class="sr-only"><%= t('hyrax.homepage.recently_uploaded.title') %></h2>
     <% if recent_documents.blank? %>
@@ -8,4 +8,4 @@
       <%= render partial: "themes/institutional_repository/hyrax/homepage/recent_document", collection: recent_documents %>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_slider.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_slider.html.erb
index ae77139dd..c9c144776 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_slider.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_slider.html.erb
@@ -3,23 +3,27 @@
   <meta name="turbolinks-cache-control" content="no-cache">
 <% end %>
 
-<div class="carousel institutional-repository-carousel slide" id="carousel-tilenav" data-interval="false">
+<div class="carousel slide institutional-repository-carousel" id="carousel-tilenav" data-ride="carousel" data-interval="false">
   <div class="carousel-inner">
     <% resource_types.each.with_index do |(k,v), i| %>
       <% next if v[0].zero? %>
-      <div class="item <%= i.zero? ? 'active' : '' %>">
-        <div class="col-xs-12 col-sm-3 col-md-2">
-          <div class="text-center">
-            <%= link_to "/catalog?f[resource_type_sim][]=#{k}", style: "color: inherit;" do %>
-              <i class='<%= "#{v[1]}" %>' aria-hidden="true"></i>
-              <h5><%= k %></h5>
-              <p><%= v[0] %></p>
-            <% end %>
-          </div>
+      <div class="carousel-item <%= 'active' if i.zero? %>">
+        <div class="col-sm-3 col-md-2 text-center">
+          <%= link_to "/catalog?f[resource_type_sim][]=#{k}", style: "color: inherit;" do %>
+            <i class='<%= "#{v[1]}" %>' aria-hidden="true"></i>
+            <h5><%= k %></h5>
+            <p><%= v[0] %></p>
+          <% end %>
         </div>
       </div>
     <% end %>
   </div>
-  <a class="left carousel-control" href="#carousel-tilenav" data-slide="prev"><i class="glyphicon glyphicon-menu-left"></i></a>
-  <a class="right carousel-control" href="#carousel-tilenav" data-slide="next"><i class="glyphicon glyphicon-menu-right"></i></a>
+<a class="carousel-control-prev" href="#carousel-tilenav" role="button" data-slide="prev">
+  <span class="fa fa-chevron-left carousel-control-prev-icon" aria-hidden="true"></span>
+  <span class="sr-only">Previous</span>
+</a>
+<a class="carousel-control-next" href="#carousel-tilenav" role="button" data-slide="next">
+  <span class="fa fa-chevron-right carousel-control-next-icon" aria-hidden="true"></span>
+  <span class="sr-only">Next</span>
+</a>
 </div>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_stats.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_stats.html.erb
index b8f0476e7..43bb9c34a 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_stats.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/_resource_type_stats.html.erb
@@ -1,7 +1,7 @@
-<div class="ir-stats hidden-xs">
-  <% resource_types.each.with_index do |(k,v), i| %>      
+<div class="ir-stats d-none d-sm-block">
+  <% resource_types.each.with_index do |(k,v), i| %>
     <% next if v[0].zero? %>
-    <div class="col-xs-12 col-sm-4 col-md-2">
+    <div class="col-12 col-sm-4 col-md-2">
       <div class="text-center">
         <i class='<%= "#{v[1]}" %>' aria-hidden="true"></i>
         <h5><%= k %></h5>
@@ -9,4 +9,4 @@
       </div>
     </div>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/institutional_repository/hyrax/homepage/all_collections.html.erb b/app/views/themes/institutional_repository/hyrax/homepage/all_collections.html.erb
index df3994bbe..1acd10717 100644
--- a/app/views/themes/institutional_repository/hyrax/homepage/all_collections.html.erb
+++ b/app/views/themes/institutional_repository/hyrax/homepage/all_collections.html.erb
@@ -1,13 +1,13 @@
 <h2>Browse by Collection</h2>
-<% top_level_collections = @collections.select{ |c| c['nesting_collection__deepest_nested_depth_isi'] == 1 }%>
+<% top_level_collections = @collections.select{ |c| c['nesting_collection__deepest_nested_depth_isi'] == 1 } %>
 <% top_level_collections.each do |collection| %>
-  <div class="col-sm-12">
+  <div class="col-12">
     <div>
-      <ul class="all-collection-list">
+      <ul class="list-unstyled all-collection-list">
         <%= link_to [hyrax, collection] do %>
           <li><%= collection.title_or_label %></li>
         <% end %>
       </ul>
     </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/institutional_repository/layouts/homepage.html.erb b/app/views/themes/institutional_repository/layouts/homepage.html.erb
index aefb02453..d32226f5f 100644
--- a/app/views/themes/institutional_repository/layouts/homepage.html.erb
+++ b/app/views/themes/institutional_repository/layouts/homepage.html.erb
@@ -1,4 +1,4 @@
-<% # OVERRIDE: Hyrax 2.9 template to remove the gradient overlay span, removed /controls partial, and added the share your work button for themeing %>
+<% # OVERRIDE: Hyrax v5.0.0rc2 template to remove the gradient overlay span, removed /controls partial, and added the share your work button for theming %>
 <% content_for(:navbar) do %>
   <div class="image-masthead">
   <!-- institutional repository homepage -->
@@ -11,24 +11,24 @@
       <div class="share-your-work-button">
         <% if @presenter&.display_share_button? %>
           <div class="institutional-repository home_share_work row">
-            <div class="col-sm-12 text-center">
+            <div class="col-12 text-center">
               <% if signed_in? %>
                 <% if @presenter.create_many_work_types? %>
                   <%= link_to '#',
                     class: "btn btn-primary btn-lg",
                     data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
-                    <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+                    <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
                   <% end %>
                 <% else # simple link to the first work type %>
                   <%= link_to new_polymorphic_path([main_app, @presenter.first_work_type]),
                         class: 'btn btn-primary' do %>
-                    <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+                    <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
                   <% end %>
                 <% end %>
               <% else %>
                 <%= link_to hyrax.my_works_path,
                   class: "btn btn-primary btn-lg" do %>
-                  <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+                  <i class="fa fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
                 <% end %>
               <% end %>
               <p><%= link_to t(:'hyrax.pages.tabs.terms_page'), hyrax.terms_path %></p>
@@ -47,4 +47,4 @@
   <%= render 'hyrax/homepage/announcement' if controller_name == 'homepage' %>
 <% end %>
 
-<%= render template: 'layouts/hyrax' %>
\ No newline at end of file
+<%= render template: 'layouts/hyrax' %>
diff --git a/app/views/themes/institutional_repository/layouts/hyrax.html.erb b/app/views/themes/institutional_repository/layouts/hyrax.html.erb
index 3b545a178..a1a86cc8d 100644
--- a/app/views/themes/institutional_repository/layouts/hyrax.html.erb
+++ b/app/views/themes/institutional_repository/layouts/hyrax.html.erb
@@ -1,4 +1,4 @@
-<% # OVERRIDE: Hyrax 2.9 template to add themeing body_classes %>
+<% # OVERRIDE: Hyrax v5.0.0rc2 template to add themeing body_classes %>
 <!DOCTYPE html>
 <html lang="<%= I18n.locale.to_s %>" prefix="og:http://ogp.me/ns#">
   <head>
@@ -10,25 +10,25 @@
     <div class="skip-to-content">
       <%= link_to "Skip to Content", "#skip-to-content" %>
     </div>
-    <%= render '/masthead' %>
+    <%= render '/masthead', placement_class: nil %>
     <%= content_for(:navbar) %>
     <%= content_for(:precontainer_content) %>
     <div id="content-wrapper" class="container" role="main">
       <%= render '/flash_msg' %>
-      <%= render_breadcrumbs builder: Hyrax::BootstrapBreadcrumbsBuilder %>
+      <%= render_breadcrumbs builder: Hyrax.config.breadcrumb_builder %>
       <% if content_for?(:page_header) %>
         <div class="row">
-          <div class="col-xs-12 main-header">
+          <div class="col-12 main-header">
             <%= yield(:page_header) %>
           </div>
         </div>
       <% end %>
 
-        <a name="skip-to-content" id="skip-to-content"></a>
-        <%= content_for?(:content) ? yield(:content) : yield %>
-
+      <a name="skip-to-content" id="skip-to-content"></a>
+      <%= render 'shared/read_only' if Flipflop.read_only? %>
+      <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>
     <%= render 'shared/modal' %>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/views/themes/neutral_repository/_featured_carousel.html.erb b/app/views/themes/neutral_repository/_featured_carousel.html.erb
index f561f8379..5bfb71eb9 100644
--- a/app/views/themes/neutral_repository/_featured_carousel.html.erb
+++ b/app/views/themes/neutral_repository/_featured_carousel.html.erb
@@ -10,7 +10,7 @@
   <div class="carousel-inner" role="listbox">
     <% @featured_work_list.featured_works.each.with_index(0) do |featured_work, order| %>
       <% work = SolrDocument.find(featured_work.work_id) %>
-      <div class="item <%= order.zero? ? 'active' : '' %>">
+      <div class="carousel-item <%= order.zero? ? 'active' : '' %>">
         <%= link_to [main_app, work] do %>
           <%= render_thumbnail_tag(work, {suppress_link: true}) %>
         <% end %>
@@ -26,12 +26,12 @@
   </div>
 
   <!-- Controls -->
-  <a class="left carousel-control" href="#featured-carousel" role="button" data-slide="prev">
-    <span class="glyphicon glyphicon-menu-left" aria-hidden="true"></span>
+  <a class="carousel-control-prev" href="#featured-carousel" role="button" data-slide="prev">
+    <span class="carousel-control-prev-icon" aria-hidden="true"></span>
     <span class="sr-only">Previous</span>
   </a>
-  <a class="right carousel-control" href="#featured-carousel" role="button" data-slide="next">
-    <span class="glyphicon glyphicon-menu-right" aria-hidden="true"></span>
+  <a class="carousel-control-next" href="#featured-carousel" role="button" data-slide="next">
+    <span class="carousel-control-next-icon" aria-hidden="true"></span>
     <span class="sr-only">Next</span>
   </a>
 </div>
@@ -41,25 +41,21 @@
     <div class="col-sm-12">
       <% if signed_in? %>
         <% if @presenter.create_many_work_types? %>
-          <%= link_to '#',
-            class: "btn btn-primary btn-lg",
-            data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
-            <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+          <%= link_to '#', class: "btn btn-primary btn-lg", data: { behavior: 'select-work', target: '#worktypes-to-create', 'create-type' => 'single' } do %>
+            <i class="fas fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
           <% end %>
         <% else # simple link to the first work type %>
-          <%= link_to new_polymorphic_path([main_app, @presenter.first_work_type]),
-                class: 'btn btn-default' do %>
-            <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+          <%= link_to new_polymorphic_path([main_app, @presenter.first_work_type]), class: 'btn btn-primary btn-lg' do %>
+            <i class="fas fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
           <% end %>
         <% end %>
       <% else %>
-        <%= link_to hyrax.my_works_path,
-          class: "btn btn-default" do %>
-          <i class="glyphicon glyphicon-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
+        <%= link_to hyrax.my_works_path, class: "btn btn-primary btn-lg" do %>
+          <i class="fas fa-upload" aria-hidden="true"></i> <%= t('hyrax.share_button') %>
         <% end %>
       <% end %>
       <%= link_to t(:'hyrax.pages.tabs.terms_page'), hyrax.terms_path %>
     </div>
   </div>
 <% end %>
-</p>
\ No newline at end of file
+</p>
diff --git a/app/views/themes/neutral_repository/_home_text.html.erb b/app/views/themes/neutral_repository/_home_text.html.erb
index 9098b7001..f6eb6e410 100644
--- a/app/views/themes/neutral_repository/_home_text.html.erb
+++ b/app/views/themes/neutral_repository/_home_text.html.erb
@@ -1,5 +1,5 @@
 <% if display_content_block? @home_text %>
-  <div class="home_page_text homepage-text-container mb-40">
-    <%= displayable_content_block @home_text, class: 'home_page_text p-20' %>
+  <div class="home_page_text homepage-text-container mb-4">
+    <%= displayable_content_block @home_text, class: 'home_page_text p-2' %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/neutral_repository/_theme_container.html.erb b/app/views/themes/neutral_repository/_theme_container.html.erb
index 9bec4a57a..64d2d2194 100644
--- a/app/views/themes/neutral_repository/_theme_container.html.erb
+++ b/app/views/themes/neutral_repository/_theme_container.html.erb
@@ -2,20 +2,27 @@
 
   <!-- Adding a mobile style for the homepage text content block, hidden on md and lg -->
   <% if display_content_block? @home_text %>
-  <div class="hidden-md hidden-lg">
-    <div class="col-xs-12">
-      <%= render 'themes/neutral_repository/home_text' if controller_name == 'homepage' %>
+    <div class="d-block d-md-none">
+      <div class="row">
+        <div class="col-12">
+          <%= render 'themes/neutral_repository/home_text' if controller_name == 'homepage' %>
+        </div>
+      </div>
     </div>
-  </div>
   <% end %>
+
   <%= render 'themes/neutral_repository/layouts/share_your_work_row' if controller_name == 'homepage' %>
+
   <% if @presenter.display_featured_works? %>
-    <div class="col-xs-12">
-      <%= render 'themes/neutral_repository/hyrax/homepage/featured_works' %>
+    <div class="row">
+      <div class="col-12">
+        <%= render 'themes/neutral_repository/hyrax/homepage/featured_works' %>
+      </div>
     </div>
   <% end %>
-  <div class="col-xs-12 mb-30">
-    <div class="col-xs-12 featured-collection-section">
+
+  <div class="row mb-30">
+    <div class="col-12 featured-collection-section">
       <div class="pb-30">
         <h3>Collections</h3>
         <%= render 'featured_collection_section' %>
@@ -23,27 +30,32 @@
     </div>
   </div>
 </div>
-<div class="col-xs-12 col-md-4">
+
+<div class="col-md-4">
   <!-- Adding a desktop style for the homepage text content block, hidden on sm and xs -->
   <% if display_content_block? @home_text %>
-  <div class="hidden-xs hidden-sm">
-    <div class="col-xs-12">
-      <%= render 'themes/neutral_repository/home_text' if controller_name == 'homepage' %>
+    <div class="d-none d-md-block">
+      <div class="row">
+        <div class="col-12">
+          <%= render 'themes/neutral_repository/home_text' if controller_name == 'homepage' %>
+        </div>
+      </div>
     </div>
-  </div>
   <% end %>
+
   <% if @presenter.display_featured_researcher? %>
-  <div>
-    <div class="col-xs-12">
-      <%= render 'themes/neutral_repository/hyrax/homepage/featured_researcher' %>
+    <div class="row">
+      <div class="col-12">
+        <%= render 'themes/neutral_repository/hyrax/homepage/featured_researcher' %>
+      </div>
     </div>
-  </div>
   <% end %>
+
   <% if @presenter.display_recently_uploaded? %>
-  <div>
-    <div class="col-xs-12">
-      <%= render 'recently_uploaded', recent_documents: @recent_documents %>
+    <div class="row">
+      <div class="col-12">
+        <%= render 'recently_uploaded', recent_documents: @recent_documents %>
+      </div>
     </div>
-  </div>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/neutral_repository/hyrax/homepage/_explore_collections.html.erb b/app/views/themes/neutral_repository/hyrax/homepage/_explore_collections.html.erb
index 18c1f4e64..181500939 100644
--- a/app/views/themes/neutral_repository/hyrax/homepage/_explore_collections.html.erb
+++ b/app/views/themes/neutral_repository/hyrax/homepage/_explore_collections.html.erb
@@ -1,13 +1,13 @@
-<% # April's note: overriding Hyrax 3.4.1 template for client theming %>
+<% # April's note: overriding Hyrax v5.0.0rc2 template for client theming %>
 
 <% featured_collection = f.object.presenter %>
-<div class="neutral-repository-collections pb-30 col-xs-6 col-md-4">
+<div class="neutral-repository-collections pb-3 col-6 col-md-4">
   <%= link_to [hyrax, featured_collection] do %>
-    <%= render_thumbnail_tag(featured_collection, { class: "img-responsive", alt: "#{featured_collection.title.first} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %>
+    <%= render_thumbnail_tag(featured_collection, { class: "img-fluid", alt: "#{featured_collection.title.first} #{ t('hyrax.homepage.admin_sets.thumbnail')}" }, {suppress_link: true}) %>
   <% end %>
   <div class="collection-item-title">
     <%= link_to [hyrax, featured_collection] do %>
       <h4><%= featured_collection.title.first %></h4>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/neutral_repository/hyrax/homepage/_featured_researcher.html.erb b/app/views/themes/neutral_repository/hyrax/homepage/_featured_researcher.html.erb
index fa7992d30..beca76d25 100644
--- a/app/views/themes/neutral_repository/hyrax/homepage/_featured_researcher.html.erb
+++ b/app/views/themes/neutral_repository/hyrax/homepage/_featured_researcher.html.erb
@@ -1,7 +1,7 @@
-<div class="neutral_repository featured-researcher mb-40 p-20">
+<div class="neutral_repository featured-researcher mb-4 p-2">
   <% if @featured_researcher.value.present? %>
     <%= displayable_content_block @featured_researcher %>
   <% else %>
     <%= t('hyrax.homepage.featured_researcher.missing') %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb b/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb
index 8cc8cbf53..eac501e0a 100644
--- a/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb
+++ b/app/views/themes/neutral_repository/hyrax/homepage/_featured_works.html.erb
@@ -2,16 +2,16 @@
 <% if @featured_work_list.empty? %>
   <p><%= t('hyrax.homepage.featured_works.no_works') %></p>
 <% elsif can? :update, FeaturedWork %>
-  <%= form_for [hyrax, @featured_work_list] do |f| %>
-    <div class="panel-group dd" id="dd">
-      <ol id="featured_works">
+  <%= form_for [hyrax, @featured_work_list], html: { class: 'card' } do |f| %>
+    <div class="card-body">
+      <ol id="featured_works" class="list-group">
         <%= f.fields_for :featured_works do |featured| %>
           <%= render 'sortable_featured', f: featured %>
         <% end %>
       </ol>
     </div>
-    <%= f.submit("Save order", class: 'btn btn-default') %>
+    <%= f.submit("Save order", class: 'btn btn-primary') %>
   <% end %>
 <% else %>
   <%= render partial: 'themes/neutral_repository/featured_carousel' %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb b/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb
index 921cb0c0c..b1f974732 100644
--- a/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb
+++ b/app/views/themes/neutral_repository/hyrax/homepage/_recent_document.html.erb
@@ -1,9 +1,8 @@
-<%# OVERRIDE Hyrax 3.4.1 template for client theming and shared search %>
+<%# OVERRIDE Hyrax v5.0.0rc2 template for client theming and shared search %>
 <h3 class="sr-only"><%= t('hyrax.homepage.recently_uploaded.document.title_label') %></h3>
-  <div class="recently-uploaded pb-30 col-xs-6 col-md-6">
-    <%= render_thumbnail_tag recent_document, {class: 'img-responsive center-block'}, {suppress_link: true} %>
-    <div class="recent-doc-title">
-      <%= link_to recent_document.title_or_label, generate_work_url(recent_document.to_h, request) %>
-    </div>
+<div class="recently-uploaded pb-3 col-6 col-md-6">
+  <%= render_thumbnail_tag recent_document, {class: 'img-fluid mx-auto d-block'}, {suppress_link: true} %>
+  <div class="recent-doc-title">
+    <%= link_to recent_document.title_or_label, generate_work_url(recent_document.to_h, request) %>
   </div>
 </div>
diff --git a/app/views/themes/neutral_repository/hyrax/homepage/_recently_uploaded.html.erb b/app/views/themes/neutral_repository/hyrax/homepage/_recently_uploaded.html.erb
index ac00aea83..91636986f 100644
--- a/app/views/themes/neutral_repository/hyrax/homepage/_recently_uploaded.html.erb
+++ b/app/views/themes/neutral_repository/hyrax/homepage/_recently_uploaded.html.erb
@@ -8,4 +8,4 @@
       <%= render partial: "themes/neutral_repository/hyrax/homepage/recent_document", collection: recent_documents %>
     <% end %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/themes/neutral_repository/layouts/homepage.html.erb b/app/views/themes/neutral_repository/layouts/homepage.html.erb
index 61e7d5610..c6bc302ff 100644
--- a/app/views/themes/neutral_repository/layouts/homepage.html.erb
+++ b/app/views/themes/neutral_repository/layouts/homepage.html.erb
@@ -1,10 +1,10 @@
-<% # OVERRIDE: Hyrax 2.9 template to remove the render of the removed the background gradient span and add mb-40 class on line 6%>
+<% # OVERRIDE: Hyrax v5.0.0rc2 template to remove the render of the removed the background gradient span and add mb-40 class on line 6%>
 <% content_for(:navbar) do %>
   <div class="image-masthead">
     <!-- neutral repository homepage -->
     <div class="background-container" title="<%= block_for(name: 'banner_image_text') %>" style="background-image: url('<%= banner_image %>')"></div>
 
-    <div class="container site-title-container mb-40">
+    <div class="container site-title-container mb-3">
       <div class="site-title h1" style="text-align: center;">
         <%= render "hyrax/homepage/marketing" if controller_name == 'homepage' %>
       </div>
diff --git a/app/views/themes/scholarly_show/hyrax/base/_work_title.html.erb b/app/views/themes/scholarly_show/hyrax/base/_work_title.html.erb
index eb934c422..3ecf7061b 100644
--- a/app/views/themes/scholarly_show/hyrax/base/_work_title.html.erb
+++ b/app/views/themes/scholarly_show/hyrax/base/_work_title.html.erb
@@ -1,6 +1,6 @@
 <% presenter.title.each_with_index do |title, index| %>
   <div class="row">
-    <div class="col-sm-6">
+    <div class="col-md-6">
       <% if index == 0 %>
         <h2><%= title %>
           <small class="text-muted"><%= presenter.permission_badge %> <%= presenter.workflow.badge %></small>
@@ -9,7 +9,7 @@
         <h2><%= title %></h2>
       <% end %>
     </div>
-    <div class="col-sm-6 text-right">
+    <div class="col-md-6 text-md-right">
       <% if index == 0 %>
         <%= render "show_actions", presenter: presenter %>
       <% end %>
diff --git a/app/views/themes/scholarly_show/hyrax/base/show.html.erb b/app/views/themes/scholarly_show/hyrax/base/show.html.erb
index b8054055c..d02343e21 100644
--- a/app/views/themes/scholarly_show/hyrax/base/show.html.erb
+++ b/app/views/themes/scholarly_show/hyrax/base/show.html.erb
@@ -5,29 +5,29 @@
 <%= render 'shared/citations' %>
 <%= render './shared/additional_citations' %>
 <div class="row work-type">
-  <div class="col-xs-12">
+  <div class="col-12">
     <%= render 'work_type', presenter: @presenter %>
   </div>
-  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
+  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-12">
+    <div class="card">
+      <div class="card-header">
         <%= render 'work_title', presenter: @presenter %>
       </div>
-      <div class="panel-body">
+      <div class="card-body">
         <div class="row">
           <%= render 'workflow_actions_widget', presenter: @presenter %>
-          <% if @presenter.universal_viewer? %>
-            <div class="col-sm-12">
+          <% if @presenter.iiif_viewer? %>
+            <div class="col-12">
               <%= render 'representative_media', presenter: @presenter, viewer: true %>
             </div>
-            <div class="col-sm-12">
+            <div class="col-12">
               <div class="image-show-description">
                 <%= render 'work_description', presenter: @presenter %>
               </div>
-            </div> 
+            </div>
           <% else %>
             <div class="col-sm-3 mb-1">
-              <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.universal_viewer? %>
+              <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.iiif_viewer? %>
             </div>
             <div class="col-sm-9">
               <%= render 'work_description', presenter: @presenter %>
@@ -35,15 +35,13 @@
           <% end %>
         </div>
         <div class="row">
-          <div class="col-sm-12 image-show-metadata">  
+          <div class="col-12 image-show-metadata">
             <%= render 'metadata', presenter: @presenter %>
           </div>
-          <div class="col-sm-12">
+          <div class="col-12">
             <%= render 'relationships', presenter: @presenter %>
             <%= render 'items', presenter: @presenter %>
-            <%# TODO: we may consider adding these partials in the future %>
-            <%# = render 'sharing_with', presenter: @presenter %>
-            <%# = render 'user_activity', presenter: @presenter %>
+            <%# TODO: consider adding 'sharing_with' and 'user_activity' partials in the future %>
           </div>
         </div>
       </div>

From 6a4865280170696404b59963f88655b5d8a0c57b Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 06:28:57 -0500
Subject: [PATCH 079/126] Hyrax 5 upgrade rubocop fixes & get specs running in
 CI (#2065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹Rubocop Fixes

* Attempt to fix circleci
---
 .circleci/config.yml                          |  2 +-
 .rubocop.yml                                  | 20 +++++++++++--
 Rakefile                                      |  2 ++
 app/controllers/admin/users_controller.rb     |  4 +--
 app/controllers/application_controller.rb     | 15 +++++++---
 .../hyrax/works_controller_behavior.rb        | 14 +++++-----
 .../hyrax/contact_form_controller.rb          |  2 +-
 .../hyrax/dashboard/collections_controller.rb | 23 +++++++--------
 app/controllers/hyrax/homepage_controller.rb  | 13 +++++----
 app/forms/hyrax/forms/admin/appearance.rb     |  8 ++++--
 app/helpers/admin_stats_helper.rb             |  2 +-
 app/helpers/application_helper.rb             |  2 +-
 app/helpers/google_tag_manager_helper.rb      |  4 +--
 app/helpers/group_navigation_helper.rb        |  2 +-
 app/helpers/hyrax_helper.rb                   |  2 +-
 app/helpers/shared_search_helper.rb           |  2 +-
 app/jobs/create_solr_collection_job.rb        |  8 +++---
 app/jobs/delete_old_guests_job.rb             |  2 +-
 app/jobs/import_work_from_purl_job.rb         |  2 +-
 app/models/concerns/account_switch.rb         |  2 +-
 .../concerns/hyrax/ability/work_ability.rb    |  2 +-
 app/models/content_block.rb                   | 24 ++++++++--------
 app/models/featured_collection_list.rb        |  2 +-
 app/models/hyrax/group.rb                     |  2 +-
 app/models/role.rb                            |  2 +-
 app/models/site.rb                            |  2 +-
 app/models/user.rb                            |  4 +++
 .../iiif_av/displays_content_decorator.rb     | 16 +++++------
 .../hyku/collapsable_section_presenter.rb     |  2 +-
 app/presenters/hyku/menu_presenter.rb         | 12 ++++----
 app/presenters/hyku/work_show_presenter.rb    |  2 +-
 .../hyrax/collection_presenter_decorator.rb   |  2 +-
 .../hyrax/homepage_presenter_decorator.rb     |  2 +-
 .../iiif_manifest_presenter_decorator.rb      |  2 +-
 app/services/create_account.rb                |  4 +--
 .../admin_set_create_service_decorator.rb     | 10 +++----
 .../hyrax/collection_types/create_service.rb  |  2 +-
 .../permissions_create_service_decorator.rb   |  4 ++-
 .../permissions_service_decorator.rb          |  2 +-
 .../hyrax/workflow/permission_grantor.rb      | 10 +++----
 .../hyrax/workflow/permission_query.rb        | 22 +++++++--------
 app/services/roles_service.rb                 | 14 ++++++----
 bin/graph                                     |  2 +-
 config/initializers/apartment.rb              |  2 +-
 config/initializers/devise.rb                 |  6 ++--
 config/initializers/hyrax.rb                  |  4 +--
 config/routes.rb                              |  5 +---
 lib/importer/factory/collection_factory.rb    |  2 +-
 lib/importer/factory/object_factory.rb        |  6 ++--
 lib/importer/mods_parser.rb                   | 14 +++++-----
 .../metadata_format/hyku_dublin_core.rb       |  2 ++
 lib/stanford/importer/mods_parser.rb          |  2 +-
 lib/stanford/importer/purl_parser.rb          | 12 ++++----
 lib/tasks/rubocop.rake                        |  2 ++
 .../find_ids_by_model_decorator.rb            |  2 +-
 spec/abilities/collection_ability_spec.rb     | 16 +++++------
 spec/abilities/solr_document_ability_spec.rb  |  2 +-
 .../admin/accounts_controller_spec.rb         |  2 +-
 .../hyrax/generic_works_controller_spec.rb    |  2 +-
 .../hyrax/homepage_controller_spec.rb         |  6 ++--
 .../hyrax/images_controller_spec.rb           |  2 +-
 .../proprietor/accounts_controller_spec.rb    |  4 +--
 .../proprietor/users_controller_spec.rb       |  2 +-
 spec/factories/accounts.rb                    |  4 +--
 spec/factories/permission_templates.rb        | 14 +++++-----
 .../admin_set_form_participants_tab_spec.rb   |  2 +-
 spec/features/appearance_theme_spec.rb        |  2 +-
 .../features/assign_workflow_to_group_spec.rb |  2 +-
 spec/features/collection_manager_role_spec.rb |  4 +--
 spec/features/collection_spec.rb              | 22 +++++++--------
 spec/features/create_generic_work_spec.rb     |  4 +--
 spec/features/create_image_spec.rb            |  4 +--
 .../cultural_repository_theme_spec.rb         |  2 +-
 spec/features/featured_collections_spec.rb    |  6 ++--
 .../institutional_repository_theme_spec.rb    |  2 +-
 spec/features/oai_pmh_spec.rb                 |  4 +--
 spec/features/show_page_theme_spec.rb         |  4 +--
 .../work_approval_permissions_spec.rb         |  2 +-
 spec/features/work_editor_role_spec.rb        |  2 +-
 .../forms/permission_template_form_spec.rb    | 28 +++++++++----------
 spec/helpers/shared_search_helper_spec.rb     |  2 +-
 spec/indexers/app_indexer_spec.rb             |  2 +-
 spec/jobs/import_work_from_purl_job_spec.rb   |  2 +-
 spec/lib/importer/factory/etd_factory_spec.rb |  2 +-
 .../importer/factory/image_factory_spec.rb    |  2 +-
 .../factory/string_literal_processor_spec.rb  |  2 +-
 spec/models/account_spec.rb                   |  4 +--
 spec/models/collection_spec.rb                |  4 +--
 spec/models/fcrepo_endpoint_spec.rb           |  2 +-
 spec/models/featured_collection_list_spec.rb  |  8 +++---
 spec/models/hyrax/group_spec.rb               |  6 ++--
 spec/models/redis_endpoint_spec.rb            |  2 +-
 spec/models/uploaded_file_spec.rb             |  2 +-
 .../admin/group/navigation_presenter_spec.rb  | 16 +++++------
 spec/presenters/hyku/menu_presenter_spec.rb   | 12 ++++----
 spec/requests/catalog_controller_spec.rb      |  4 +--
 spec/requests/institution_visibility_spec.rb  |  2 +-
 .../work_approval_permissions_spec.rb         |  2 +-
 spec/requests/work_depositor_role_spec.rb     |  4 +--
 spec/requests/work_editor_role_spec.rb        |  4 +--
 .../work_show_institution_visibility_spec.rb  |  2 +-
 .../work_show_open_visibility_spec.rb         |  2 +-
 .../work_show_private_visibility_spec.rb      |  2 +-
 .../hyrax/workflow/permission_grantor_spec.rb |  6 ++--
 .../hyrax/workflow/permission_query_spec.rb   | 24 ++++++++--------
 spec/services/roles_service_spec.rb           |  4 +--
 .../hyrax/admin/users/index.html.erb_spec.rb  | 12 ++++----
 .../content_blocks/edit.html.erb_spec.rb      |  8 +++---
 108 files changed, 332 insertions(+), 292 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84e0cf65b..455c371b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 orbs:
   samvera: samvera/circleci-orb@1
-  browser-tools: circleci/browser-tools@1.3
+  browser-tools: circleci/browser-tools@1.4.6
   ruby: circleci/ruby@2
   node: circleci/node@5
 
diff --git a/.rubocop.yml b/.rubocop.yml
index 7af771792..fd4518693 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,8 @@ inherit_gem:
   bixby: bixby_default.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  NewCops: disable
+  TargetRubyVersion: 3.2.2
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'
@@ -13,6 +14,8 @@ AllCops:
     - 'spec/test_app_templates/**/*'
     - 'vendor/**/*'
     - 'lib/hyrax/specs/**/*'
+    - 'bin/graph'
+    - 'bin/import_from_purl'
 
 Lint/ImplicitStringConcatenation:
   Exclude:
@@ -23,7 +26,7 @@ Rails/Output:
     - 'lib/generators/**/*'
 
 Metrics/BlockLength:
-  ExcludedMethods: ['included']
+  IgnoredMethods: ['included']
   Exclude:
     - 'hyrax.gemspec'
     - 'app/models/concerns/hyrax/content_block_behavior.rb'
@@ -65,9 +68,16 @@ Style/SingleLineBlockParams:
 Rails/ApplicationJob:
   Enabled: false
 
+Rails/ApplicationMailer:
+  Enabled: false
+
 Rails/ApplicationRecord:
   Enabled: false
 
+Rails/HasManyOrHasOneDependent:
+  Exclude:
+    - 'app/models/endpoint.rb'
+
 Rails/RakeEnvironment:
   Enabled: false
 
@@ -94,6 +104,12 @@ Rails/OutputSafety:
     - 'app/renderers/hyrax/renderers/attribute_renderer.rb'
     - 'spec/views/hyrax/my/works/_list_works.html.erb_spec.rb'
 
+Rails/UniqueValidationWithoutIndex:
+  Exclude:
+    - 'app/models/account.rb'
+    - 'app/models/domain_name.rb'
+    - 'app/models/hyrax/group.rb'
+
 RSpec/DescribeClass:
   Exclude:
     - 'spec/abilities/**/*'
diff --git a/Rakefile b/Rakefile
index 8f8cb932c..ac6b3fbc9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,7 +17,9 @@ Rails.application.load_tasks
 
 begin
   require 'solr_wrapper/rake_task'
+# rubocop:disable Lint/SuppressedException
 rescue LoadError
+  # rubocop:enable Lint/SuppressedException
 end
 
 task :ci do
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 6230b44c3..66d17cc44 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -20,9 +20,9 @@ def activate
       user.password = ENV.fetch('HYKU_USER_DEFAULT_PASSWORD', 'password')
 
       if user.save && user.accept_invitation!
-        redirect_to hyrax.admin_users_path, notice: t('hyrax.admin.users.activate.success', user: user)
+        redirect_to hyrax.admin_users_path, notice: t('hyrax.admin.users.activate.success', user:)
       else
-        redirect_to hyrax.admin_users_path, flash: { error: t('hyrax.admin.users.activate.failure', user: user) }
+        redirect_to hyrax.admin_users_path, flash: { error: t('hyrax.admin.users.activate.failure', user:) }
       end
     end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4c6abe1a8..77730d697 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -29,18 +29,24 @@ class ApplicationController < ActionController::Base
 
   protected
 
+  # rubocop:disable Naming/PredicateName
   def is_hidden
+    # rubocop:enable Naming/PredicateName
     current_account.persisted? && !current_account.is_public?
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_api_or_pdf
+    # rubocop:enable Naming/PredicateName
     request.format.to_s.match('json') ||
       params[:print] ||
       request.path.include?('api') ||
       request.path.include?('pdf')
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_staging
+    # rubocop:enable Naming/PredicateName
     ['staging'].include?(Rails.env)
   end
 
@@ -49,10 +55,11 @@ def is_staging
   def authenticate_if_needed
     # Disable this extra authentication in test mode
     return true if Rails.env.test?
-    if (is_hidden || is_staging) && !is_api_or_pdf
-      authenticate_or_request_with_http_basic do |username, password|
-        username == "samvera" && password == "hyku"
-      end
+    # rubocop:disable Naming/PredicateName
+    return unless (is_hidden || is_staging) && !is_api_or_pdf
+    # rubocop:enable Naming/PredicateName
+    authenticate_or_request_with_http_basic do |username, password|
+      username == "samvera" && password == "hyku"
     end
   end
 
diff --git a/app/controllers/concerns/hyrax/works_controller_behavior.rb b/app/controllers/concerns/hyrax/works_controller_behavior.rb
index 652b59e7c..f7ea802a0 100644
--- a/app/controllers/concerns/hyrax/works_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/works_controller_behavior.rb
@@ -184,7 +184,7 @@ def create_valkyrie_work
         transactions['change_set.create_work']
         .with_step_args(
           'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
-          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+          'work_resource.add_file_sets' => { uploaded_files:, file_set_params: params[hash_key_for_curation_concern][:file_set] },
           'change_set.set_user_as_depositor' => { user: current_user },
           'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
         )
@@ -198,8 +198,8 @@ def update_valkyrie_work
       return after_update_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
       result =
         transactions['change_set.update_work']
-        .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes })
+        .with_step_args('work_resource.add_file_sets' => { uploaded_files:, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+                        'work_resource.update_work_members' => { work_members_attributes: })
         .call(form)
       @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
       after_update_response
@@ -350,7 +350,7 @@ def attributes_for_actor
       uploaded_files = params.fetch(:uploaded_files, [])
       selected_files = params.fetch(:selected_files, {}).values
       browse_everything_urls = uploaded_files &
-                               selected_files.map { |f| f[:url] }
+                               selected_files.pluck(:url)
 
       # we need the hash of files with url and file_name
       browse_everything_files = selected_files
@@ -389,7 +389,7 @@ def after_create_error(errors, original_input_params_for_form = nil)
           rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
           render 'new', status: :unprocessable_entity
         end
-        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
       end
     end
 
@@ -418,7 +418,7 @@ def after_update_error(errors)
           build_form unless @form.is_a? Hyrax::ChangeSet
           render 'edit', status: :unprocessable_entity
         end
-        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
       end
     end
 
@@ -500,7 +500,7 @@ def available_admin_sets
           .new(admin_set: admin_set_doc, permission_template: template, permit_sharing: sharing)
       end
 
-      AdminSetSelectionPresenter.new(admin_sets: admin_sets)
+      AdminSetSelectionPresenter.new(admin_sets:)
     end
 
     # added to prepend the show theme views into the view_paths
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index d0bed0992..e0c81d2c8 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -127,7 +127,7 @@ def setup_negative_captcha
         # If you wish to override the default CSS styles (position: absolute; left: -2000px;)
         # used to position the fields off-screen
         css: "display: none",
-        params: params
+        params:
       )
     end
   end
diff --git a/app/controllers/hyrax/dashboard/collections_controller.rb b/app/controllers/hyrax/dashboard/collections_controller.rb
index 072caf38b..95e25f557 100644
--- a/app/controllers/hyrax/dashboard/collections_controller.rb
+++ b/app/controllers/hyrax/dashboard/collections_controller.rb
@@ -86,9 +86,8 @@ def edit
         form
         collection_type
         # Gets original filename of an uploaded thumbnail. See #update
-        if ::SolrDocument.find(@collection.id).thumbnail_path.include? "uploaded_collection_thumbnails" && uploaded_thumbnail?
-          @thumbnail_filename = File.basename(uploaded_thumbnail_files.reject { |f| File.basename(f).include? @collection.id }.first)
-        end
+        return unless ::SolrDocument.find(@collection.id).thumbnail_path.include?("uploaded_collection_thumbnails" && uploaded_thumbnail?)
+        @thumbnail_filename = File.basename(uploaded_thumbnail_files.reject { |f| File.basename(f).include? @collection.id }.first)
       end
 
       def uploaded_thumbnail?
@@ -182,7 +181,7 @@ def after_destroy_error(id)
             flash[:notice] = t('hyrax.dashboard.my.action.collection_delete_fail')
             render :edit, status: :unprocessable_entity
           end
-          format.json { render json: { id: id }, status: :unprocessable_entity, location: dashboard_collection_path(@collection) }
+          format.json { render json: { id: }, status: :unprocessable_entity, location: dashboard_collection_path(@collection) }
         end
       end
 
@@ -212,7 +211,7 @@ def collection
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def files
         params[:q] = '' unless params[:q]
-        builder = Hyrax::CollectionMemberSearchBuilder.new(scope: self, collection: collection, search_includes_models: :works)
+        builder = Hyrax::CollectionMemberSearchBuilder.new(scope: self, collection:, search_includes_models: :works)
         # get the default work image because we do not want to show any works in this
         # dropdown that only have the default work image. this indicates that they have
         # no files attached, and will throw an error if selected.
@@ -223,7 +222,9 @@ def files
         result = response.documents.reject do |document|
                    document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) ||
                      document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path)
+                   # rubocop:disable Style/MultilineBlockChain
                  end.map do |document|
+          # rubocop:enable Style/MultilineBlockChain
           { id: document["thumbnail_path_ss"].split('/').last.gsub(/\?.*/, ''), text: document["title_tesim"].first }
         end
         reset_thumbnail_option = {
@@ -497,7 +498,7 @@ def extract_old_style_permission_attributes(attributes)
         participants = []
         permissions.each do |p|
           access = access(p)
-          participants << { agent_type: agent_type(p), agent_id: p["name"], access: access } if access
+          participants << { agent_type: agent_type(p), agent_id: p["name"], access: } if access
         end
         participants
       end
@@ -526,7 +527,7 @@ def add_members_to_collection(collection = nil, collection_id: nil)
         collection_id ||= (collection.try(:id) || @collection.id)
 
         Hyrax::Collections::CollectionMemberService
-          .add_members_by_ids(collection_id: collection_id,
+          .add_members_by_ids(collection_id:,
                               new_member_ids: batch,
                               user: current_user)
       end
@@ -595,7 +596,7 @@ def query_collection_members
 
       # Instantiate the membership query service
       def collection_member_service
-        @collection_member_service ||= membership_service_class.new(scope: self, collection: collection, params: params_for_query)
+        @collection_member_service ||= membership_service_class.new(scope: self, collection:, params: params_for_query)
       end
 
       def member_works
@@ -614,7 +615,7 @@ def member_subcollections
       def parent_collections
         page = params[:parent_collection_page].to_i
         query = Hyrax::Collections::NestedCollectionQueryService
-        collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page: page)
+        collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page:)
       end
 
       def collection_object
@@ -675,7 +676,7 @@ def after_create_errors(errors) # for valkyrie
             render 'new', status: :unprocessable_entity
           end
           wants.json do
-            render_json_response(response_type: :unprocessable_entity, options: { errors: errors })
+            render_json_response(response_type: :unprocessable_entity, options: { errors: })
           end
         end
       end
@@ -705,7 +706,7 @@ def after_update_errors(errors) # for valkyrie
             flash[:error] = errors.to_s
             render 'edit', status: :unprocessable_entity
           end
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
         end
       end
 
diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
index 45954860c..a19c16103 100644
--- a/app/controllers/hyrax/homepage_controller.rb
+++ b/app/controllers/hyrax/homepage_controller.rb
@@ -106,7 +106,7 @@ def search_action_url(options = {})
 
     # Return 6 collections, sorts by title
     def collections(rows: 6)
-    (response, documents) = Hyrax::CollectionsService.new(self).search_results do |builder|
+      Hyrax::CollectionsService.new(self).search_results do |builder|
         builder.rows(rows)
         builder.merge(sort: "title_ssi")
       end
@@ -150,13 +150,14 @@ def inject_theme_views
     end
 
     # add this method to vary blacklight config and user_params
-    def search_service(*args)
+    def search_service(*_args)
       Hyrax::SearchService.new(
-        config: ::CatalogController.new.blacklight_config, 
-        user_params: params.except(:q, :page), 
+        config: ::CatalogController.new.blacklight_config,
+        user_params: params.except(:q, :page),
         scope: self,
-        current_ability: current_ability,
-        search_builder_class: search_builder_class)
+        current_ability:,
+        search_builder_class:
+      )
     end
   end
 end
diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index da3b2802d..03a521a29 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -226,7 +226,9 @@ def primary_button_focus_border_color
         # The custom css module
         def custom_css_block
           # we want to be able to read the css
+          # rubocop:disable Rails/OutputSafety
           block_for('custom_css_block', '/* custom stylesheet */').html_safe
+          # rubocop:enable Rails/OutputSafety
         end
 
         # DEFAULT BUTTON COLORS
@@ -445,21 +447,23 @@ def default_values
         end
 
         def block_for(name, dynamic_default = nil)
-          ContentBlock.block_for(name: name, fallback_value: default_values[name] || dynamic_default)
+          ContentBlock.block_for(name:, fallback_value: default_values[name] || dynamic_default)
         end
 
         # Persist a key/value tuple as a ContentBlock
         # @param [Symbol] name the identifier for the ContentBlock
         # @param [String] value the value to set
         def update_block(name, value)
-          ContentBlock.update_block(name: name, value: value)
+          ContentBlock.update_block(name:, value:)
         end
 
         def format_font_names(font_style)
           # the fonts come with `Font Name:font-weight` - this removes the weight
           parts = font_style.split(':')
           # Google fonts use `+` in place of spaces. This fixes it for CSS.
+          # rubocop:disable Rails/OutputSafety
           parts[0].tr('+', ' ').html_safe
+          # rubocop:enable Rails/OutputSafety
         end
       end
     end
diff --git a/app/helpers/admin_stats_helper.rb b/app/helpers/admin_stats_helper.rb
index e1558e502..bcd96b677 100644
--- a/app/helpers/admin_stats_helper.rb
+++ b/app/helpers/admin_stats_helper.rb
@@ -5,7 +5,7 @@ def graph_tag(id, data, options)
     content_tag :div, class: 'graph-container',
                       data: { graph_data: data.to_json,
                               graph_options: options } do
-      content_tag :div, nil, class: 'graph', id: id
+      content_tag :div, nil, class: 'graph', id:
     end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index df85c9a77..e4cd54f18 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -8,7 +8,7 @@ module ApplicationHelper
   include HykuKnapsack::ApplicationHelper
 
   def hint_for(term:, record_class: nil)
-    hint = locale_for(type: 'hints', term: term, record_class: record_class)
+    hint = locale_for(type: 'hints', term:, record_class:)
 
     return hint unless missing_translation(hint)
   end
diff --git a/app/helpers/google_tag_manager_helper.rb b/app/helpers/google_tag_manager_helper.rb
index 6a9f6f70c..87518a045 100644
--- a/app/helpers/google_tag_manager_helper.rb
+++ b/app/helpers/google_tag_manager_helper.rb
@@ -5,7 +5,7 @@ def render_gtm_head(_host)
     return '' if current_account.gtm_id.blank?
 
     # rubocop:disable Rails/OutputSafety
-    <<-HTML.strip_heredoc.html_safe
+    <<~HTML.html_safe
       <!-- Google Tag Manager -->
       <script>
        (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -23,7 +23,7 @@ def render_gtm_body(_host)
     # render 'layouts/google/gtm_body'
     return '' if current_account.gtm_id.blank?
     # rubocop:disable Rails/OutputSafety
-    <<-HTML.strip_heredoc.html_safe
+    <<~HTML.html_safe
        <!-- Google Tag Manager (noscript) -->
 
       <noscript><iframe src='https://www.googletagmanager.com/ns.html?id="#{current_account.gtm_id}"'
diff --git a/app/helpers/group_navigation_helper.rb b/app/helpers/group_navigation_helper.rb
index 2bc90c72e..e29868d8a 100644
--- a/app/helpers/group_navigation_helper.rb
+++ b/app/helpers/group_navigation_helper.rb
@@ -2,6 +2,6 @@
 
 module GroupNavigationHelper
   def navigation_presenter
-    @navigation_presenter ||= Hyku::Admin::Group::NavigationPresenter.new(params: params)
+    @navigation_presenter ||= Hyku::Admin::Group::NavigationPresenter.new(params:)
   end
 end
diff --git a/app/helpers/hyrax_helper.rb b/app/helpers/hyrax_helper.rb
index 921498837..c8f57f902 100644
--- a/app/helpers/hyrax_helper.rb
+++ b/app/helpers/hyrax_helper.rb
@@ -26,7 +26,7 @@ def logo_image
   end
 
   def block_for(name:)
-    ContentBlock.block_for(name: name, fallback_value: false)
+    ContentBlock.block_for(name:, fallback_value: false)
   end
 
   def directory_image
diff --git a/app/helpers/shared_search_helper.rb b/app/helpers/shared_search_helper.rb
index bc96c3cf6..0bbae1b18 100644
--- a/app/helpers/shared_search_helper.rb
+++ b/app/helpers/shared_search_helper.rb
@@ -17,7 +17,7 @@ def generate_work_url(model, request)
       id = model["id"]
     end
     request_params = %i[protocol host port].map { |method| ["request_#{method}".to_sym, request.send(method)] }.to_h
-    get_url(id: id, request: request_params, account_cname: account_cname, has_model: has_model)
+    get_url(id:, request: request_params, account_cname:, has_model:)
   end
 
   private
diff --git a/app/jobs/create_solr_collection_job.rb b/app/jobs/create_solr_collection_job.rb
index 536203795..e818f8fae 100644
--- a/app/jobs/create_solr_collection_job.rb
+++ b/app/jobs/create_solr_collection_job.rb
@@ -22,10 +22,10 @@ def without_account(name, tenant_list = '')
     return if collection_exists?(name)
     if tenant_list.present?
       client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATEALIAS',
-                                                                             name: name, collections: tenant_list)
+                                                                             name:, collections: tenant_list)
     else
       client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATE',
-                                                                             name: name)
+                                                                             name:)
     end
   end
 
@@ -106,7 +106,7 @@ def add_solr_endpoint_to_account(account, name)
   def perform_for_normal_tenant(account, name)
     unless collection_exists? name
       client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATE',
-                                                                             name: name)
+                                                                             name:)
     end
     add_solr_endpoint_to_account(account, name)
   end
@@ -128,6 +128,6 @@ def perform_for_cross_search_tenant(account, name)
   def create_shared_search_collection(tenant_list, name)
     return true if collection_exists?(name)
     client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATEALIAS',
-                                                                           name: name, collections: tenant_list)
+                                                                           name:, collections: tenant_list)
   end
 end
diff --git a/app/jobs/delete_old_guests_job.rb b/app/jobs/delete_old_guests_job.rb
index 8af24d850..51eafba83 100644
--- a/app/jobs/delete_old_guests_job.rb
+++ b/app/jobs/delete_old_guests_job.rb
@@ -7,7 +7,7 @@ class DeleteOldGuestsJob < ApplicationJob
   end
 
   def perform
-    User.unscope(:where).where("guest = ? and updated_at < ?", true, Time.current - 7.days).destroy_all
+    User.unscope(:where).where("guest = ? and updated_at < ?", true, 7.days.ago).destroy_all
   end
 
   private
diff --git a/app/jobs/import_work_from_purl_job.rb b/app/jobs/import_work_from_purl_job.rb
index 9e410926f..efc5dc0e2 100644
--- a/app/jobs/import_work_from_purl_job.rb
+++ b/app/jobs/import_work_from_purl_job.rb
@@ -85,7 +85,7 @@ def process_collection(attributes)
       retry if (retries += 1) < 3
       raise e
     end
-    attributes[:member_of_collection_attributes] = [{ id: id }]
+    attributes[:member_of_collection_attributes] = [{ id: }]
   end
 
   # Override this method if you have a different rubric for choosing the model
diff --git a/app/models/concerns/account_switch.rb b/app/models/concerns/account_switch.rb
index 75e46077f..613dbec60 100644
--- a/app/models/concerns/account_switch.rb
+++ b/app/models/concerns/account_switch.rb
@@ -3,7 +3,7 @@
 module AccountSwitch
   extend ActiveSupport::Concern
 
-  DOMAIN_REGEXP = %r{^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,8}(:[0-9]{1,5})?(/.*)?$}ix.freeze
+  DOMAIN_REGEXP = %r{^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,8}(:[0-9]{1,5})?(/.*)?$}ix
 
   class_methods do
     # rubocop:disable Metrics/MethodLength
diff --git a/app/models/concerns/hyrax/ability/work_ability.rb b/app/models/concerns/hyrax/ability/work_ability.rb
index b025c979c..9d7daebc0 100644
--- a/app/models/concerns/hyrax/ability/work_ability.rb
+++ b/app/models/concerns/hyrax/ability/work_ability.rb
@@ -32,7 +32,7 @@ def admin_set_with_deposit?
 
         return false if ids.empty?
 
-        Hyrax.custom_queries.find_ids_by_model(model: Hyrax::AdministrativeSet, ids: ids).any?
+        Hyrax.custom_queries.find_ids_by_model(model: Hyrax::AdministrativeSet, ids:).any?
       end
     end
   end
diff --git a/app/models/content_block.rb b/app/models/content_block.rb
index 5cf86b992..7fcab340c 100644
--- a/app/models/content_block.rb
+++ b/app/models/content_block.rb
@@ -44,7 +44,7 @@ def whitelisted?(key)
     #
     # @return [Object] either the named block's value or the fallback_value.
     def block_for(name:, fallback_value: false)
-      block = ContentBlock.find_by(name: name)
+      block = ContentBlock.find_by(name:)
       block&.value.presence || fallback_value
     end
 
@@ -53,7 +53,7 @@ def block_for(name:, fallback_value: false)
     # @param name [#to_s] the named content block
     # @param value [Object] the value to update the given content block
     def update_block(name:, value:)
-      find_or_create_by(name: name.to_s).update!(value: value)
+      find_or_create_by(name: name.to_s).update!(value:)
     end
 
     def registered?(key)
@@ -65,7 +65,7 @@ def marketing_text
     end
 
     def marketing_text=(value)
-      marketing_text.update(value: value)
+      marketing_text.update(value:)
     end
 
     def announcement_text
@@ -73,7 +73,7 @@ def announcement_text
     end
 
     def announcement_text=(value)
-      announcement_text.update(value: value)
+      announcement_text.update(value:)
     end
 
     def featured_researcher
@@ -81,7 +81,7 @@ def featured_researcher
     end
 
     def featured_researcher=(value)
-      featured_researcher.update(value: value)
+      featured_researcher.update(value:)
     end
 
     # OVERRIDE Hyrax v3.4.0 to add home_text getter/setter methods - Adding themes
@@ -90,7 +90,7 @@ def home_text
     end
 
     def home_text=(value)
-      home_text.update(value: value)
+      home_text.update(value:)
     end
 
     def homepage_about_section_heading
@@ -98,7 +98,7 @@ def homepage_about_section_heading
     end
 
     def homepage_about_section_heading=(value)
-      homepage_about_section_heading.update(value: value)
+      homepage_about_section_heading.update(value:)
     end
 
     def homepage_about_section_content
@@ -106,7 +106,7 @@ def homepage_about_section_content
     end
 
     def homepage_about_section_content=(value)
-      homepage_about_section_content.update(value: value)
+      homepage_about_section_content.update(value:)
     end
 
     def about_page
@@ -114,7 +114,7 @@ def about_page
     end
 
     def about_page=(value)
-      about_page.update(value: value)
+      about_page.update(value:)
     end
 
     def agreement_page
@@ -123,7 +123,7 @@ def agreement_page
     end
 
     def agreement_page=(value)
-      agreement_page.update(value: value)
+      agreement_page.update(value:)
     end
 
     def help_page
@@ -131,7 +131,7 @@ def help_page
     end
 
     def help_page=(value)
-      help_page.update(value: value)
+      help_page.update(value:)
     end
 
     def terms_page
@@ -140,7 +140,7 @@ def terms_page
     end
 
     def terms_page=(value)
-      terms_page.update(value: value)
+      terms_page.update(value:)
     end
 
     def default_agreement_text
diff --git a/app/models/featured_collection_list.rb b/app/models/featured_collection_list.rb
index 394fb8069..5a1ff6363 100644
--- a/app/models/featured_collection_list.rb
+++ b/app/models/featured_collection_list.rb
@@ -42,7 +42,7 @@ def ids
 
   def collection_presenters
     ability = nil
-    Hyrax::PresenterFactory.build_for(ids: ids,
+    Hyrax::PresenterFactory.build_for(ids:,
                                       presenter_class: Hyku::WorkShowPresenter,
                                       presenter_args: ability)
   end
diff --git a/app/models/hyrax/group.rb b/app/models/hyrax/group.rb
index 9b3d95ab8..290ed6e2f 100644
--- a/app/models/hyrax/group.rb
+++ b/app/models/hyrax/group.rb
@@ -43,7 +43,7 @@ def search_members(query, member_class: DEFAULT_MEMBER_CLASS)
       if query.present? && member_class == DEFAULT_MEMBER_CLASS
         members.where("email LIKE :q OR display_name LIKE :q", q: "%#{query}%")
       else
-        members(member_class: member_class)
+        members(member_class:)
       end
     end
 
diff --git a/app/models/role.rb b/app/models/role.rb
index f30b58e30..7e3b3b543 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Role < ApplicationRecord
-  has_and_belongs_to_many :users, join_table: :users_roles
+  has_many :users, through: :users_roles
   has_many :group_roles, dependent: :destroy
   has_many :groups, through: :group_roles
 
diff --git a/app/models/site.rb b/app/models/site.rb
index 431315297..b250a193c 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -61,7 +61,7 @@ def add_admins_by_email(emails)
     end
     # For new users, send invitation and add to role
     (emails - existing_emails).each do |email|
-      u = User.invite!(email: email)
+      u = User.invite!(email:)
       u.add_role :admin, self
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index a6ef4151e..4a1beb3ab 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -46,11 +46,15 @@ def to_s
     email
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_admin
+    # rubocop:enable Naming/PredicateName
     has_role?(:admin) || has_role?(:admin, Site.instance)
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_superadmin
+    # rubocop:enable Naming/PredicateName
     has_role? :superadmin
   end
 
diff --git a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
index a3368e897..277f902a8 100644
--- a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
+++ b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
@@ -45,13 +45,13 @@ def video_display_content(_url, label = '')
         IIIFManifest::V3::DisplayContent.new(
           Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
             solr_document.id,
-            label: label,
+            label:,
             host: request.base_url
           ),
-          label: label,
-          width: width,
-          height: height,
-          duration: duration,
+          label:,
+          width:,
+          height:,
+          duration:,
           type: 'Video',
           format: solr_document.mime_type
         )
@@ -63,11 +63,11 @@ def audio_display_content(_url, label = '')
         IIIFManifest::V3::DisplayContent.new(
           Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
             solr_document.id,
-            label: label,
+            label:,
             host: request.base_url
           ),
-          label: label,
-          duration: duration,
+          label:,
+          duration:,
           type: 'Sound',
           format: solr_document.mime_type
         )
diff --git a/app/presenters/hyku/collapsable_section_presenter.rb b/app/presenters/hyku/collapsable_section_presenter.rb
index da0c2b100..cb07fb30e 100644
--- a/app/presenters/hyku/collapsable_section_presenter.rb
+++ b/app/presenters/hyku/collapsable_section_presenter.rb
@@ -7,7 +7,7 @@ class CollapsableSectionPresenter < Hyrax::CollapsableSectionPresenter
     # rubocop:disable Metrics/ParameterLists
     def initialize(view_context:, text:, id:, icon_class:, open:, html_options: {})
       # rubocop:enable Metrics/ParameterLists
-      super(view_context: view_context, text: text, id: id, icon_class: icon_class, open: open)
+      super(view_context:, text:, id:, icon_class:, open:)
       @html_options = html_options
     end
 
diff --git a/app/presenters/hyku/menu_presenter.rb b/app/presenters/hyku/menu_presenter.rb
index 7ed0c9e8f..fb5f64915 100644
--- a/app/presenters/hyku/menu_presenter.rb
+++ b/app/presenters/hyku/menu_presenter.rb
@@ -54,12 +54,12 @@ def show_task?
     # rubocop:disable Metrics/ParameterLists
     def collapsable_section(text, id:, icon_class:, open:, **html_options, &block)
       # rubocop:enable Metrics/ParameterLists
-      CollapsableSectionPresenter.new(view_context: view_context,
-                                      text: text,
-                                      id: id,
-                                      icon_class: icon_class,
-                                      open: open,
-                                      html_options: html_options).render(&block)
+      CollapsableSectionPresenter.new(view_context:,
+                                      text:,
+                                      id:,
+                                      icon_class:,
+                                      open:,
+                                      html_options:).render(&block)
     end
   end
 end
diff --git a/app/presenters/hyku/work_show_presenter.rb b/app/presenters/hyku/work_show_presenter.rb
index a734a52fb..857f7932e 100644
--- a/app/presenters/hyku/work_show_presenter.rb
+++ b/app/presenters/hyku/work_show_presenter.rb
@@ -72,7 +72,7 @@ def iiif_media?(presenter: representative_presenter)
 
     def members_include_viewable?
       file_set_presenters.any? do |presenter|
-        iiif_media?(presenter: presenter) && current_ability.can?(:read, presenter.id)
+        iiif_media?(presenter:) && current_ability.can?(:read, presenter.id)
       end
     end
 
diff --git a/app/presenters/hyrax/collection_presenter_decorator.rb b/app/presenters/hyrax/collection_presenter_decorator.rb
index 3c27b7c4e..ba04cadd2 100644
--- a/app/presenters/hyrax/collection_presenter_decorator.rb
+++ b/app/presenters/hyrax/collection_presenter_decorator.rb
@@ -79,7 +79,7 @@ def banner_file
         filename = File.split(banner_info.first.local_path).last unless banner_info.empty?
         alttext = banner_info.first.alt_text unless banner_info.empty?
         relative_path = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
-        { filename: filename, relative_path: relative_path, alt_text: alttext }
+        { filename:, relative_path:, alt_text: alttext }
       end
     end
 
diff --git a/app/presenters/hyrax/homepage_presenter_decorator.rb b/app/presenters/hyrax/homepage_presenter_decorator.rb
index d75740a20..15b52204e 100644
--- a/app/presenters/hyrax/homepage_presenter_decorator.rb
+++ b/app/presenters/hyrax/homepage_presenter_decorator.rb
@@ -1,4 +1,4 @@
-# # frozen_string_literal: true
+# frozen_string_literal: true
 
 # OVERRIDE Hyrax 5.0 to hide features via flipper
 # hide featured researcher
diff --git a/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb b/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb
index c34dbb167..faf5729f1 100644
--- a/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb
+++ b/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb
@@ -30,7 +30,7 @@ def manifest_url
       return '' if id.blank?
 
       protocol = Site.account.ssl_configured ? 'https' : 'http'
-      Rails.application.routes.url_helpers.polymorphic_url([:manifest, model], host: hostname, protocol: protocol)
+      Rails.application.routes.url_helpers.polymorphic_url([:manifest, model], host: hostname, protocol:)
     end
 
     def iiif_version
diff --git a/app/services/create_account.rb b/app/services/create_account.rb
index d756c17dc..536c2f595 100644
--- a/app/services/create_account.rb
+++ b/app/services/create_account.rb
@@ -57,7 +57,7 @@ def fillin_translations
       oldtitle = c.title
       c.title = I18n.t(c.title.gsub("translation missing: en.", ''))
       c.save
-      Rails.logger.debug "#{oldtitle} changed to #{c.title}"
+      Rails.logger.debug { "#{oldtitle} changed to #{c.title}" }
     end
   end
 
@@ -88,6 +88,6 @@ def schedule_recurring_jobs
   private
 
   def initialize_account_data
-    Site.update(account: account)
+    Site.update(account:)
   end
 end
diff --git a/app/services/hyrax/admin_set_create_service_decorator.rb b/app/services/hyrax/admin_set_create_service_decorator.rb
index 631681a0c..8670b22eb 100644
--- a/app/services/hyrax/admin_set_create_service_decorator.rb
+++ b/app/services/hyrax/admin_set_create_service_decorator.rb
@@ -16,8 +16,8 @@ def create!
           ActiveRecord::Base.transaction do
             permission_template = PermissionTemplate.find_by(source_id: result.id.to_s) ||
                                   permissions_create_service.create_default(collection: result,
-                                                                            creating_user: creating_user)
-            create_workflows_for(permission_template: permission_template)
+                                                                            creating_user:)
+            create_workflows_for(permission_template:)
             # OVERRIDE: Remove call to #create_default_access_for, which granted
             # deposit access to all registered users for the Default Admin Set
           end
@@ -38,12 +38,12 @@ def workflow_agents
     end
 
     def create_workflows_for(permission_template:)
-      workflow_importer.call(permission_template: permission_template)
+      workflow_importer.call(permission_template:)
       # OVERRIDE: Extract and expand upon granting Workflow Roles into service object so it can be used in RolesService
       Hyrax::Workflow::PermissionGrantor
-        .grant_default_workflow_roles!(permission_template: permission_template, creating_user: creating_user)
+        .grant_default_workflow_roles!(permission_template:, creating_user:)
       Sipity::Workflow
-        .activate!(permission_template: permission_template, workflow_name: Hyrax.config.default_active_workflow_name)
+        .activate!(permission_template:, workflow_name: Hyrax.config.default_active_workflow_name)
     end
   end
 end
diff --git a/app/services/hyrax/collection_types/create_service.rb b/app/services/hyrax/collection_types/create_service.rb
index 16955ac6a..38950d7df 100644
--- a/app/services/hyrax/collection_types/create_service.rb
+++ b/app/services/hyrax/collection_types/create_service.rb
@@ -167,7 +167,7 @@ class CreateService # rubocop:disable Metrics/ClassLength
       # @return [Hyrax::CollectionType] the newly created collection type instance
       def self.create_collection_type(machine_id:, title:, options: {})
         opts = DEFAULT_OPTIONS.merge(options).except(:participants)
-        ct = Hyrax::CollectionType.create!(opts.merge(machine_id: machine_id, title: title))
+        ct = Hyrax::CollectionType.create!(opts.merge(machine_id:, title:))
         participants = options[:participants].presence || DEFAULT_OPTIONS[:participants]
         add_participants(ct.id, participants)
         ct
diff --git a/app/services/hyrax/collections/permissions_create_service_decorator.rb b/app/services/hyrax/collections/permissions_create_service_decorator.rb
index 9324f41e7..3f6606761 100644
--- a/app/services/hyrax/collections/permissions_create_service_decorator.rb
+++ b/app/services/hyrax/collections/permissions_create_service_decorator.rb
@@ -58,9 +58,11 @@ def access_grants_attributes(collection_type:, creating_user:, grants:)
               access: Hyrax::PermissionTemplateAccess::VIEW
             }
           end
+          # rubocop:disable Lint/Void
           attribute_list
+          # rubocop:enable Lint/Void
           # OVERRIDE END
-        end + managers_of_collection_type(collection_type: collection_type) + grants
+        end + managers_of_collection_type(collection_type:) + grants
       end
       private :access_grants_attributes
     end
diff --git a/app/services/hyrax/collections/permissions_service_decorator.rb b/app/services/hyrax/collections/permissions_service_decorator.rb
index 7a021dd2f..60a29773e 100644
--- a/app/services/hyrax/collections/permissions_service_decorator.rb
+++ b/app/services/hyrax/collections/permissions_service_decorator.rb
@@ -12,7 +12,7 @@ module PermissionsServiceDecorator
       # to have a whole method JUST for that... maybe make #manage_access_to_collection
       # public or use #send to call the private method directly?
       def can_manage_collection?(collection_id:, ability:)
-        manage_access_to_collection?(collection_id: collection_id, ability: ability)
+        manage_access_to_collection?(collection_id:, ability:)
       end
     end
   end
diff --git a/app/services/hyrax/workflow/permission_grantor.rb b/app/services/hyrax/workflow/permission_grantor.rb
index 1efc530eb..91bb2c362 100644
--- a/app/services/hyrax/workflow/permission_grantor.rb
+++ b/app/services/hyrax/workflow/permission_grantor.rb
@@ -12,7 +12,7 @@ module Workflow
     # @see RolesService
     class PermissionGrantor
       def self.grant_default_workflow_roles!(permission_template:, creating_user: nil)
-        new(permission_template: permission_template, creating_user: creating_user).call
+        new(permission_template:, creating_user:).call
       end
 
       attr_accessor :permission_template, :creating_user
@@ -54,7 +54,7 @@ def grant_all_workflow_roles_to_creating_user_and_admins!
           end
         end
 
-        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: nil)
+        grant_workflow_roles!(workflow_agents:, role_filters: nil)
       end
 
       def grant_workflow_roles_to_editors!
@@ -65,7 +65,7 @@ def grant_workflow_roles_to_editors!
           end
         end
 
-        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: editor_sipity_roles)
+        grant_workflow_roles!(workflow_agents:, role_filters: editor_sipity_roles)
       end
 
       def grant_workflow_roles_to_depositors!
@@ -76,7 +76,7 @@ def grant_workflow_roles_to_depositors!
           end
         end
 
-        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: depositor_sipity_role)
+        grant_workflow_roles!(workflow_agents:, role_filters: depositor_sipity_role)
       end
 
       def grant_workflow_roles!(workflow_agents:, role_filters:)
@@ -89,7 +89,7 @@ def grant_workflow_roles!(workflow_agents:, role_filters:)
         permission_template.available_workflows.each do |workflow|
           role_set.each do |role|
             Hyrax::Workflow::PermissionGenerator.call(roles: role,
-                                                      workflow: workflow,
+                                                      workflow:,
                                                       agents: workflow_agents)
           end
         end
diff --git a/app/services/hyrax/workflow/permission_query.rb b/app/services/hyrax/workflow/permission_query.rb
index 6673c46b7..e214fd978 100644
--- a/app/services/hyrax/workflow/permission_query.rb
+++ b/app/services/hyrax/workflow/permission_query.rb
@@ -53,8 +53,8 @@ def workflow_roles
       # @param entity [Object] an object that can be converted into a Sipity::Entity
       # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
       def scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
-        workflow_actions_scope = scope_workflow_actions_available_for_current_state(entity: entity)
-        workflow_state_actions_scope = scope_permitted_entity_workflow_state_actions(user: user, entity: entity)
+        workflow_actions_scope = scope_workflow_actions_available_for_current_state(entity:)
+        workflow_state_actions_scope = scope_permitted_entity_workflow_state_actions(user:, entity:)
         workflow_actions_scope.where(
           workflow_actions_scope.arel_table[:id].in(
             workflow_state_actions_scope.arel_table.project(
@@ -157,7 +157,7 @@ def scope_roles_associated_with_the_given_entity(entity:)
       # @return [Boolean]
       def authorized_for_processing?(user:, entity:, action:)
         action_name = Sipity::WorkflowAction.name_for(action)
-        scope_permitted_workflow_actions_available_for_current_state(user: user, entity: entity)
+        scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
           .find_by(Sipity::WorkflowAction.arel_table[:name].eq(action_name)).present?
       end
 
@@ -202,7 +202,7 @@ def scope_entities_for_the_user(user:) # rubocop:disable Metrics/AbcSize, Metric
         workflow_states = Sipity::WorkflowState.arel_table
         workflow_state_action_permissions = Sipity::WorkflowStateActionPermission.arel_table
 
-        user_agent_scope = scope_processing_agents_for(user: user)
+        user_agent_scope = scope_processing_agents_for(user:)
         user_agent_contraints = user_agent_scope.arel_table.project(
           user_agent_scope.arel_table[:id]
         ).where(user_agent_scope.arel.constraints)
@@ -290,7 +290,7 @@ def scope_users_for_entity_and_roles(entity:, roles:) # rubocop:disable Metrics/
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def user_emails_for_entity_and_roles(entity:, roles:)
-        scope_users_for_entity_and_roles(entity: entity, roles: roles).pluck(:email)
+        scope_users_for_entity_and_roles(entity:, roles:).pluck(:email)
       end
 
       # @api public
@@ -304,9 +304,9 @@ def user_emails_for_entity_and_roles(entity:, roles:)
       # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
       def scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
         entity = Sipity::Entity(entity)
-        workflow_scope = scope_processing_workflow_roles_for_user_and_workflow(user: user, workflow: entity.workflow)
+        workflow_scope = scope_processing_workflow_roles_for_user_and_workflow(user:, workflow: entity.workflow)
 
-        entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user: user, entity: entity)
+        entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:)
         Sipity::WorkflowRole.where(
           workflow_scope.arel.constraints.reduce.or(entity_specific_scope.arel.constraints.reduce)
         )
@@ -322,7 +322,7 @@ def scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
       # @param workflow [Sipity::Workflow]
       # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
       def scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
-        agent_constraints = scope_processing_agents_for(user: user)
+        agent_constraints = scope_processing_agents_for(user:)
         workflow_role_subquery = workflow_roles[:id].in(
           workflow_responsibilities.project(workflow_responsibilities[:workflow_role_id])
           .where(
@@ -349,7 +349,7 @@ def scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
       # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
       def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:) # rubocop:disable Metrics/MethodLength
         entity = Sipity::Entity(entity)
-        agent_scope = scope_processing_agents_for(user: user)
+        agent_scope = scope_processing_agents_for(user:)
 
         Sipity::WorkflowRole.where(
           workflow_roles[:id].in(
@@ -391,7 +391,7 @@ def scope_permitted_entity_workflow_state_actions(user:, entity:) # rubocop:disa
         entity = Sipity::Entity(entity)
         workflow_state_actions = Sipity::WorkflowStateAction
         permissions = Sipity::WorkflowStateActionPermission
-        role_scope = scope_processing_workflow_roles_for_user_and_entity(user: user, entity: entity)
+        role_scope = scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
 
         workflow_state_actions.where(
           workflow_state_actions.arel_table[:originating_workflow_state_id].eq(entity.workflow_state_id).and(
@@ -443,7 +443,7 @@ def scope_workflow_actions_for_current_state(entity:)
       # @param entity an object that can be converted into a Sipity::Entity
       # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
       def scope_workflow_actions_available_for_current_state(entity:)
-        workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity: entity)
+        workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity:)
         Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce)
       end
     end
diff --git a/app/services/roles_service.rb b/app/services/roles_service.rb
index 49c670aa0..fc8965229 100644
--- a/app/services/roles_service.rb
+++ b/app/services/roles_service.rb
@@ -71,7 +71,7 @@ def create_default_roles!
       return '`AccountElevator.switch!` into an Account before creating default Roles' if Site.instance.is_a?(NilSite)
 
       DEFAULT_ROLES.each do |role_name|
-        find_or_create_site_role!(role_name: role_name)
+        find_or_create_site_role!(role_name:)
       end
     end
 
@@ -90,7 +90,7 @@ def create_default_hyrax_groups_with_roles!
         group_roles.each do |role_name|
           next if role_name.blank?
 
-          group.roles |= [find_or_create_site_role!(role_name: role_name)]
+          group.roles |= [find_or_create_site_role!(role_name:)]
         end
       end
     end
@@ -241,7 +241,7 @@ def prune_stale_guest_users
       stale_guest_users = User.unscoped.where(
         'guest = ? and updated_at < ?',
         true,
-        Time.current - 7.days
+        7.days.ago
       )
       progress = ProgressBar.create(total: stale_guest_users.count)
 
@@ -253,8 +253,9 @@ def prune_stale_guest_users
 
     # rubocop:disable Metrics/MethodLength
     def seed_superadmin!
+      # rubocop:disable Rails/UnknownEnv
       return 'Seed data should not be used in the production environment' if Rails.env.production? || Rails.env.staging?
-
+      # rubocop:enable Rails/UnknownEnv
       user = User.where(email: 'admin@example.com').first_or_initialize do |u|
         if u.new_record?
           u.password = 'testing123'
@@ -279,8 +280,9 @@ def seed_superadmin!
 
     # rubocop:disable Metrics/MethodLength
     def seed_qa_users!
+      # rubocop:disable Rails/UnknownEnv
       return 'Seed data should not be used in the production environment' if Rails.env.production? || Rails.env.staging?
-
+      # rubocop:disable Rails/UnknownEnv
       ActiveRecord::Base.transaction do
         DEFAULT_ROLES.each do |role_name|
           user = User.where(email: "#{role_name}@example.com").first_or_initialize do |u|
@@ -297,7 +299,7 @@ def seed_qa_users!
 
             unless user.has_role?(role_name, Site.instance)
               user.add_default_group_membership!
-              user.roles << find_or_create_site_role!(role_name: role_name)
+              user.roles << find_or_create_site_role!(role_name:)
             end
           end
 
diff --git a/bin/graph b/bin/graph
index 939279f7e..2fb8e9e3a 100644
--- a/bin/graph
+++ b/bin/graph
@@ -53,7 +53,7 @@ class GraphWriter
   end
 
   def write_edge(initial, terminal, label)
-    graph.add_edges(nodes[initial], nodes[terminal], label: label)
+    graph.add_edges(nodes[initial], nodes[terminal], label:)
   end
 
   def attach_edges
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index e294580f0..9dec7f411 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -51,7 +51,7 @@
     # Therefore cannot be used as effectively as ActiveRecord hooks.
     Apartment::Tenant.adapter.class.set_callback :switch, :after, lambda {
       account = Account.find_by(tenant: current)
-      account.switch! if account
+      account&.switch!
     }
   end
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index eb1ed09f6..a7cd551c8 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -301,10 +301,10 @@
 
   [:cas, :openid_connect, :saml].each do |provider|
     path_prefix = "/users/auth/#{provider}"
-    handler = OmniAuth::MultiProvider::Handler.new(path_prefix: path_prefix,
-                                                   identity_provider_id_regex: identity_provider_id_regex,
+    handler = OmniAuth::MultiProvider::Handler.new(path_prefix:,
+                                                   identity_provider_id_regex:,
       &dynamic_options_generator)
-    static_options = { path_prefix: path_prefix }
+    static_options = { path_prefix: }
 
     config.omniauth provider, static_options.merge(handler.provider_options)
   end
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index f8eced815..04954e5e1 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -119,7 +119,7 @@
     if Site.account&.s3_bucket
       "uploads/#{Apartment::Tenant.current}"
     else
-      ENV['HYRAX_UPLOAD_PATH'].present? ? Pathname.new(File.join(ENV['HYRAX_UPLOAD_PATH'], Apartment::Tenant.current)) : Rails.root.join('public', 'uploads', Apartment::Tenant.current)
+      ENV['HYRAX_UPLOAD_PATH'].present? ? Pathname.new(File.join(ENV['HYRAX_UPLOAD_PATH'], Apartment::Tenant.current)) : Rails.public_path.join('uploads', Apartment::Tenant.current)
     end
   }
 
@@ -178,7 +178,7 @@
     # Issue with Hyrax v 2.9.0 where IIIF has mixed content error when running with SSL enabled
     # See Samvera Slack thread https://samvera.slack.com/archives/C0F9JQJDQ/p1596718417351200?thread_ts=1596717896.350700&cid=C0F9JQJDQ
     base_url = base_url.sub(/\Ahttp:/, 'https:')
-    Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size: size)
+    Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size:)
   end
 
   config.iiif_info_url_builder = lambda do |file_id, base_url|
diff --git a/config/routes.rb b/config/routes.rb
index cf42c9caa..1de3009e6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,10 +62,7 @@
         as: "user_#{provider}_omniauth_authorize",
         via: OmniAuth.config.allowed_request_methods
 
-      match "#{path_prefix}/#{provider}/:id/metadata",
-        to: "users/omniauth_callbacks#passthru",
-        as: "user_#{provider}_omniauth_metadata",
-        via: [:get]
+      get "#{path_prefix}/#{provider}/:id/metadata", to: "users/omniauth_callbacks#passthru", as: "user_#{provider}_omniauth_metadata"
 
       match "#{path_prefix}/#{provider}/:id/callback",
         to: "users/omniauth_callbacks##{provider}",
diff --git a/lib/importer/factory/collection_factory.rb b/lib/importer/factory/collection_factory.rb
index 9580c555a..d3c8ebf33 100644
--- a/lib/importer/factory/collection_factory.rb
+++ b/lib/importer/factory/collection_factory.rb
@@ -14,7 +14,7 @@ def find_or_create
 
       def update
         raise "Collection doesn't exist" unless object
-        object.attributes = update_attributes
+        object.attributes = update
         run_callbacks(:save) do
           object.save!
         end
diff --git a/lib/importer/factory/object_factory.rb b/lib/importer/factory/object_factory.rb
index 1a1bbab92..aae8c1b3f 100644
--- a/lib/importer/factory/object_factory.rb
+++ b/lib/importer/factory/object_factory.rb
@@ -17,7 +17,7 @@ def initialize(attributes, files_dir = nil, files = [])
       end
 
       def run
-        arg_hash = { id: attributes[:id], name: 'UPDATE', klass: klass }
+        arg_hash = { id: attributes[:id], name: 'UPDATE', klass: }
         @object = find
         if @object
           ActiveSupport::Notifications.instrument('import.importer', arg_hash) { update }
@@ -31,14 +31,14 @@ def run
       def update
         raise "Object doesn't exist" unless object
         run_callbacks(:save) do
-          work_actor.update(environment(update_attributes))
+          work_actor.update(environment(update))
         end
         log_updated(object)
       end
 
       def create_attributes
         if klass == Collection
-          { collection_type: collection_type }.merge(transform_attributes)
+          { collection_type: }.merge(transform_attributes)
         else
           transform_attributes
         end
diff --git a/lib/importer/mods_parser.rb b/lib/importer/mods_parser.rb
index 34c62cccb..a3013d6ce 100644
--- a/lib/importer/mods_parser.rb
+++ b/lib/importer/mods_parser.rb
@@ -52,7 +52,7 @@ def attributes
     end
 
     def record_attributes
-      common_attributes.merge(collection: collection, series_name: series_name)
+      common_attributes.merge(collection:, series_name:)
                        .merge(files)
     end
 
@@ -85,16 +85,16 @@ def description
         title: untyped_title,
         alternative: alt_title,
         description: mods_description,
-        subject: subject,
+        subject:,
         extent: mods.physical_description.extent.map { |node| strip_whitespace(node.text) },
-        language: language,
+        language:,
         digital_origin: mods.physical_description.digitalOrigin.map(&:text),
         publisher: mods.origin_info.publisher.map(&:text),
         form_of_work: mods.genre.valueURI.map { |uri| RDF::URI.new(uri) },
-        resource_type: resource_type,
-        citation: citation,
+        resource_type:,
+        citation:,
         notes_attributes: notes,
-        record_origin: record_origin,
+        record_origin:,
         description_standard: mods.record_info.descriptionStandard.map(&:text)
       }
     end
@@ -123,7 +123,7 @@ def rights
     def locations
       {
         location: mods.subject.geographic.valueURI.map { |uri| RDF::URI.new(uri) },
-        sub_location: sub_location,
+        sub_location:,
         institution: institutional_location,
         place_of_publication: mods.origin_info.place.placeTerm.map(&:text)
       }.merge(coordinates)
diff --git a/lib/oai/provider/metadata_format/hyku_dublin_core.rb b/lib/oai/provider/metadata_format/hyku_dublin_core.rb
index e6a996397..02998e3c3 100644
--- a/lib/oai/provider/metadata_format/hyku_dublin_core.rb
+++ b/lib/oai/provider/metadata_format/hyku_dublin_core.rb
@@ -4,7 +4,9 @@ module OAI
   module Provider
     module MetadataFormat
       class HykuDublinCore < OAI::Provider::Metadata::Format
+        # rubocop:disable Lint/MissingSuper
         def initialize
+          # rubocop:enable Lint/MissingSuper
           @prefix = 'oai_hyku'
           @schema = 'http://dublincore.org/schemas/xmls/qdc/dcterms.xsd'
           @namespace = 'http://purl.org/dc/terms/'
diff --git a/lib/stanford/importer/mods_parser.rb b/lib/stanford/importer/mods_parser.rb
index 7d61b74de..d8ccff486 100644
--- a/lib/stanford/importer/mods_parser.rb
+++ b/lib/stanford/importer/mods_parser.rb
@@ -32,7 +32,7 @@ def collection_id
 
       def identifier
         id = File.basename(filename, '.mods').sub(/\Adruid_/, '')
-        { identifier: Array.wrap(id), id: id }
+        { identifier: Array.wrap(id), id: }
       end
 
       def open_access
diff --git a/lib/stanford/importer/purl_parser.rb b/lib/stanford/importer/purl_parser.rb
index 314b32dcf..b3e42511a 100644
--- a/lib/stanford/importer/purl_parser.rb
+++ b/lib/stanford/importer/purl_parser.rb
@@ -49,7 +49,7 @@ def attributes
       end
 
       def record_attributes
-        common_attributes.merge(collection: collection)
+        common_attributes.merge(collection:)
                          .merge(files)
       end
 
@@ -67,7 +67,7 @@ def common_attributes
           .merge(dates)
           .merge(locations)
           .merge(rights)
-          .merge(visibility: visibility)
+          .merge(visibility:)
           .merge(identifiers)
           .merge(relations)
       end
@@ -76,11 +76,11 @@ def description
         {
           title: untyped_title,
           description: dc_description,
-          subject: subject,
-          language: language,
+          subject:,
+          language:,
           form_of_work: oai.xpath('./dc:format', DC_NS).map(&:text),
-          resource_type: resource_type,
-          record_origin: record_origin
+          resource_type:,
+          record_origin:
         }
       end
 
diff --git a/lib/tasks/rubocop.rake b/lib/tasks/rubocop.rake
index 86de3ac8d..23ce113db 100644
--- a/lib/tasks/rubocop.rake
+++ b/lib/tasks/rubocop.rake
@@ -7,5 +7,7 @@ begin
     task.requires << 'rubocop-rspec'
     task.fail_on_error = true
   end
+# rubocop:disable Lint/SuppressedException
 rescue LoadError
+  # rubocop: enable Lint/SuppressedException
 end
diff --git a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
index d54534924..03c4dc724 100644
--- a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
+++ b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
@@ -16,7 +16,7 @@ module FindIdsByModelDecorator
       #
       # @return [Enumerable<Valkyrie::ID>]
       def find_ids_by_model(model:, ids: :all) # rubocop:disable Metrics/MethodLength
-        return enum_for(:find_ids_by_model, model: model, ids: ids) unless block_given?
+        return enum_for(:find_ids_by_model, model:, ids:) unless block_given?
         model_name = ModelRegistry.lookup(model).model_name
 
         solr_query = "_query_:\"{!raw f=has_model_ssim}#{model_name}\""
diff --git a/spec/abilities/collection_ability_spec.rb b/spec/abilities/collection_ability_spec.rb
index 5035e5a8a..17b70f9a5 100644
--- a/spec/abilities/collection_ability_spec.rb
+++ b/spec/abilities/collection_ability_spec.rb
@@ -21,7 +21,7 @@
         :collection_lw,
         id: 'col_au',
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -54,7 +54,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -139,7 +139,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -226,7 +226,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -311,7 +311,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -356,7 +356,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -403,7 +403,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -451,7 +451,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
diff --git a/spec/abilities/solr_document_ability_spec.rb b/spec/abilities/solr_document_ability_spec.rb
index ba5ba2033..529539b80 100644
--- a/spec/abilities/solr_document_ability_spec.rb
+++ b/spec/abilities/solr_document_ability_spec.rb
@@ -19,7 +19,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
     let!(:solr_document) { SolrDocument.new(collection.to_solr) }
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 158c2decc..904e1ed9a 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -23,7 +23,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
     end
 
     describe "GET #edit" do
diff --git a/spec/controllers/hyrax/generic_works_controller_spec.rb b/spec/controllers/hyrax/generic_works_controller_spec.rb
index 65d075285..8f152e8e4 100644
--- a/spec/controllers/hyrax/generic_works_controller_spec.rb
+++ b/spec/controllers/hyrax/generic_works_controller_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe Hyrax::GenericWorksController do
   let(:user) { FactoryBot.create(:user) }
-  let(:work) { FactoryBot.create(:work_with_one_file, user: user) }
+  let(:work) { FactoryBot.create(:work_with_one_file, user:) }
   let(:file_set) { work.ordered_members.to_a.first }
 
   before do
diff --git a/spec/controllers/hyrax/homepage_controller_spec.rb b/spec/controllers/hyrax/homepage_controller_spec.rb
index 06a1110e0..82cc45800 100644
--- a/spec/controllers/hyrax/homepage_controller_spec.rb
+++ b/spec/controllers/hyrax/homepage_controller_spec.rb
@@ -86,7 +86,7 @@
       it "initializes the presenter with ability and a list of collections" do
         expect(Hyrax::HomepagePresenter).to receive(:new)
                                         .with(controller.current_ability, ["collection results"])
-                                        .and_return(presenter)
+          .and_return(presenter)
         get :index
         expect(response).to be_successful
         expect(assigns(:presenter)).to eq presenter
@@ -94,7 +94,7 @@
     end
 
     context "with featured works" do
-      let!(:my_work) { create(:work, user: user) }
+      let!(:my_work) { create(:work, user:) }
 
       before do
         FeaturedWork.create!(work_id: my_work.id)
@@ -150,7 +150,7 @@
           allow(controller).to receive(:home_page_theme).and_return('institutional_repository')
         end
         # rubocop:disable RSpec/LetSetup
-        let!(:work_with_resource_type) { create(:work, user: user, resource_type: ['Article']) }
+        let!(:work_with_resource_type) { create(:work, user:, resource_type: ['Article']) }
 
         # rubocop:enable RSpec/LetSetup
 
diff --git a/spec/controllers/hyrax/images_controller_spec.rb b/spec/controllers/hyrax/images_controller_spec.rb
index 06b48c7c4..3bad75c9c 100644
--- a/spec/controllers/hyrax/images_controller_spec.rb
+++ b/spec/controllers/hyrax/images_controller_spec.rb
@@ -7,7 +7,7 @@
 
 RSpec.describe Hyrax::ImagesController do
   let(:user) { FactoryBot.create(:user) }
-  let(:work) { FactoryBot.create(:work_with_one_file, user: user) }
+  let(:work) { FactoryBot.create(:work_with_one_file, user:) }
   let(:file_set) { work.ordered_members.to_a.first }
 
   before do
diff --git a/spec/controllers/proprietor/accounts_controller_spec.rb b/spec/controllers/proprietor/accounts_controller_spec.rb
index 93bd83e8f..360d495a0 100644
--- a/spec/controllers/proprietor/accounts_controller_spec.rb
+++ b/spec/controllers/proprietor/accounts_controller_spec.rb
@@ -48,7 +48,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
     end
 
     describe "GET #index" do
@@ -184,7 +184,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
       allow(controller).to receive(:current_account).and_return(account)
     end
 
diff --git a/spec/controllers/proprietor/users_controller_spec.rb b/spec/controllers/proprietor/users_controller_spec.rb
index e6fce5a2d..a961f20aa 100644
--- a/spec/controllers/proprietor/users_controller_spec.rb
+++ b/spec/controllers/proprietor/users_controller_spec.rb
@@ -39,7 +39,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
     end
 
     describe "GET #index" do
diff --git a/spec/factories/accounts.rb b/spec/factories/accounts.rb
index 9519a3d7d..6bb6379a1 100644
--- a/spec/factories/accounts.rb
+++ b/spec/factories/accounts.rb
@@ -40,7 +40,7 @@
       domain_names_count { 1 }
     end
     after(:create) do |account, evaluator|
-      create_list(:domain_name, evaluator.domain_names_count, account: account)
+      create_list(:domain_name, evaluator.domain_names_count, account:)
     end
 
     trait(:public_schema) do
@@ -62,7 +62,7 @@
       domain_names_count { 1 }
     end
     after(:create) do |account, evaluator|
-      create_list(:domain_name, evaluator.domain_names_count, account: account)
+      create_list(:domain_name, evaluator.domain_names_count, account:)
     end
   end
 end
diff --git a/spec/factories/permission_templates.rb b/spec/factories/permission_templates.rb
index 6d02a4312..127f1376a 100644
--- a/spec/factories/permission_templates.rb
+++ b/spec/factories/permission_templates.rb
@@ -39,15 +39,15 @@
 
     after(:create) do |permission_template, evaluator|
       if evaluator.with_workflows
-        Hyrax::Workflow::WorkflowImporter.load_workflow_for(permission_template: permission_template)
+        Hyrax::Workflow::WorkflowImporter.load_workflow_for(permission_template:)
         Sipity::Workflow.activate!(
-          permission_template: permission_template,
-          workflow_id: permission_template.available_workflows.pluck(:id).first
+          permission_template:,
+          workflow_id: permission_template.available_workflows.pick(:id)
         )
       end
       if evaluator.with_active_workflow
-        workflow = create(:workflow, active: true, permission_template: permission_template)
-        create(:workflow_action, workflow: workflow) # Need to create a single action that can be taken
+        workflow = create(:workflow, active: true, permission_template:)
+        create(:workflow_action, workflow:) # Need to create a single action that can be taken
       end
       AccessHelper.create_access(permission_template, 'user', :manage, evaluator.manage_users) if evaluator.manage_users.present?
       AccessHelper.create_access(permission_template, 'group', :manage, evaluator.manage_groups) if evaluator.manage_groups.present?
@@ -77,8 +77,8 @@ def self.create_access(permission_template_id, agent_type, access, agent_ids)
         FactoryBot.create(:permission_template_access,
                           access,
                           permission_template: permission_template_id,
-                          agent_type: agent_type,
-                          agent_id: agent_id)
+                          agent_type:,
+                          agent_id:)
       end
     end
   end
diff --git a/spec/features/admin_set_form_participants_tab_spec.rb b/spec/features/admin_set_form_participants_tab_spec.rb
index 13bea005e..b65f3f5cb 100644
--- a/spec/features/admin_set_form_participants_tab_spec.rb
+++ b/spec/features/admin_set_form_participants_tab_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
 
       login_as admin
diff --git a/spec/features/appearance_theme_spec.rb b/spec/features/appearance_theme_spec.rb
index 2abccdd6b..6495d6b4a 100644
--- a/spec/features/appearance_theme_spec.rb
+++ b/spec/features/appearance_theme_spec.rb
@@ -12,7 +12,7 @@
     create(:generic_work,
            title: ['Llamas and Alpacas'],
            keyword: ['llama', 'alpaca'],
-           user: user)
+           user:)
   end
 
   # rubocop:enable RSpec/LetSetup
diff --git a/spec/features/assign_workflow_to_group_spec.rb b/spec/features/assign_workflow_to_group_spec.rb
index e6d791630..0ea86069f 100644
--- a/spec/features/assign_workflow_to_group_spec.rb
+++ b/spec/features/assign_workflow_to_group_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
     end
 
diff --git a/spec/features/collection_manager_role_spec.rb b/spec/features/collection_manager_role_spec.rb
index a46118dc7..8f73c6b40 100644
--- a/spec/features/collection_manager_role_spec.rb
+++ b/spec/features/collection_manager_role_spec.rb
@@ -213,7 +213,7 @@
       it 'can add an existing work to a collection' do
         # Make current_user the depositor because the "Add existing works to this collection"
         # button navigates to the My Works index view
-        work = FactoryBot.create(:work, user: user)
+        work = FactoryBot.create(:work, user:)
         expect(collection.member_work_ids).to be_empty
 
         visit "/dashboard/collections/#{collection.id}"
@@ -461,7 +461,7 @@
       it 'can add an existing work to a collection' do
         # Make current_user the depositor because the "Add existing works to this collection"
         # button navigates to the My Works index view
-        work = FactoryBot.create(:work, user: user)
+        work = FactoryBot.create(:work, user:)
         expect(collection.member_work_ids).to be_empty
 
         visit "/dashboard/collections/#{collection.id}"
diff --git a/spec/features/collection_spec.rb b/spec/features/collection_spec.rb
index 93d3a1795..623bd0935 100644
--- a/spec/features/collection_spec.rb
+++ b/spec/features/collection_spec.rb
@@ -4,25 +4,25 @@
 RSpec.describe 'collection', type: :feature, js: true, clean: true do
   let(:user) { create(:user) }
 
-  let(:collection1) { create(:public_collection_lw, user: user) }
-  let(:collection2) { create(:public_collection_lw, user: user) }
+  let(:collection1) { create(:public_collection_lw, user:) }
+  let(:collection2) { create(:public_collection_lw, user:) }
 
   describe 'collection show page' do
     let(:collection) do
       create(
         :public_collection_lw,
-        user: user, description: ['collection description'],
+        user:, description: ['collection description'],
         collection_type_settings: :nestable
       )
     end
-    let!(:work1) { create(:work, title: ["King Louie"], member_of_collections: [collection], user: user) }
-    let!(:work2) { create(:work, title: ["King Kong"], member_of_collections: [collection], user: user) }
+    let!(:work1) { create(:work, title: ["King Louie"], member_of_collections: [collection], user:) }
+    let!(:work2) { create(:work, title: ["King Kong"], member_of_collections: [collection], user:) }
     let!(:col1) do
       create(
         :public_collection_lw,
         title: ["Sub-collection 1"],
         member_of_collections: [collection],
-        user: user
+        user:
       )
     end
     let!(:col2) do
@@ -30,7 +30,7 @@
         :public_collection_lw,
         title: ["Sub-collection 2"],
         member_of_collections: [collection],
-        user: user
+        user:
       )
     end
 
@@ -89,7 +89,7 @@
       let(:collection) do
         build(
           :public_collection_lw,
-          user: user,
+          user:,
           description: ['collection description'],
           collection_type_settings: :not_nestable,
           with_solr_document: true, with_permission_template: true
@@ -119,7 +119,7 @@
 
       login_as user
     end
-    let(:collection) { create(:named_collection_lw, user: user) }
+    let(:collection) { create(:named_collection_lw, user:) }
 
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit "/collections/#{collection.id}"
@@ -141,7 +141,7 @@
 
       login_as user
     end
-    let(:collection) { create(:named_collection_lw, user: user) }
+    let(:collection) { create(:named_collection_lw, user:) }
 
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit "/collections/#{collection.id}"
@@ -262,7 +262,7 @@
 
       before do
         collection.permission_template.access_grants.find_or_create_by!(
-          access: access,
+          access:,
           agent_type: Hyrax::PermissionTemplateAccess::GROUP,
           agent_id: 'admin'
         )
diff --git a/spec/features/create_generic_work_spec.rb b/spec/features/create_generic_work_spec.rb
index 1490a6710..0b730c7ba 100644
--- a/spec/features/create_generic_work_spec.rb
+++ b/spec/features/create_generic_work_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
     end
 
@@ -26,7 +26,7 @@
       create(:editors_group)
       create(:depositors_group)
       # Create a single action that can be taken
-      Sipity::WorkflowAction.create!(name: 'submit', workflow: workflow)
+      Sipity::WorkflowAction.create!(name: 'submit', workflow:)
 
       # Grant the user access to deposit into the admin set.
       Hyrax::PermissionTemplateAccess.create!(
diff --git a/spec/features/create_image_spec.rb b/spec/features/create_image_spec.rb
index 8cd1cf796..7f3d9571d 100644
--- a/spec/features/create_image_spec.rb
+++ b/spec/features/create_image_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
     end
 
@@ -26,7 +26,7 @@
       create(:editors_group)
       create(:depositors_group)
       # Create a single action that can be taken
-      Sipity::WorkflowAction.create!(name: 'submit', workflow: workflow)
+      Sipity::WorkflowAction.create!(name: 'submit', workflow:)
 
       # Grant the user access to deposit into the admin set.
       Hyrax::PermissionTemplateAccess.create!(
diff --git a/spec/features/cultural_repository_theme_spec.rb b/spec/features/cultural_repository_theme_spec.rb
index 95d815545..b006a214a 100644
--- a/spec/features/cultural_repository_theme_spec.rb
+++ b/spec/features/cultural_repository_theme_spec.rb
@@ -12,7 +12,7 @@
     create(:generic_work,
            title: ['Llamas and Alpacas'],
            keyword: ['llama', 'alpaca'],
-           user: user)
+           user:)
   end
 
   # rubocop:enable RSpec/LetSetup
diff --git a/spec/features/featured_collections_spec.rb b/spec/features/featured_collections_spec.rb
index 67c756d82..14a9e61d4 100644
--- a/spec/features/featured_collections_spec.rb
+++ b/spec/features/featured_collections_spec.rb
@@ -5,11 +5,11 @@
 RSpec.describe "The homepage", :clean_repo do
   let(:user) { create(:user).tap { |u| u.add_role(:admin, Site.instance) } }
   let(:account) { create(:account) }
-  let(:collection1) { create(:collection, user: user) }
-  let(:collection2) { create(:collection, user: user) }
+  let(:collection1) { create(:collection, user:) }
+  let(:collection2) { create(:collection, user:) }
 
   before do
-    Site.update(account: account)
+    Site.update(account:)
     create(:featured_collection, collection_id: collection1.id)
   end
 
diff --git a/spec/features/institutional_repository_theme_spec.rb b/spec/features/institutional_repository_theme_spec.rb
index 46521c417..d7ca4673f 100644
--- a/spec/features/institutional_repository_theme_spec.rb
+++ b/spec/features/institutional_repository_theme_spec.rb
@@ -11,7 +11,7 @@
            title: ['Llamas and Alpacas'],
            keyword: ['llama', 'alpaca'],
            resource_type: ['Software or Program Code'],
-           user: user)
+           user:)
   end
 
   context 'as a repository admin' do
diff --git a/spec/features/oai_pmh_spec.rb b/spec/features/oai_pmh_spec.rb
index 1c3ba1d68..140c6dae9 100644
--- a/spec/features/oai_pmh_spec.rb
+++ b/spec/features/oai_pmh_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "OAI PMH Support", type: :feature do
   let(:user) { create(:user) }
-  let(:work) { create(:work, user: user) }
+  let(:work) { create(:work, user:) }
   let(:identifier) { work.id }
 
   before do
@@ -26,7 +26,7 @@
         end
 
         it 'retrieves a single record' do
-          visit oai_catalog_path(verb: 'GetRecord', metadataPrefix: metadata_prefix, identifier: identifier)
+          visit oai_catalog_path(verb: 'GetRecord', metadataPrefix: metadata_prefix, identifier:)
           expect(page).to have_content("hyku:#{identifier}")
           expect(page).to have_content(work.title.first)
         end
diff --git a/spec/features/show_page_theme_spec.rb b/spec/features/show_page_theme_spec.rb
index 2e66de5b3..05afa2755 100644
--- a/spec/features/show_page_theme_spec.rb
+++ b/spec/features/show_page_theme_spec.rb
@@ -10,7 +10,7 @@
     create(:generic_work,
            title: ['Giant Pandas and Red Pandas'],
            keyword: ['panda'],
-           user: user)
+           user:)
   end
 
   let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
@@ -19,7 +19,7 @@
     Sipity::Workflow.create!(
       active: true,
       name: 'test-workflow',
-      permission_template: permission_template
+      permission_template:
     )
   end
 
diff --git a/spec/features/work_approval_permissions_spec.rb b/spec/features/work_approval_permissions_spec.rb
index 73b40d4b2..1a62c7a47 100644
--- a/spec/features/work_approval_permissions_spec.rb
+++ b/spec/features/work_approval_permissions_spec.rb
@@ -14,7 +14,7 @@
   let!(:admin_set) do
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('one_step_mediated_deposit')
     admin_set = AdminSet.new(title: ['Mediated Deposit Admin Set'])
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_creator, admin_set.id, 'open') }
diff --git a/spec/features/work_editor_role_spec.rb b/spec/features/work_editor_role_spec.rb
index 3c8f90979..ac2ffb293 100644
--- a/spec/features/work_editor_role_spec.rb
+++ b/spec/features/work_editor_role_spec.rb
@@ -21,7 +21,7 @@
   let!(:admin_set) do
     admin_set = AdminSet.new(title: ['Test Admin Set'])
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('default')
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_depositor, admin_set.id, visibility) }
diff --git a/spec/forms/hyrax/forms/permission_template_form_spec.rb b/spec/forms/hyrax/forms/permission_template_form_spec.rb
index 45508bdfa..df35f09df 100644
--- a/spec/forms/hyrax/forms/permission_template_form_spec.rb
+++ b/spec/forms/hyrax/forms/permission_template_form_spec.rb
@@ -147,12 +147,12 @@ def count_workflow_responsibilities_for(user)
     before do
       create(:permission_template_access,
              :manage,
-             permission_template: permission_template,
+             permission_template:,
              agent_type: 'user',
              agent_id: user.user_key)
       create(:permission_template_access,
              :manage,
-             permission_template: permission_template,
+             permission_template:,
              agent_type: 'group',
              agent_id: 'archivists')
       create(:group, name: 'archivists')
@@ -165,22 +165,22 @@ def count_workflow_responsibilities_for(user)
                                           access: "manage").permit!]
       end
       let(:workflow) do
-        create(:workflow, permission_template: permission_template)
+        create(:workflow, permission_template:)
       end
 
       before do
         role = Sipity::Role.create(name: 'approving')
-        workflow.workflow_roles.create(role: role)
+        workflow.workflow_roles.create(role:)
         # We are testing that this workflow role is removed
         Hyrax::Workflow::PermissionGenerator.call(roles: role,
-                                                  workflow: workflow,
+                                                  workflow:,
                                                   agents: user3)
         permission_template.update!(active_workflow: workflow)
       end
 
       def count_workflow_roles_for(user)
         Hyrax::Workflow::PermissionQuery
-          .scope_processing_workflow_roles_for_user_and_workflow(user: user, workflow: workflow)
+          .scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
           .size
       end
 
@@ -346,7 +346,7 @@ def count_workflow_roles_for(user)
 
     context "for a workflow change" do
       let(:permission_template) { create(:permission_template, source_id: admin_set.id, with_active_workflow: true) }
-      let(:new_workflow) { create(:workflow, permission_template: permission_template, active: false) }
+      let(:new_workflow) { create(:workflow, permission_template:, active: false) }
       let(:input_params) do
         ActionController::Parameters.new(
           workflow_id: new_workflow.id
@@ -367,7 +367,7 @@ def count_workflow_roles_for(user)
     end
 
     let(:attributes) { { workflow_id: workflow.id } }
-    let(:workflow) { create(:workflow, permission_template: permission_template, active: true) }
+    let(:workflow) { create(:workflow, permission_template:, active: true) }
     let(:user) { create(:user) }
     let(:role1) { Sipity::Role.create!(name: 'hello') }
     let(:role2) { Sipity::Role.create!(name: 'goodbye') }
@@ -417,11 +417,11 @@ def count_workflow_roles_for(user)
       let(:error_code) { nil }
       let(:attributes) do
         {
-          visibility: visibility,
-          release_date: release_date,
-          release_period: release_period,
-          release_varies: release_varies,
-          release_embargo: release_embargo
+          visibility:,
+          release_date:,
+          release_period:,
+          release_varies:,
+          release_embargo:
         }
       end
       let(:ac_params) do
@@ -438,7 +438,7 @@ def count_workflow_roles_for(user)
         let(:response) { form.update(ac_params) }
 
         it 'trigger error from #update' do
-          expect(response).to eq(content_tab: "visibility", updated: false, error_code: error_code)
+          expect(response).to eq(content_tab: "visibility", updated: false, error_code:)
           expect(
             I18n.t(
               response[:error_code],
diff --git a/spec/helpers/shared_search_helper_spec.rb b/spec/helpers/shared_search_helper_spec.rb
index 8cce1cd38..4005572fb 100644
--- a/spec/helpers/shared_search_helper_spec.rb
+++ b/spec/helpers/shared_search_helper_spec.rb
@@ -5,7 +5,7 @@
 
   context "shared search records" do
     let(:cname) { 'hyku-me.test' }
-    let(:account) { build(:search_only_account, cname: cname) }
+    let(:account) { build(:search_only_account, cname:) }
 
     let(:uuid) { SecureRandom.uuid }
     let(:request) { instance_double(ActionDispatch::Request, port: 3000, protocol: "https://", host: account.cname) }
diff --git a/spec/indexers/app_indexer_spec.rb b/spec/indexers/app_indexer_spec.rb
index 9d96ece20..6bab43f46 100644
--- a/spec/indexers/app_indexer_spec.rb
+++ b/spec/indexers/app_indexer_spec.rb
@@ -15,7 +15,7 @@
       end
 
       Apartment::Tenant.switch!(account.tenant) do
-        Site.update(account: account)
+        Site.update(account:)
         work
       end
     end
diff --git a/spec/jobs/import_work_from_purl_job_spec.rb b/spec/jobs/import_work_from_purl_job_spec.rb
index 06c759fba..50b555185 100644
--- a/spec/jobs/import_work_from_purl_job_spec.rb
+++ b/spec/jobs/import_work_from_purl_job_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe ImportWorkFromPurlJob do
   let(:user) { create(:user) }
-  let(:log) { Hyrax::Operation.create!(user: user, operation_type: "Import Purl Metadata") }
+  let(:log) { Hyrax::Operation.create!(user:, operation_type: "Import Purl Metadata") }
   let(:druid) { 'bc390xk2647' }
   before do
     stub_request(:get, "https://purl.stanford.edu/bc390xk2647.xml")
diff --git a/spec/lib/importer/factory/etd_factory_spec.rb b/spec/lib/importer/factory/etd_factory_spec.rb
index ba2c793be..2910697af 100644
--- a/spec/lib/importer/factory/etd_factory_spec.rb
+++ b/spec/lib/importer/factory/etd_factory_spec.rb
@@ -12,7 +12,7 @@
     let(:attributes) do
       {
         collection: { id: coll.id },
-        files: files,
+        files:,
         identifier: ['123'],
         title: ['Test image'],
         read_groups: ['public'],
diff --git a/spec/lib/importer/factory/image_factory_spec.rb b/spec/lib/importer/factory/image_factory_spec.rb
index 31f215d7a..464776554 100644
--- a/spec/lib/importer/factory/image_factory_spec.rb
+++ b/spec/lib/importer/factory/image_factory_spec.rb
@@ -12,7 +12,7 @@
     let(:attributes) do
       {
         collection: { id: coll.id },
-        files: files,
+        files:,
         identifier: ['123'],
         title: ['Test image'],
         read_groups: ['public'],
diff --git a/spec/lib/importer/factory/string_literal_processor_spec.rb b/spec/lib/importer/factory/string_literal_processor_spec.rb
index 51da13381..5bec71bbb 100644
--- a/spec/lib/importer/factory/string_literal_processor_spec.rb
+++ b/spec/lib/importer/factory/string_literal_processor_spec.rb
@@ -7,7 +7,7 @@
 
   let(:input) do
     { title: ["Stanford residences"],
-      contributor: [{ name: name, type: "corporate" }] }
+      contributor: [{ name:, type: "corporate" }] }
   end
 
   context "with a single name" do
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 915081436..4509ac097 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -348,7 +348,7 @@
     let!(:account) { FactoryBot.create(:account, tenant: "59500a46-b1fb-412d-94d6-b928e91ef4d9") }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
       Site.instance.admin_emails = ["test@test.com", "test@test.org"]
     end
 
@@ -362,7 +362,7 @@
     let!(:account) { FactoryBot.create(:account, tenant: "02839e1d-b4a4-451a-ab83-4b8968621f1e") }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
       Site.instance.admin_emails = ["test@test.com", "test@test.org"]
     end
 
diff --git a/spec/models/collection_spec.rb b/spec/models/collection_spec.rb
index c7cc26b21..6ffcd6d21 100644
--- a/spec/models/collection_spec.rb
+++ b/spec/models/collection_spec.rb
@@ -5,10 +5,10 @@
 RSpec.describe Collection do
   let(:user) { create(:user).tap { |u| u.add_role(:admin, Site.instance) } }
   let(:account) { create(:account) }
-  let(:collection) { create(:collection, user: user) }
+  let(:collection) { create(:collection, user:) }
 
   before do
-    Site.update(account: account)
+    Site.update(account:)
   end
 
   it "is a hyrax collection" do
diff --git a/spec/models/fcrepo_endpoint_spec.rb b/spec/models/fcrepo_endpoint_spec.rb
index f20e1f7c3..90ca23032 100644
--- a/spec/models/fcrepo_endpoint_spec.rb
+++ b/spec/models/fcrepo_endpoint_spec.rb
@@ -4,7 +4,7 @@
   let(:base_path) { 'foobar' }
 
   describe '.options' do
-    subject { described_class.new base_path: base_path }
+    subject { described_class.new base_path: }
 
     it 'uses the configured application settings' do
       expect(subject.options[:base_path]).to eq base_path
diff --git a/spec/models/featured_collection_list_spec.rb b/spec/models/featured_collection_list_spec.rb
index cd472fc4f..bc0bc6806 100644
--- a/spec/models/featured_collection_list_spec.rb
+++ b/spec/models/featured_collection_list_spec.rb
@@ -5,12 +5,12 @@
 RSpec.describe FeaturedCollectionList, type: :model do
   let(:user) { create(:user).tap { |u| u.add_role(:admin, Site.instance) } }
   let(:account) { create(:account) }
-  let(:collection1) { create(:collection, user: user) }
-  let(:collection2) { create(:collection, user: user) }
+  let(:collection1) { create(:collection, user:) }
+  let(:collection2) { create(:collection, user:) }
 
   describe 'featured_collections' do
     before do
-      Site.update(account: account)
+      Site.update(account:)
       create(:featured_collection, collection_id: collection1.id)
       create(:featured_collection, collection_id: collection2.id)
     end
@@ -42,7 +42,7 @@
     subject { instance.featured_collections_attributes = attributes }
 
     let(:collection_id) { 'no-need-to-persist' }
-    let(:featured_collection) { create(:featured_collection, collection_id: collection_id) }
+    let(:featured_collection) { create(:featured_collection, collection_id:) }
 
     let(:attributes) do
       ActionController::Parameters.new(
diff --git a/spec/models/hyrax/group_spec.rb b/spec/models/hyrax/group_spec.rb
index f29acc0f0..fda54ae3d 100644
--- a/spec/models/hyrax/group_spec.rb
+++ b/spec/models/hyrax/group_spec.rb
@@ -6,14 +6,14 @@
 module Hyrax
   RSpec.describe Group, type: :model, clean: true do
     describe 'group with no members' do
-      subject { described_class.new(name: name, description: description) }
+      subject { described_class.new(name:, description:) }
 
       let(:name) { 'Empty Group' }
       let(:description) { 'Add members plz' }
       let(:empty_group_attributes) do
         {
-          name: name,
-          description: description,
+          name:,
+          description:,
           number_of_users: 0
         }
       end
diff --git a/spec/models/redis_endpoint_spec.rb b/spec/models/redis_endpoint_spec.rb
index 25f9cd8b1..6c6a3ad60 100644
--- a/spec/models/redis_endpoint_spec.rb
+++ b/spec/models/redis_endpoint_spec.rb
@@ -4,7 +4,7 @@
   let(:namespace) { 'foobar' }
 
   describe '.options' do
-    subject { described_class.new namespace: namespace }
+    subject { described_class.new namespace: }
 
     it 'uses the configured application settings' do
       expect(subject.options[:namespace]).to eq namespace
diff --git a/spec/models/uploaded_file_spec.rb b/spec/models/uploaded_file_spec.rb
index 65767a785..acf04c841 100644
--- a/spec/models/uploaded_file_spec.rb
+++ b/spec/models/uploaded_file_spec.rb
@@ -6,7 +6,7 @@
 # rubocop:disable Metrics/LineLength
 RSpec.describe 'Hyrax::UploadedFile' do # rubocop:disable RSpec/DescribeClass
   let(:file) { File.open(fixture_path + '/images/world.png') }
-  let(:upload) { Hyrax::UploadedFile.create(file: file) }
+  let(:upload) { Hyrax::UploadedFile.create(file:) }
   let(:config) { CarrierWave.configure { |c| c } }
   let(:bucket_name) { 'hyku-carrierwave-test' }
   let(:bigurl) { 'https://demo-application-w5twjcsuyx3v-uploadbucket-4l1zpvmp62nf.s3.amazonaws.com//var/app/current/public/uploads/hyrax/uploaded_file/file/31/image.png?X-Amz-Expires=600\u0026X-Amz-Date=20161214T193306Z\u0026X-Amz-Security-Token=FQoDYXdzEMT//////////wEaDMj3NLTbn4Y3JgbItSK3A57LyrcXBHQlP6lM7cT/2N9naRgRSef4EG/AxCCjMGcEVdt4X5ZsfHdzNiD6L0GODXmrP3quoXNBNZCoUVo3DY5E0P67iz9tYC2Ac%2BILJ%2BBzELNz84XI7C9zg6CCecZ8oeNjCTJXsMZ3xLx2bN099sl%2BY5nduDXAxen2Z63QKw7kiuuEXin/z%2B4ywFSP/Z1Sqbjkq4Qwjs5FUSyyz61wjl1%2Bg8uIJ5u3HTOlb8eZpk7gUCtdmLIE7mK1eZe5azUJC8XBW7Eu7jaRyM2PKMwjVnwepnfgPyEDqJSzKYJt1bGXgnQEN7logEKNOjmOcJqggM5Tc7PD40USAveIQ6E8ny/X0N%2BZ/X1rZTaCiAH1aWwVNqa0M43mlECrBeDv9I9BRMJzp4btvEgHKODrJe2MawDu4L1%2BzVNgOD7TZjrFt9zSEpyQK79dh8oHuyzDL0C%2Bpw3zL2ambsJ5OX6UnMuAmrkBbin1PKh2nHFkL/0xXAb2ZbSV6vKBxzKeQ62HMvv8UqypKbkwOMnstxyGGp00r6m6vL62x%2BTDergiiRfs947NyfJnP5l/rNRNMNesGo6kBmAqpACaBPAo0Z3GwgU%3D\u0026X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=ASIAIB72YBSAAINUZRPQ/20161214/us-east-1/s3/aws4_request\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=f9bfb2b8d6114bccb6e88e4c0526bf19c5658b587ee368d04b42b1881d5359db' }
diff --git a/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb b/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
index a6839c78d..ef8709320 100644
--- a/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
+++ b/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
@@ -13,8 +13,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'edit' }
-    let(:params) { base_params.merge(action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
@@ -29,8 +29,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'index' }
-    let(:params) { base_params.merge(controller: 'admin/group_users', action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(controller: 'admin/group_users', action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
@@ -45,8 +45,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'index' }
-    let(:params) { base_params.merge(controller: 'admin/group_roles', action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(controller: 'admin/group_roles', action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
@@ -61,8 +61,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'remove' }
-    let(:params) { base_params.merge(action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
diff --git a/spec/presenters/hyku/menu_presenter_spec.rb b/spec/presenters/hyku/menu_presenter_spec.rb
index 9db639664..f1555a458 100644
--- a/spec/presenters/hyku/menu_presenter_spec.rb
+++ b/spec/presenters/hyku/menu_presenter_spec.rb
@@ -133,17 +133,17 @@
     before do
       allow(Hyku::CollapsableSectionPresenter).to receive(:new).with(
         view_context: context,
-        text: text,
-        id: id,
-        icon_class: icon_class,
-        open: open,
-        html_options: html_options
+        text:,
+        id:,
+        icon_class:,
+        open:,
+        html_options:
       ).and_return(presenter)
     end
 
     it "calls the render method on the CollapsableSectionPresenter with the given block" do
       expect(presenter).to receive(:render)
-      instance.collapsable_section(text, id: id, icon_class: icon_class, open: open, **html_options, &block)
+      instance.collapsable_section(text, id:, icon_class:, open:, **html_options, &block)
     end
   end
 end
diff --git a/spec/requests/catalog_controller_spec.rb b/spec/requests/catalog_controller_spec.rb
index c36a9c43d..313a1f5ac 100644
--- a/spec/requests/catalog_controller_spec.rb
+++ b/spec/requests/catalog_controller_spec.rb
@@ -4,8 +4,8 @@
 
 RSpec.describe CatalogController, type: :request, clean: true, multitenant: true do
   let(:user) { create(:user, email: 'test_user@repo-sample.edu') }
-  let(:work) { build(:work, title: ['welcome test'], id: SecureRandom.uuid, user: user) }
-  let(:hyku_sample_work) { build(:work, title: ['sample test'], id: SecureRandom.uuid, user: user) }
+  let(:work) { build(:work, title: ['welcome test'], id: SecureRandom.uuid, user:) }
+  let(:hyku_sample_work) { build(:work, title: ['sample test'], id: SecureRandom.uuid, user:) }
   let(:sample_solr_connection) { RSolr.connect url: "#{ENV['SOLR_URL']}hydra-sample" }
 
   let(:cross_search_solr) { create(:solr_endpoint, url: "#{ENV['SOLR_URL']}hydra-cross-search-tenant") }
diff --git a/spec/requests/institution_visibility_spec.rb b/spec/requests/institution_visibility_spec.rb
index d850e050d..89ce45717 100644
--- a/spec/requests/institution_visibility_spec.rb
+++ b/spec/requests/institution_visibility_spec.rb
@@ -31,7 +31,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
     Apartment::Tenant.create(account2.tenant)
diff --git a/spec/requests/work_approval_permissions_spec.rb b/spec/requests/work_approval_permissions_spec.rb
index 2615febcb..f2cfb5702 100644
--- a/spec/requests/work_approval_permissions_spec.rb
+++ b/spec/requests/work_approval_permissions_spec.rb
@@ -24,7 +24,7 @@
   let!(:admin_set) do
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('one_step_mediated_deposit')
     admin_set = AdminSet.new(title: ['Mediated Deposit Admin Set'])
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_creator, admin_set.id, 'open') }
diff --git a/spec/requests/work_depositor_role_spec.rb b/spec/requests/work_depositor_role_spec.rb
index 0053ac892..b96956c86 100644
--- a/spec/requests/work_depositor_role_spec.rb
+++ b/spec/requests/work_depositor_role_spec.rb
@@ -25,7 +25,7 @@
 
     %w[open authenticated].each do |visibility|
       context "with #{visibility} visibility" do
-        let(:work) { create(:work, visibility: visibility, admin_set_id: admin_set_id) }
+        let(:work) { create(:work, visibility:, admin_set_id:) }
 
         it "can see the work's public show page" do
           get hyrax_generic_work_path(work)
@@ -43,7 +43,7 @@
     end
 
     context 'with restricted visibility' do
-      let(:work) { create(:work, visibility: 'restricted', admin_set_id: admin_set_id) }
+      let(:work) { create(:work, visibility: 'restricted', admin_set_id:) }
 
       it "cannot see the work's show page" do
         get hyrax_generic_work_path(work)
diff --git a/spec/requests/work_editor_role_spec.rb b/spec/requests/work_editor_role_spec.rb
index 7ab4a1dda..05e5ae2a6 100644
--- a/spec/requests/work_editor_role_spec.rb
+++ b/spec/requests/work_editor_role_spec.rb
@@ -21,7 +21,7 @@
         creator: ['depositor@example.com'],
         keyword: ['asdf'],
         rights_statement: 'http://rightsstatements.org/vocab/CNE/1.0/',
-        visibility: visibility,
+        visibility:,
         admin_set_id: admin_set.id
       }
     }
@@ -29,7 +29,7 @@
   let!(:admin_set) do
     admin_set = AdminSet.new(title: ['Test Admin Set'])
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('default')
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_depositor, admin_set.id, visibility) }
diff --git a/spec/requests/work_show_institution_visibility_spec.rb b/spec/requests/work_show_institution_visibility_spec.rb
index 2a37a51da..1798a371d 100644
--- a/spec/requests/work_show_institution_visibility_spec.rb
+++ b/spec/requests/work_show_institution_visibility_spec.rb
@@ -9,7 +9,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
   end
diff --git a/spec/requests/work_show_open_visibility_spec.rb b/spec/requests/work_show_open_visibility_spec.rb
index 222a38d31..052738a79 100644
--- a/spec/requests/work_show_open_visibility_spec.rb
+++ b/spec/requests/work_show_open_visibility_spec.rb
@@ -9,7 +9,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
   end
diff --git a/spec/requests/work_show_private_visibility_spec.rb b/spec/requests/work_show_private_visibility_spec.rb
index 639f98fc6..e226b5978 100644
--- a/spec/requests/work_show_private_visibility_spec.rb
+++ b/spec/requests/work_show_private_visibility_spec.rb
@@ -9,7 +9,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
   end
diff --git a/spec/services/hyrax/workflow/permission_grantor_spec.rb b/spec/services/hyrax/workflow/permission_grantor_spec.rb
index 4ff54dcd3..8abfc46a1 100644
--- a/spec/services/hyrax/workflow/permission_grantor_spec.rb
+++ b/spec/services/hyrax/workflow/permission_grantor_spec.rb
@@ -5,8 +5,8 @@
 RSpec.describe Hyrax::Workflow::PermissionGrantor do
   subject(:permission_grantor) do
     described_class.new(
-      permission_template: permission_template,
-      creating_user: creating_user
+      permission_template:,
+      creating_user:
     )
   end
 
@@ -34,7 +34,7 @@
     it 'initializes an instance and calls #call on it' do
       expect_any_instance_of(described_class).to receive(:call)
 
-      described_class.grant_default_workflow_roles!(permission_template: permission_template)
+      described_class.grant_default_workflow_roles!(permission_template:)
     end
   end
 
diff --git a/spec/services/hyrax/workflow/permission_query_spec.rb b/spec/services/hyrax/workflow/permission_query_spec.rb
index 16baa149f..76c433474 100644
--- a/spec/services/hyrax/workflow/permission_query_spec.rb
+++ b/spec/services/hyrax/workflow/permission_query_spec.rb
@@ -46,8 +46,8 @@ def expect_actions_for(user:, entity:, actions:)
         end
         expect(
           described_class.scope_permitted_workflow_actions_available_for_current_state(
-            user: user,
-            entity: entity
+            user:,
+            entity:
           )
         ).to eq(actions)
       end
@@ -56,26 +56,26 @@ def expect_agents_for(agents:, entity:, role:)
         agents = Array.wrap(agents).map { |agent| PowerConverter.convert_to_sipity_agent(agent) }
         expect(
           described_class.scope_agents_associated_with_entity_and_role(
-            role: role,
-            entity: entity
+            role:,
+            entity:
           )
         ).to contain_exactly(*agents)
       end
 
       def expect_roles_for(entity:, roles:)
         roles = Array.wrap(roles).map { |role| PowerConverter.convert_to_sipity_role(role) }
-        expect(described_class.scope_roles_associated_with_the_given_entity(entity: entity)).to eq(roles)
+        expect(described_class.scope_roles_associated_with_the_given_entity(entity:)).to eq(roles)
       end
 
       def expect_users_for(entity:, roles:, users:)
-        expect(described_class.scope_users_for_entity_and_roles(entity: entity, roles: roles)).to eq(Array.wrap(users))
+        expect(described_class.scope_users_for_entity_and_roles(entity:, roles:)).to eq(Array.wrap(users))
       end
 
       def expect_to_be_authorized(user:, entity:, action:, message: 'should be authorized')
         expect(
           described_class.authorized_for_processing?(
-            user: user,
-            entity: entity, action: action
+            user:,
+            entity:, action:
           )
         ).to be_truthy, message
       end
@@ -83,9 +83,9 @@ def expect_to_be_authorized(user:, entity:, action:, message: 'should be authori
       def expect_to_not_be_authorized(user:, entity:, action:, message: 'should not be authorized')
         expect(
           described_class.authorized_for_processing?(
-            user: user,
-            entity: entity,
-            action: action
+            user:,
+            entity:,
+            action:
           )
         ).to be_falsey, message
       end
@@ -241,7 +241,7 @@ def expect_entities_for(user:, entities:) # rubocop:disable Lint/UnusedMethodArg
         end
 
         context 'when user is persisted' do
-          subject { described_class.scope_processing_agents_for(user: user) }
+          subject { described_class.scope_processing_agents_for(user:) }
 
           let(:user) { create(:user) }
           let!(:group) { create(:group, member_users: [user]) }
diff --git a/spec/services/roles_service_spec.rb b/spec/services/roles_service_spec.rb
index b68fcd742..71ac2a8a4 100644
--- a/spec/services/roles_service_spec.rb
+++ b/spec/services/roles_service_spec.rb
@@ -452,7 +452,7 @@
     context 'when CollectionTypes grant access to other users/groups' do
       before do
         creator_user = FactoryBot.create(:user)
-        FactoryBot.create(:collection_type, creator_user: creator_user)
+        FactoryBot.create(:collection_type, creator_user:)
         FactoryBot.create(:collection_type, creator_group: 'Test Group')
         FactoryBot.create(:collection_type, manager_group: ::Ability.admin_group_name)
         FactoryBot.create(:collection_type, manager_group: ::Ability.registered_group_name)
@@ -629,7 +629,7 @@ def access_count_for(role, permission_template, access)
     permission_template.access_grants.where(
       agent_type: Hyrax::PermissionTemplateAccess::GROUP,
       agent_id: role,
-      access: access
+      access:
     ).count
   end
 end
diff --git a/spec/views/hyrax/admin/users/index.html.erb_spec.rb b/spec/views/hyrax/admin/users/index.html.erb_spec.rb
index 14db24a44..9c39ac219 100644
--- a/spec/views/hyrax/admin/users/index.html.erb_spec.rb
+++ b/spec/views/hyrax/admin/users/index.html.erb_spec.rb
@@ -14,8 +14,8 @@
         :user,
         display_name: "user#{i}",
         email: "email#{i}@example.com",
-        last_sign_in_at: Time.zone.now - 15.minutes,
-        created_at: Time.zone.now - 3.days
+        last_sign_in_at: 15.minutes.ago,
+        created_at: 3.days.ago
       )
     end
     FactoryBot.create(:admin_group, member_users: [users[0]])
@@ -58,8 +58,8 @@
         users << FactoryBot.create(:admin,
                                    display_name: "admin-user#{i}",
                                    email: "admin#{i}@example.com",
-                                   last_sign_in_at: Time.zone.now - 15.minutes,
-                                   created_at: Time.zone.now - 3.days)
+                                   last_sign_in_at: 15.minutes.ago,
+                                   created_at: 3.days.ago)
       end
       render
     end
@@ -79,8 +79,8 @@
         users << FactoryBot.create(:invited_user,
                                    display_name: "invitee#{i}",
                                    email: "invitee#{i}@example.com",
-                                   last_sign_in_at: Time.zone.now - 15.minutes,
-                                   created_at: Time.zone.now - 3.days)
+                                   last_sign_in_at: 15.minutes.ago,
+                                   created_at: 3.days.ago)
       end
       render
     end
diff --git a/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb b/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
index 5dbd31afa..acacc6aaa 100644
--- a/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
+++ b/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
@@ -43,19 +43,19 @@
   # find a way to read the text from the yaml to test this
   it "renders the announcement instructions" do
     text = "Announcement Text displays on the homepage."
-    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text: text)
+    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text:)
   end
 
   it "renders the banner instructions" do
     text = "Banner Text refers to the text that is displayed over banner image on the homepage."
-    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text: text)
+    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text:)
   end
 
   it "renders the featured researcher instructions" do
     text = "Featured Researcher is a space to enter information and on"
     text += " the home page reserved for highlighting repository users."
     expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]',
-                                   text: text)
+                                   text:)
   end
 
   # Copied from Hyrax v2.9.0 to add home_text form - Adding themes
@@ -66,6 +66,6 @@
     text += " that either requires or allows home page text. We recommend"
     text += " no more than 3 sentences in this area."
     expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]',
-                                   text: text)
+                                   text:)
   end
 end

From 8ac6d413083a4c80ba54165d310a0ecab69cfc5e Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Fri, 15 Dec 2023 19:24:30 -0800
Subject: [PATCH 080/126] =?UTF-8?q?=F0=9F=A7=B9=20Fix=20CollapsableSection?=
 =?UTF-8?q?Presenter=20override?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The override was causing issues not passing the nav-link class into the
anchor tags.  This fix specifically passes the title attribute in vs the
previous implementation of trying to pass all html options in.
---
 .../hyku/collapsable_section_presenter.rb     | 27 ++++++++++---------
 app/presenters/hyku/menu_presenter.rb         | 16 +++++------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/presenters/hyku/collapsable_section_presenter.rb b/app/presenters/hyku/collapsable_section_presenter.rb
index da0c2b100..b2a263e73 100644
--- a/app/presenters/hyku/collapsable_section_presenter.rb
+++ b/app/presenters/hyku/collapsable_section_presenter.rb
@@ -1,28 +1,29 @@
 # frozen_string_literal: true
 
 module Hyku
-  # Draws a collapsable list widget using the Bootstrap 3 / Collapse.js plugin
+  # Draws a collapsable list widget using the Bootstrap 4 / Collapse.js plugin
   class CollapsableSectionPresenter < Hyrax::CollapsableSectionPresenter
-    # Override Hyrax 3.5.0 to pass in html_options
+    # Override Hyrax v5.0.0rc2 to pass in the title attribute
     # rubocop:disable Metrics/ParameterLists
-    def initialize(view_context:, text:, id:, icon_class:, open:, html_options: {})
+    def initialize(view_context:, text:, id:, icon_class:, open:, title: nil)
       # rubocop:enable Metrics/ParameterLists
-      super(view_context: view_context, text: text, id: id, icon_class: icon_class, open: open)
-      @html_options = html_options
+      super(view_context:, text:, id:, icon_class:, open:)
+      @title = title
     end
 
-    attr_reader :html_options
+    attr_reader :title
 
     private
 
     def button_tag
-      tag.a({ role: 'button',
-              class: "#{button_class}collapse-toggle",
-              data: { toggle: 'collapse' },
-              href: "##{id}",
-              onclick: "toggleCollapse(this)",
-              'aria-expanded' => open,
-              'aria-controls' => id }.merge(html_options)) do
+      tag.a(role: 'button',
+            class: "#{button_class}collapse-toggle nav-link",
+            data: { toggle: 'collapse' },
+            href: "##{id}",
+            onclick: "toggleCollapse(this)",
+            'aria-expanded' => open,
+            'aria-controls' => id,
+            title:) do
         safe_join([tag.span('', class: icon_class, 'aria-hidden': true),
                    tag.span(text)], ' ')
       end
diff --git a/app/presenters/hyku/menu_presenter.rb b/app/presenters/hyku/menu_presenter.rb
index 7ed0c9e8f..a0a6c7148 100644
--- a/app/presenters/hyku/menu_presenter.rb
+++ b/app/presenters/hyku/menu_presenter.rb
@@ -50,16 +50,16 @@ def show_task?
     end
 
     # Draw a collaspable menu section. The passed block should contain <li> items.
-    # Override Hyrax 3.5.0 to pass in html_options
+    # Override Hyrax v5.0.0rc2 to pass in title attribute
     # rubocop:disable Metrics/ParameterLists
-    def collapsable_section(text, id:, icon_class:, open:, **html_options, &block)
+    def collapsable_section(text, id:, icon_class:, title:, open:, &block)
       # rubocop:enable Metrics/ParameterLists
-      CollapsableSectionPresenter.new(view_context: view_context,
-                                      text: text,
-                                      id: id,
-                                      icon_class: icon_class,
-                                      open: open,
-                                      html_options: html_options).render(&block)
+      CollapsableSectionPresenter.new(view_context:,
+                                      text:,
+                                      id:,
+                                      icon_class:,
+                                      title:,
+                                      open:).render(&block)
     end
   end
 end

From 7254e9f16be1816358ba529507674932b0cec679 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Fri, 15 Dec 2023 19:24:46 -0800
Subject: [PATCH 081/126] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20required=20tran?=
 =?UTF-8?q?slations=20from=20locales?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will remove the override for the `required` translations
since it changed to a badge badge-style in Bootstrap 4.  This is
accounted for in Hyrax so we can fall back to that.
---
 config/locales/hyrax.de.yml    | 2 --
 config/locales/hyrax.en.yml    | 2 --
 config/locales/hyrax.es.yml    | 2 --
 config/locales/hyrax.fr.yml    | 2 --
 config/locales/hyrax.it.yml    | 2 --
 config/locales/hyrax.pt-BR.yml | 2 --
 config/locales/hyrax.zh.yml    | 2 --
 7 files changed, 14 deletions(-)

diff --git a/config/locales/hyrax.de.yml b/config/locales/hyrax.de.yml
index fccf815ab..9834b3aad 100644
--- a/config/locales/hyrax.de.yml
+++ b/config/locales/hyrax.de.yml
@@ -1199,5 +1199,3 @@ de:
       defaults:
         find_child_work: Suche nach einer Arbeit…
         member_of_collection_ids: Sammlung auswählen…
-    required:
-      html: <span class="label label-info required-tag">erforderlich</span>
diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml
index 137ddfef0..3585bb18b 100644
--- a/config/locales/hyrax.en.yml
+++ b/config/locales/hyrax.en.yml
@@ -1203,5 +1203,3 @@ en:
       defaults:
         find_child_work: Search for a work…
         member_of_collection_ids: Select a collection…
-    required:
-      html: <span class="label label-info required-tag">required</span>
diff --git a/config/locales/hyrax.es.yml b/config/locales/hyrax.es.yml
index 934762436..b5576805d 100644
--- a/config/locales/hyrax.es.yml
+++ b/config/locales/hyrax.es.yml
@@ -1200,5 +1200,3 @@ es:
       defaults:
         find_child_work: Busca trabajo ...
         member_of_collection_ids: Seleccione una colección ...
-    required:
-      html: <span class="label label-info required-tag">necesario</span>
diff --git a/config/locales/hyrax.fr.yml b/config/locales/hyrax.fr.yml
index 7942172c3..f9eff1ea8 100644
--- a/config/locales/hyrax.fr.yml
+++ b/config/locales/hyrax.fr.yml
@@ -1198,5 +1198,3 @@ fr:
       defaults:
         find_child_work: Rechercher une œuvre…
         member_of_collection_ids: Sélectionnez une collection…
-    required:
-      html: <span class="label label-info required-tag">obligatoire</span>
diff --git a/config/locales/hyrax.it.yml b/config/locales/hyrax.it.yml
index 8bc156da3..b9811fc55 100644
--- a/config/locales/hyrax.it.yml
+++ b/config/locales/hyrax.it.yml
@@ -1200,5 +1200,3 @@ it:
       defaults:
         find_child_work: Cerca un'opera ...
         member_of_collection_ids: Seleziona una collezione ...
-    required:
-      html: <span class="label label-info required-tag">necessario</span>
diff --git a/config/locales/hyrax.pt-BR.yml b/config/locales/hyrax.pt-BR.yml
index 572890c42..dec161d34 100644
--- a/config/locales/hyrax.pt-BR.yml
+++ b/config/locales/hyrax.pt-BR.yml
@@ -1200,5 +1200,3 @@ pt-BR:
       defaults:
         find_child_work: Procure um trabalho…
         member_of_collection_ids: Selecione uma coleção…
-    required:
-      html: <span class="label label-info required-tag">requeridos</span>
diff --git a/config/locales/hyrax.zh.yml b/config/locales/hyrax.zh.yml
index 76aa30ac8..953f731e3 100644
--- a/config/locales/hyrax.zh.yml
+++ b/config/locales/hyrax.zh.yml
@@ -1200,5 +1200,3 @@ zh:
       defaults:
         find_child_work: 正在搜寻作品…
         member_of_collection_ids: 选择一个收藏夹…
-    required:
-      html: <span class="label label-info required-tag">需要</span>

From 0d76532b6b1f2c640b9ea6c22b1a6c1cec418358 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Sun, 17 Dec 2023 16:38:58 -0800
Subject: [PATCH 082/126] =?UTF-8?q?=F0=9F=90=9B=20Fix=20some=20javascript?=
 =?UTF-8?q?=20errors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will fix a few javascript errors, at least enough to get the
the bootstrap javascript to work correctly.  We're still getting a the
almond-rails js error but that seems to exist in previous Hyku as well.
---
 Gemfile                               | 1 +
 Gemfile.lock                          | 5 +++++
 app/assets/javascripts/application.js | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a350101b3..f3c4dda27 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,6 +96,7 @@ gem 'spring-watcher-listen', '~> 2.0.0', group: %i[development]
 gem 'terser' # to support the Safe Navigation / Optional Chaining operator (?.) and avoid uglifier precompile issue
 gem 'tether-rails'
 gem 'turbolinks', '~> 5'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'web-console', '>= 3.3.0', group: %i[development] # <%= console %> in views
 gem 'webdrivers', '~> 4.7.0', group: %i[test]
 gem 'webmock', group: %i[test]
diff --git a/Gemfile.lock b/Gemfile.lock
index 6676493a1..3e37563c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1295,6 +1295,10 @@ GEM
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
+    twitter-typeahead-rails (0.11.1.pre.corejavascript)
+      actionpack (>= 3.1)
+      jquery-rails
+      railties (>= 3.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
@@ -1459,6 +1463,7 @@ DEPENDENCIES
   terser
   tether-rails
   turbolinks (~> 5)
+  twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
   web-console (>= 3.3.0)
   webdrivers (~> 4.7.0)
   webmock
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 852de9889..1f6185b0c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,12 +10,10 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require codemirror
-//= require codemirror-autorefresh
-//= require codemirror/modes/css
 //= require jquery3
 //= require rails-ujs
 //= require popper
+//= require twitter/typeahead
 //= require bootstrap
 //= require jquery.fontselect
 //= require jquery.dataTables
@@ -47,6 +45,11 @@
 //= require bulkrax/application
 
 //= require hyrax
+
+//= require codemirror
+//= require codemirror-autorefresh
+//= require codemirror/modes/css
+
 //= require iiif_print
 
 //= require jquery.flot.pie

From a16d7861bcc5bc9d8c576a0927d38a15cc0a419a Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 06:28:57 -0500
Subject: [PATCH 083/126] Hyrax 5 upgrade rubocop fixes & get specs running in
 CI (#2065)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹Rubocop Fixes

* Attempt to fix circleci
---
 .circleci/config.yml                          |  2 +-
 .rubocop.yml                                  | 20 +++++++++++--
 Rakefile                                      |  2 ++
 app/controllers/admin/users_controller.rb     |  4 +--
 app/controllers/application_controller.rb     | 15 +++++++---
 .../hyrax/works_controller_behavior.rb        | 14 +++++-----
 .../hyrax/contact_form_controller.rb          |  2 +-
 .../hyrax/dashboard/collections_controller.rb | 23 +++++++--------
 app/controllers/hyrax/homepage_controller.rb  | 13 +++++----
 app/forms/hyrax/forms/admin/appearance.rb     |  8 ++++--
 app/helpers/admin_stats_helper.rb             |  2 +-
 app/helpers/application_helper.rb             |  2 +-
 app/helpers/google_tag_manager_helper.rb      |  4 +--
 app/helpers/group_navigation_helper.rb        |  2 +-
 app/helpers/hyrax_helper.rb                   |  2 +-
 app/helpers/shared_search_helper.rb           |  2 +-
 app/jobs/create_solr_collection_job.rb        |  8 +++---
 app/jobs/delete_old_guests_job.rb             |  2 +-
 app/jobs/import_work_from_purl_job.rb         |  2 +-
 app/models/concerns/account_switch.rb         |  2 +-
 .../concerns/hyrax/ability/work_ability.rb    |  2 +-
 app/models/content_block.rb                   | 24 ++++++++--------
 app/models/featured_collection_list.rb        |  2 +-
 app/models/hyrax/group.rb                     |  2 +-
 app/models/role.rb                            |  2 +-
 app/models/site.rb                            |  2 +-
 app/models/user.rb                            |  4 +++
 .../iiif_av/displays_content_decorator.rb     | 16 +++++------
 app/presenters/hyku/work_show_presenter.rb    |  2 +-
 .../hyrax/collection_presenter_decorator.rb   |  2 +-
 .../hyrax/homepage_presenter_decorator.rb     |  2 +-
 .../iiif_manifest_presenter_decorator.rb      |  2 +-
 app/services/create_account.rb                |  4 +--
 .../admin_set_create_service_decorator.rb     | 10 +++----
 .../hyrax/collection_types/create_service.rb  |  2 +-
 .../permissions_create_service_decorator.rb   |  4 ++-
 .../permissions_service_decorator.rb          |  2 +-
 .../hyrax/workflow/permission_grantor.rb      | 10 +++----
 .../hyrax/workflow/permission_query.rb        | 22 +++++++--------
 app/services/roles_service.rb                 | 14 ++++++----
 bin/graph                                     |  2 +-
 config/initializers/apartment.rb              |  2 +-
 config/initializers/devise.rb                 |  6 ++--
 config/initializers/hyrax.rb                  |  4 +--
 config/routes.rb                              |  5 +---
 lib/importer/factory/collection_factory.rb    |  2 +-
 lib/importer/factory/object_factory.rb        |  6 ++--
 lib/importer/mods_parser.rb                   | 14 +++++-----
 .../metadata_format/hyku_dublin_core.rb       |  2 ++
 lib/stanford/importer/mods_parser.rb          |  2 +-
 lib/stanford/importer/purl_parser.rb          | 12 ++++----
 lib/tasks/rubocop.rake                        |  2 ++
 .../find_ids_by_model_decorator.rb            |  2 +-
 spec/abilities/collection_ability_spec.rb     | 16 +++++------
 spec/abilities/solr_document_ability_spec.rb  |  2 +-
 .../admin/accounts_controller_spec.rb         |  2 +-
 .../hyrax/generic_works_controller_spec.rb    |  2 +-
 .../hyrax/homepage_controller_spec.rb         |  6 ++--
 .../hyrax/images_controller_spec.rb           |  2 +-
 .../proprietor/accounts_controller_spec.rb    |  4 +--
 .../proprietor/users_controller_spec.rb       |  2 +-
 spec/factories/accounts.rb                    |  4 +--
 spec/factories/permission_templates.rb        | 14 +++++-----
 .../admin_set_form_participants_tab_spec.rb   |  2 +-
 spec/features/appearance_theme_spec.rb        |  2 +-
 .../features/assign_workflow_to_group_spec.rb |  2 +-
 spec/features/collection_manager_role_spec.rb |  4 +--
 spec/features/collection_spec.rb              | 22 +++++++--------
 spec/features/create_generic_work_spec.rb     |  4 +--
 spec/features/create_image_spec.rb            |  4 +--
 .../cultural_repository_theme_spec.rb         |  2 +-
 spec/features/featured_collections_spec.rb    |  6 ++--
 .../institutional_repository_theme_spec.rb    |  2 +-
 spec/features/oai_pmh_spec.rb                 |  4 +--
 spec/features/show_page_theme_spec.rb         |  4 +--
 .../work_approval_permissions_spec.rb         |  2 +-
 spec/features/work_editor_role_spec.rb        |  2 +-
 .../forms/permission_template_form_spec.rb    | 28 +++++++++----------
 spec/helpers/shared_search_helper_spec.rb     |  2 +-
 spec/indexers/app_indexer_spec.rb             |  2 +-
 spec/jobs/import_work_from_purl_job_spec.rb   |  2 +-
 spec/lib/importer/factory/etd_factory_spec.rb |  2 +-
 .../importer/factory/image_factory_spec.rb    |  2 +-
 .../factory/string_literal_processor_spec.rb  |  2 +-
 spec/models/account_spec.rb                   |  4 +--
 spec/models/collection_spec.rb                |  4 +--
 spec/models/fcrepo_endpoint_spec.rb           |  2 +-
 spec/models/featured_collection_list_spec.rb  |  8 +++---
 spec/models/hyrax/group_spec.rb               |  6 ++--
 spec/models/redis_endpoint_spec.rb            |  2 +-
 spec/models/uploaded_file_spec.rb             |  2 +-
 .../admin/group/navigation_presenter_spec.rb  | 16 +++++------
 spec/presenters/hyku/menu_presenter_spec.rb   | 12 ++++----
 spec/requests/catalog_controller_spec.rb      |  4 +--
 spec/requests/institution_visibility_spec.rb  |  2 +-
 .../work_approval_permissions_spec.rb         |  2 +-
 spec/requests/work_depositor_role_spec.rb     |  4 +--
 spec/requests/work_editor_role_spec.rb        |  4 +--
 .../work_show_institution_visibility_spec.rb  |  2 +-
 .../work_show_open_visibility_spec.rb         |  2 +-
 .../work_show_private_visibility_spec.rb      |  2 +-
 .../hyrax/workflow/permission_grantor_spec.rb |  6 ++--
 .../hyrax/workflow/permission_query_spec.rb   | 24 ++++++++--------
 spec/services/roles_service_spec.rb           |  4 +--
 .../hyrax/admin/users/index.html.erb_spec.rb  | 12 ++++----
 .../content_blocks/edit.html.erb_spec.rb      |  8 +++---
 106 files changed, 325 insertions(+), 285 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84e0cf65b..455c371b6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 orbs:
   samvera: samvera/circleci-orb@1
-  browser-tools: circleci/browser-tools@1.3
+  browser-tools: circleci/browser-tools@1.4.6
   ruby: circleci/ruby@2
   node: circleci/node@5
 
diff --git a/.rubocop.yml b/.rubocop.yml
index 7af771792..fd4518693 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,7 +5,8 @@ inherit_gem:
   bixby: bixby_default.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  NewCops: disable
+  TargetRubyVersion: 3.2.2
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'
@@ -13,6 +14,8 @@ AllCops:
     - 'spec/test_app_templates/**/*'
     - 'vendor/**/*'
     - 'lib/hyrax/specs/**/*'
+    - 'bin/graph'
+    - 'bin/import_from_purl'
 
 Lint/ImplicitStringConcatenation:
   Exclude:
@@ -23,7 +26,7 @@ Rails/Output:
     - 'lib/generators/**/*'
 
 Metrics/BlockLength:
-  ExcludedMethods: ['included']
+  IgnoredMethods: ['included']
   Exclude:
     - 'hyrax.gemspec'
     - 'app/models/concerns/hyrax/content_block_behavior.rb'
@@ -65,9 +68,16 @@ Style/SingleLineBlockParams:
 Rails/ApplicationJob:
   Enabled: false
 
+Rails/ApplicationMailer:
+  Enabled: false
+
 Rails/ApplicationRecord:
   Enabled: false
 
+Rails/HasManyOrHasOneDependent:
+  Exclude:
+    - 'app/models/endpoint.rb'
+
 Rails/RakeEnvironment:
   Enabled: false
 
@@ -94,6 +104,12 @@ Rails/OutputSafety:
     - 'app/renderers/hyrax/renderers/attribute_renderer.rb'
     - 'spec/views/hyrax/my/works/_list_works.html.erb_spec.rb'
 
+Rails/UniqueValidationWithoutIndex:
+  Exclude:
+    - 'app/models/account.rb'
+    - 'app/models/domain_name.rb'
+    - 'app/models/hyrax/group.rb'
+
 RSpec/DescribeClass:
   Exclude:
     - 'spec/abilities/**/*'
diff --git a/Rakefile b/Rakefile
index 8f8cb932c..ac6b3fbc9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -17,7 +17,9 @@ Rails.application.load_tasks
 
 begin
   require 'solr_wrapper/rake_task'
+# rubocop:disable Lint/SuppressedException
 rescue LoadError
+  # rubocop:enable Lint/SuppressedException
 end
 
 task :ci do
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 6230b44c3..66d17cc44 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -20,9 +20,9 @@ def activate
       user.password = ENV.fetch('HYKU_USER_DEFAULT_PASSWORD', 'password')
 
       if user.save && user.accept_invitation!
-        redirect_to hyrax.admin_users_path, notice: t('hyrax.admin.users.activate.success', user: user)
+        redirect_to hyrax.admin_users_path, notice: t('hyrax.admin.users.activate.success', user:)
       else
-        redirect_to hyrax.admin_users_path, flash: { error: t('hyrax.admin.users.activate.failure', user: user) }
+        redirect_to hyrax.admin_users_path, flash: { error: t('hyrax.admin.users.activate.failure', user:) }
       end
     end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4c6abe1a8..77730d697 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -29,18 +29,24 @@ class ApplicationController < ActionController::Base
 
   protected
 
+  # rubocop:disable Naming/PredicateName
   def is_hidden
+    # rubocop:enable Naming/PredicateName
     current_account.persisted? && !current_account.is_public?
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_api_or_pdf
+    # rubocop:enable Naming/PredicateName
     request.format.to_s.match('json') ||
       params[:print] ||
       request.path.include?('api') ||
       request.path.include?('pdf')
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_staging
+    # rubocop:enable Naming/PredicateName
     ['staging'].include?(Rails.env)
   end
 
@@ -49,10 +55,11 @@ def is_staging
   def authenticate_if_needed
     # Disable this extra authentication in test mode
     return true if Rails.env.test?
-    if (is_hidden || is_staging) && !is_api_or_pdf
-      authenticate_or_request_with_http_basic do |username, password|
-        username == "samvera" && password == "hyku"
-      end
+    # rubocop:disable Naming/PredicateName
+    return unless (is_hidden || is_staging) && !is_api_or_pdf
+    # rubocop:enable Naming/PredicateName
+    authenticate_or_request_with_http_basic do |username, password|
+      username == "samvera" && password == "hyku"
     end
   end
 
diff --git a/app/controllers/concerns/hyrax/works_controller_behavior.rb b/app/controllers/concerns/hyrax/works_controller_behavior.rb
index 652b59e7c..f7ea802a0 100644
--- a/app/controllers/concerns/hyrax/works_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/works_controller_behavior.rb
@@ -184,7 +184,7 @@ def create_valkyrie_work
         transactions['change_set.create_work']
         .with_step_args(
           'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
-          'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+          'work_resource.add_file_sets' => { uploaded_files:, file_set_params: params[hash_key_for_curation_concern][:file_set] },
           'change_set.set_user_as_depositor' => { user: current_user },
           'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
         )
@@ -198,8 +198,8 @@ def update_valkyrie_work
       return after_update_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
       result =
         transactions['change_set.update_work']
-        .with_step_args('work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-                        'work_resource.update_work_members' => { work_members_attributes: work_members_attributes })
+        .with_step_args('work_resource.add_file_sets' => { uploaded_files:, file_set_params: params[hash_key_for_curation_concern][:file_set] },
+                        'work_resource.update_work_members' => { work_members_attributes: })
         .call(form)
       @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
       after_update_response
@@ -350,7 +350,7 @@ def attributes_for_actor
       uploaded_files = params.fetch(:uploaded_files, [])
       selected_files = params.fetch(:selected_files, {}).values
       browse_everything_urls = uploaded_files &
-                               selected_files.map { |f| f[:url] }
+                               selected_files.pluck(:url)
 
       # we need the hash of files with url and file_name
       browse_everything_files = selected_files
@@ -389,7 +389,7 @@ def after_create_error(errors, original_input_params_for_form = nil)
           rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
           render 'new', status: :unprocessable_entity
         end
-        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
       end
     end
 
@@ -418,7 +418,7 @@ def after_update_error(errors)
           build_form unless @form.is_a? Hyrax::ChangeSet
           render 'edit', status: :unprocessable_entity
         end
-        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
       end
     end
 
@@ -500,7 +500,7 @@ def available_admin_sets
           .new(admin_set: admin_set_doc, permission_template: template, permit_sharing: sharing)
       end
 
-      AdminSetSelectionPresenter.new(admin_sets: admin_sets)
+      AdminSetSelectionPresenter.new(admin_sets:)
     end
 
     # added to prepend the show theme views into the view_paths
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index d0bed0992..e0c81d2c8 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -127,7 +127,7 @@ def setup_negative_captcha
         # If you wish to override the default CSS styles (position: absolute; left: -2000px;)
         # used to position the fields off-screen
         css: "display: none",
-        params: params
+        params:
       )
     end
   end
diff --git a/app/controllers/hyrax/dashboard/collections_controller.rb b/app/controllers/hyrax/dashboard/collections_controller.rb
index 072caf38b..95e25f557 100644
--- a/app/controllers/hyrax/dashboard/collections_controller.rb
+++ b/app/controllers/hyrax/dashboard/collections_controller.rb
@@ -86,9 +86,8 @@ def edit
         form
         collection_type
         # Gets original filename of an uploaded thumbnail. See #update
-        if ::SolrDocument.find(@collection.id).thumbnail_path.include? "uploaded_collection_thumbnails" && uploaded_thumbnail?
-          @thumbnail_filename = File.basename(uploaded_thumbnail_files.reject { |f| File.basename(f).include? @collection.id }.first)
-        end
+        return unless ::SolrDocument.find(@collection.id).thumbnail_path.include?("uploaded_collection_thumbnails" && uploaded_thumbnail?)
+        @thumbnail_filename = File.basename(uploaded_thumbnail_files.reject { |f| File.basename(f).include? @collection.id }.first)
       end
 
       def uploaded_thumbnail?
@@ -182,7 +181,7 @@ def after_destroy_error(id)
             flash[:notice] = t('hyrax.dashboard.my.action.collection_delete_fail')
             render :edit, status: :unprocessable_entity
           end
-          format.json { render json: { id: id }, status: :unprocessable_entity, location: dashboard_collection_path(@collection) }
+          format.json { render json: { id: }, status: :unprocessable_entity, location: dashboard_collection_path(@collection) }
         end
       end
 
@@ -212,7 +211,7 @@ def collection
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def files
         params[:q] = '' unless params[:q]
-        builder = Hyrax::CollectionMemberSearchBuilder.new(scope: self, collection: collection, search_includes_models: :works)
+        builder = Hyrax::CollectionMemberSearchBuilder.new(scope: self, collection:, search_includes_models: :works)
         # get the default work image because we do not want to show any works in this
         # dropdown that only have the default work image. this indicates that they have
         # no files attached, and will throw an error if selected.
@@ -223,7 +222,9 @@ def files
         result = response.documents.reject do |document|
                    document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) ||
                      document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path)
+                   # rubocop:disable Style/MultilineBlockChain
                  end.map do |document|
+          # rubocop:enable Style/MultilineBlockChain
           { id: document["thumbnail_path_ss"].split('/').last.gsub(/\?.*/, ''), text: document["title_tesim"].first }
         end
         reset_thumbnail_option = {
@@ -497,7 +498,7 @@ def extract_old_style_permission_attributes(attributes)
         participants = []
         permissions.each do |p|
           access = access(p)
-          participants << { agent_type: agent_type(p), agent_id: p["name"], access: access } if access
+          participants << { agent_type: agent_type(p), agent_id: p["name"], access: } if access
         end
         participants
       end
@@ -526,7 +527,7 @@ def add_members_to_collection(collection = nil, collection_id: nil)
         collection_id ||= (collection.try(:id) || @collection.id)
 
         Hyrax::Collections::CollectionMemberService
-          .add_members_by_ids(collection_id: collection_id,
+          .add_members_by_ids(collection_id:,
                               new_member_ids: batch,
                               user: current_user)
       end
@@ -595,7 +596,7 @@ def query_collection_members
 
       # Instantiate the membership query service
       def collection_member_service
-        @collection_member_service ||= membership_service_class.new(scope: self, collection: collection, params: params_for_query)
+        @collection_member_service ||= membership_service_class.new(scope: self, collection:, params: params_for_query)
       end
 
       def member_works
@@ -614,7 +615,7 @@ def member_subcollections
       def parent_collections
         page = params[:parent_collection_page].to_i
         query = Hyrax::Collections::NestedCollectionQueryService
-        collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page: page)
+        collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page:)
       end
 
       def collection_object
@@ -675,7 +676,7 @@ def after_create_errors(errors) # for valkyrie
             render 'new', status: :unprocessable_entity
           end
           wants.json do
-            render_json_response(response_type: :unprocessable_entity, options: { errors: errors })
+            render_json_response(response_type: :unprocessable_entity, options: { errors: })
           end
         end
       end
@@ -705,7 +706,7 @@ def after_update_errors(errors) # for valkyrie
             flash[:error] = errors.to_s
             render 'edit', status: :unprocessable_entity
           end
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: errors }) }
+          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
         end
       end
 
diff --git a/app/controllers/hyrax/homepage_controller.rb b/app/controllers/hyrax/homepage_controller.rb
index 45954860c..a19c16103 100644
--- a/app/controllers/hyrax/homepage_controller.rb
+++ b/app/controllers/hyrax/homepage_controller.rb
@@ -106,7 +106,7 @@ def search_action_url(options = {})
 
     # Return 6 collections, sorts by title
     def collections(rows: 6)
-    (response, documents) = Hyrax::CollectionsService.new(self).search_results do |builder|
+      Hyrax::CollectionsService.new(self).search_results do |builder|
         builder.rows(rows)
         builder.merge(sort: "title_ssi")
       end
@@ -150,13 +150,14 @@ def inject_theme_views
     end
 
     # add this method to vary blacklight config and user_params
-    def search_service(*args)
+    def search_service(*_args)
       Hyrax::SearchService.new(
-        config: ::CatalogController.new.blacklight_config, 
-        user_params: params.except(:q, :page), 
+        config: ::CatalogController.new.blacklight_config,
+        user_params: params.except(:q, :page),
         scope: self,
-        current_ability: current_ability,
-        search_builder_class: search_builder_class)
+        current_ability:,
+        search_builder_class:
+      )
     end
   end
 end
diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance.rb
index da3b2802d..03a521a29 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance.rb
@@ -226,7 +226,9 @@ def primary_button_focus_border_color
         # The custom css module
         def custom_css_block
           # we want to be able to read the css
+          # rubocop:disable Rails/OutputSafety
           block_for('custom_css_block', '/* custom stylesheet */').html_safe
+          # rubocop:enable Rails/OutputSafety
         end
 
         # DEFAULT BUTTON COLORS
@@ -445,21 +447,23 @@ def default_values
         end
 
         def block_for(name, dynamic_default = nil)
-          ContentBlock.block_for(name: name, fallback_value: default_values[name] || dynamic_default)
+          ContentBlock.block_for(name:, fallback_value: default_values[name] || dynamic_default)
         end
 
         # Persist a key/value tuple as a ContentBlock
         # @param [Symbol] name the identifier for the ContentBlock
         # @param [String] value the value to set
         def update_block(name, value)
-          ContentBlock.update_block(name: name, value: value)
+          ContentBlock.update_block(name:, value:)
         end
 
         def format_font_names(font_style)
           # the fonts come with `Font Name:font-weight` - this removes the weight
           parts = font_style.split(':')
           # Google fonts use `+` in place of spaces. This fixes it for CSS.
+          # rubocop:disable Rails/OutputSafety
           parts[0].tr('+', ' ').html_safe
+          # rubocop:enable Rails/OutputSafety
         end
       end
     end
diff --git a/app/helpers/admin_stats_helper.rb b/app/helpers/admin_stats_helper.rb
index e1558e502..bcd96b677 100644
--- a/app/helpers/admin_stats_helper.rb
+++ b/app/helpers/admin_stats_helper.rb
@@ -5,7 +5,7 @@ def graph_tag(id, data, options)
     content_tag :div, class: 'graph-container',
                       data: { graph_data: data.to_json,
                               graph_options: options } do
-      content_tag :div, nil, class: 'graph', id: id
+      content_tag :div, nil, class: 'graph', id:
     end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index df85c9a77..e4cd54f18 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -8,7 +8,7 @@ module ApplicationHelper
   include HykuKnapsack::ApplicationHelper
 
   def hint_for(term:, record_class: nil)
-    hint = locale_for(type: 'hints', term: term, record_class: record_class)
+    hint = locale_for(type: 'hints', term:, record_class:)
 
     return hint unless missing_translation(hint)
   end
diff --git a/app/helpers/google_tag_manager_helper.rb b/app/helpers/google_tag_manager_helper.rb
index 6a9f6f70c..87518a045 100644
--- a/app/helpers/google_tag_manager_helper.rb
+++ b/app/helpers/google_tag_manager_helper.rb
@@ -5,7 +5,7 @@ def render_gtm_head(_host)
     return '' if current_account.gtm_id.blank?
 
     # rubocop:disable Rails/OutputSafety
-    <<-HTML.strip_heredoc.html_safe
+    <<~HTML.html_safe
       <!-- Google Tag Manager -->
       <script>
        (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -23,7 +23,7 @@ def render_gtm_body(_host)
     # render 'layouts/google/gtm_body'
     return '' if current_account.gtm_id.blank?
     # rubocop:disable Rails/OutputSafety
-    <<-HTML.strip_heredoc.html_safe
+    <<~HTML.html_safe
        <!-- Google Tag Manager (noscript) -->
 
       <noscript><iframe src='https://www.googletagmanager.com/ns.html?id="#{current_account.gtm_id}"'
diff --git a/app/helpers/group_navigation_helper.rb b/app/helpers/group_navigation_helper.rb
index 2bc90c72e..e29868d8a 100644
--- a/app/helpers/group_navigation_helper.rb
+++ b/app/helpers/group_navigation_helper.rb
@@ -2,6 +2,6 @@
 
 module GroupNavigationHelper
   def navigation_presenter
-    @navigation_presenter ||= Hyku::Admin::Group::NavigationPresenter.new(params: params)
+    @navigation_presenter ||= Hyku::Admin::Group::NavigationPresenter.new(params:)
   end
 end
diff --git a/app/helpers/hyrax_helper.rb b/app/helpers/hyrax_helper.rb
index 921498837..c8f57f902 100644
--- a/app/helpers/hyrax_helper.rb
+++ b/app/helpers/hyrax_helper.rb
@@ -26,7 +26,7 @@ def logo_image
   end
 
   def block_for(name:)
-    ContentBlock.block_for(name: name, fallback_value: false)
+    ContentBlock.block_for(name:, fallback_value: false)
   end
 
   def directory_image
diff --git a/app/helpers/shared_search_helper.rb b/app/helpers/shared_search_helper.rb
index bc96c3cf6..0bbae1b18 100644
--- a/app/helpers/shared_search_helper.rb
+++ b/app/helpers/shared_search_helper.rb
@@ -17,7 +17,7 @@ def generate_work_url(model, request)
       id = model["id"]
     end
     request_params = %i[protocol host port].map { |method| ["request_#{method}".to_sym, request.send(method)] }.to_h
-    get_url(id: id, request: request_params, account_cname: account_cname, has_model: has_model)
+    get_url(id:, request: request_params, account_cname:, has_model:)
   end
 
   private
diff --git a/app/jobs/create_solr_collection_job.rb b/app/jobs/create_solr_collection_job.rb
index 536203795..e818f8fae 100644
--- a/app/jobs/create_solr_collection_job.rb
+++ b/app/jobs/create_solr_collection_job.rb
@@ -22,10 +22,10 @@ def without_account(name, tenant_list = '')
     return if collection_exists?(name)
     if tenant_list.present?
       client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATEALIAS',
-                                                                             name: name, collections: tenant_list)
+                                                                             name:, collections: tenant_list)
     else
       client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATE',
-                                                                             name: name)
+                                                                             name:)
     end
   end
 
@@ -106,7 +106,7 @@ def add_solr_endpoint_to_account(account, name)
   def perform_for_normal_tenant(account, name)
     unless collection_exists? name
       client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATE',
-                                                                             name: name)
+                                                                             name:)
     end
     add_solr_endpoint_to_account(account, name)
   end
@@ -128,6 +128,6 @@ def perform_for_cross_search_tenant(account, name)
   def create_shared_search_collection(tenant_list, name)
     return true if collection_exists?(name)
     client.get '/solr/admin/collections', params: collection_options.merge(action: 'CREATEALIAS',
-                                                                           name: name, collections: tenant_list)
+                                                                           name:, collections: tenant_list)
   end
 end
diff --git a/app/jobs/delete_old_guests_job.rb b/app/jobs/delete_old_guests_job.rb
index 8af24d850..51eafba83 100644
--- a/app/jobs/delete_old_guests_job.rb
+++ b/app/jobs/delete_old_guests_job.rb
@@ -7,7 +7,7 @@ class DeleteOldGuestsJob < ApplicationJob
   end
 
   def perform
-    User.unscope(:where).where("guest = ? and updated_at < ?", true, Time.current - 7.days).destroy_all
+    User.unscope(:where).where("guest = ? and updated_at < ?", true, 7.days.ago).destroy_all
   end
 
   private
diff --git a/app/jobs/import_work_from_purl_job.rb b/app/jobs/import_work_from_purl_job.rb
index 9e410926f..efc5dc0e2 100644
--- a/app/jobs/import_work_from_purl_job.rb
+++ b/app/jobs/import_work_from_purl_job.rb
@@ -85,7 +85,7 @@ def process_collection(attributes)
       retry if (retries += 1) < 3
       raise e
     end
-    attributes[:member_of_collection_attributes] = [{ id: id }]
+    attributes[:member_of_collection_attributes] = [{ id: }]
   end
 
   # Override this method if you have a different rubric for choosing the model
diff --git a/app/models/concerns/account_switch.rb b/app/models/concerns/account_switch.rb
index 75e46077f..613dbec60 100644
--- a/app/models/concerns/account_switch.rb
+++ b/app/models/concerns/account_switch.rb
@@ -3,7 +3,7 @@
 module AccountSwitch
   extend ActiveSupport::Concern
 
-  DOMAIN_REGEXP = %r{^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,8}(:[0-9]{1,5})?(/.*)?$}ix.freeze
+  DOMAIN_REGEXP = %r{^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,8}(:[0-9]{1,5})?(/.*)?$}ix
 
   class_methods do
     # rubocop:disable Metrics/MethodLength
diff --git a/app/models/concerns/hyrax/ability/work_ability.rb b/app/models/concerns/hyrax/ability/work_ability.rb
index b025c979c..9d7daebc0 100644
--- a/app/models/concerns/hyrax/ability/work_ability.rb
+++ b/app/models/concerns/hyrax/ability/work_ability.rb
@@ -32,7 +32,7 @@ def admin_set_with_deposit?
 
         return false if ids.empty?
 
-        Hyrax.custom_queries.find_ids_by_model(model: Hyrax::AdministrativeSet, ids: ids).any?
+        Hyrax.custom_queries.find_ids_by_model(model: Hyrax::AdministrativeSet, ids:).any?
       end
     end
   end
diff --git a/app/models/content_block.rb b/app/models/content_block.rb
index 5cf86b992..7fcab340c 100644
--- a/app/models/content_block.rb
+++ b/app/models/content_block.rb
@@ -44,7 +44,7 @@ def whitelisted?(key)
     #
     # @return [Object] either the named block's value or the fallback_value.
     def block_for(name:, fallback_value: false)
-      block = ContentBlock.find_by(name: name)
+      block = ContentBlock.find_by(name:)
       block&.value.presence || fallback_value
     end
 
@@ -53,7 +53,7 @@ def block_for(name:, fallback_value: false)
     # @param name [#to_s] the named content block
     # @param value [Object] the value to update the given content block
     def update_block(name:, value:)
-      find_or_create_by(name: name.to_s).update!(value: value)
+      find_or_create_by(name: name.to_s).update!(value:)
     end
 
     def registered?(key)
@@ -65,7 +65,7 @@ def marketing_text
     end
 
     def marketing_text=(value)
-      marketing_text.update(value: value)
+      marketing_text.update(value:)
     end
 
     def announcement_text
@@ -73,7 +73,7 @@ def announcement_text
     end
 
     def announcement_text=(value)
-      announcement_text.update(value: value)
+      announcement_text.update(value:)
     end
 
     def featured_researcher
@@ -81,7 +81,7 @@ def featured_researcher
     end
 
     def featured_researcher=(value)
-      featured_researcher.update(value: value)
+      featured_researcher.update(value:)
     end
 
     # OVERRIDE Hyrax v3.4.0 to add home_text getter/setter methods - Adding themes
@@ -90,7 +90,7 @@ def home_text
     end
 
     def home_text=(value)
-      home_text.update(value: value)
+      home_text.update(value:)
     end
 
     def homepage_about_section_heading
@@ -98,7 +98,7 @@ def homepage_about_section_heading
     end
 
     def homepage_about_section_heading=(value)
-      homepage_about_section_heading.update(value: value)
+      homepage_about_section_heading.update(value:)
     end
 
     def homepage_about_section_content
@@ -106,7 +106,7 @@ def homepage_about_section_content
     end
 
     def homepage_about_section_content=(value)
-      homepage_about_section_content.update(value: value)
+      homepage_about_section_content.update(value:)
     end
 
     def about_page
@@ -114,7 +114,7 @@ def about_page
     end
 
     def about_page=(value)
-      about_page.update(value: value)
+      about_page.update(value:)
     end
 
     def agreement_page
@@ -123,7 +123,7 @@ def agreement_page
     end
 
     def agreement_page=(value)
-      agreement_page.update(value: value)
+      agreement_page.update(value:)
     end
 
     def help_page
@@ -131,7 +131,7 @@ def help_page
     end
 
     def help_page=(value)
-      help_page.update(value: value)
+      help_page.update(value:)
     end
 
     def terms_page
@@ -140,7 +140,7 @@ def terms_page
     end
 
     def terms_page=(value)
-      terms_page.update(value: value)
+      terms_page.update(value:)
     end
 
     def default_agreement_text
diff --git a/app/models/featured_collection_list.rb b/app/models/featured_collection_list.rb
index 394fb8069..5a1ff6363 100644
--- a/app/models/featured_collection_list.rb
+++ b/app/models/featured_collection_list.rb
@@ -42,7 +42,7 @@ def ids
 
   def collection_presenters
     ability = nil
-    Hyrax::PresenterFactory.build_for(ids: ids,
+    Hyrax::PresenterFactory.build_for(ids:,
                                       presenter_class: Hyku::WorkShowPresenter,
                                       presenter_args: ability)
   end
diff --git a/app/models/hyrax/group.rb b/app/models/hyrax/group.rb
index 9b3d95ab8..290ed6e2f 100644
--- a/app/models/hyrax/group.rb
+++ b/app/models/hyrax/group.rb
@@ -43,7 +43,7 @@ def search_members(query, member_class: DEFAULT_MEMBER_CLASS)
       if query.present? && member_class == DEFAULT_MEMBER_CLASS
         members.where("email LIKE :q OR display_name LIKE :q", q: "%#{query}%")
       else
-        members(member_class: member_class)
+        members(member_class:)
       end
     end
 
diff --git a/app/models/role.rb b/app/models/role.rb
index f30b58e30..7e3b3b543 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Role < ApplicationRecord
-  has_and_belongs_to_many :users, join_table: :users_roles
+  has_many :users, through: :users_roles
   has_many :group_roles, dependent: :destroy
   has_many :groups, through: :group_roles
 
diff --git a/app/models/site.rb b/app/models/site.rb
index 431315297..b250a193c 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -61,7 +61,7 @@ def add_admins_by_email(emails)
     end
     # For new users, send invitation and add to role
     (emails - existing_emails).each do |email|
-      u = User.invite!(email: email)
+      u = User.invite!(email:)
       u.add_role :admin, self
     end
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index a6ef4151e..4a1beb3ab 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -46,11 +46,15 @@ def to_s
     email
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_admin
+    # rubocop:enable Naming/PredicateName
     has_role?(:admin) || has_role?(:admin, Site.instance)
   end
 
+  # rubocop:disable Naming/PredicateName
   def is_superadmin
+    # rubocop:enable Naming/PredicateName
     has_role? :superadmin
   end
 
diff --git a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
index a3368e897..277f902a8 100644
--- a/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
+++ b/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
@@ -45,13 +45,13 @@ def video_display_content(_url, label = '')
         IIIFManifest::V3::DisplayContent.new(
           Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
             solr_document.id,
-            label: label,
+            label:,
             host: request.base_url
           ),
-          label: label,
-          width: width,
-          height: height,
-          duration: duration,
+          label:,
+          width:,
+          height:,
+          duration:,
           type: 'Video',
           format: solr_document.mime_type
         )
@@ -63,11 +63,11 @@ def audio_display_content(_url, label = '')
         IIIFManifest::V3::DisplayContent.new(
           Hyrax::IiifAv::Engine.routes.url_helpers.iiif_av_content_url(
             solr_document.id,
-            label: label,
+            label:,
             host: request.base_url
           ),
-          label: label,
-          duration: duration,
+          label:,
+          duration:,
           type: 'Sound',
           format: solr_document.mime_type
         )
diff --git a/app/presenters/hyku/work_show_presenter.rb b/app/presenters/hyku/work_show_presenter.rb
index a734a52fb..857f7932e 100644
--- a/app/presenters/hyku/work_show_presenter.rb
+++ b/app/presenters/hyku/work_show_presenter.rb
@@ -72,7 +72,7 @@ def iiif_media?(presenter: representative_presenter)
 
     def members_include_viewable?
       file_set_presenters.any? do |presenter|
-        iiif_media?(presenter: presenter) && current_ability.can?(:read, presenter.id)
+        iiif_media?(presenter:) && current_ability.can?(:read, presenter.id)
       end
     end
 
diff --git a/app/presenters/hyrax/collection_presenter_decorator.rb b/app/presenters/hyrax/collection_presenter_decorator.rb
index 3c27b7c4e..ba04cadd2 100644
--- a/app/presenters/hyrax/collection_presenter_decorator.rb
+++ b/app/presenters/hyrax/collection_presenter_decorator.rb
@@ -79,7 +79,7 @@ def banner_file
         filename = File.split(banner_info.first.local_path).last unless banner_info.empty?
         alttext = banner_info.first.alt_text unless banner_info.empty?
         relative_path = "/" + banner_info.first.local_path.split("/")[-4..-1].join("/") unless banner_info.empty?
-        { filename: filename, relative_path: relative_path, alt_text: alttext }
+        { filename:, relative_path:, alt_text: alttext }
       end
     end
 
diff --git a/app/presenters/hyrax/homepage_presenter_decorator.rb b/app/presenters/hyrax/homepage_presenter_decorator.rb
index d75740a20..15b52204e 100644
--- a/app/presenters/hyrax/homepage_presenter_decorator.rb
+++ b/app/presenters/hyrax/homepage_presenter_decorator.rb
@@ -1,4 +1,4 @@
-# # frozen_string_literal: true
+# frozen_string_literal: true
 
 # OVERRIDE Hyrax 5.0 to hide features via flipper
 # hide featured researcher
diff --git a/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb b/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb
index c34dbb167..faf5729f1 100644
--- a/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb
+++ b/app/presenters/hyrax/iiif_manifest_presenter_decorator.rb
@@ -30,7 +30,7 @@ def manifest_url
       return '' if id.blank?
 
       protocol = Site.account.ssl_configured ? 'https' : 'http'
-      Rails.application.routes.url_helpers.polymorphic_url([:manifest, model], host: hostname, protocol: protocol)
+      Rails.application.routes.url_helpers.polymorphic_url([:manifest, model], host: hostname, protocol:)
     end
 
     def iiif_version
diff --git a/app/services/create_account.rb b/app/services/create_account.rb
index d756c17dc..536c2f595 100644
--- a/app/services/create_account.rb
+++ b/app/services/create_account.rb
@@ -57,7 +57,7 @@ def fillin_translations
       oldtitle = c.title
       c.title = I18n.t(c.title.gsub("translation missing: en.", ''))
       c.save
-      Rails.logger.debug "#{oldtitle} changed to #{c.title}"
+      Rails.logger.debug { "#{oldtitle} changed to #{c.title}" }
     end
   end
 
@@ -88,6 +88,6 @@ def schedule_recurring_jobs
   private
 
   def initialize_account_data
-    Site.update(account: account)
+    Site.update(account:)
   end
 end
diff --git a/app/services/hyrax/admin_set_create_service_decorator.rb b/app/services/hyrax/admin_set_create_service_decorator.rb
index 631681a0c..8670b22eb 100644
--- a/app/services/hyrax/admin_set_create_service_decorator.rb
+++ b/app/services/hyrax/admin_set_create_service_decorator.rb
@@ -16,8 +16,8 @@ def create!
           ActiveRecord::Base.transaction do
             permission_template = PermissionTemplate.find_by(source_id: result.id.to_s) ||
                                   permissions_create_service.create_default(collection: result,
-                                                                            creating_user: creating_user)
-            create_workflows_for(permission_template: permission_template)
+                                                                            creating_user:)
+            create_workflows_for(permission_template:)
             # OVERRIDE: Remove call to #create_default_access_for, which granted
             # deposit access to all registered users for the Default Admin Set
           end
@@ -38,12 +38,12 @@ def workflow_agents
     end
 
     def create_workflows_for(permission_template:)
-      workflow_importer.call(permission_template: permission_template)
+      workflow_importer.call(permission_template:)
       # OVERRIDE: Extract and expand upon granting Workflow Roles into service object so it can be used in RolesService
       Hyrax::Workflow::PermissionGrantor
-        .grant_default_workflow_roles!(permission_template: permission_template, creating_user: creating_user)
+        .grant_default_workflow_roles!(permission_template:, creating_user:)
       Sipity::Workflow
-        .activate!(permission_template: permission_template, workflow_name: Hyrax.config.default_active_workflow_name)
+        .activate!(permission_template:, workflow_name: Hyrax.config.default_active_workflow_name)
     end
   end
 end
diff --git a/app/services/hyrax/collection_types/create_service.rb b/app/services/hyrax/collection_types/create_service.rb
index 16955ac6a..38950d7df 100644
--- a/app/services/hyrax/collection_types/create_service.rb
+++ b/app/services/hyrax/collection_types/create_service.rb
@@ -167,7 +167,7 @@ class CreateService # rubocop:disable Metrics/ClassLength
       # @return [Hyrax::CollectionType] the newly created collection type instance
       def self.create_collection_type(machine_id:, title:, options: {})
         opts = DEFAULT_OPTIONS.merge(options).except(:participants)
-        ct = Hyrax::CollectionType.create!(opts.merge(machine_id: machine_id, title: title))
+        ct = Hyrax::CollectionType.create!(opts.merge(machine_id:, title:))
         participants = options[:participants].presence || DEFAULT_OPTIONS[:participants]
         add_participants(ct.id, participants)
         ct
diff --git a/app/services/hyrax/collections/permissions_create_service_decorator.rb b/app/services/hyrax/collections/permissions_create_service_decorator.rb
index 9324f41e7..3f6606761 100644
--- a/app/services/hyrax/collections/permissions_create_service_decorator.rb
+++ b/app/services/hyrax/collections/permissions_create_service_decorator.rb
@@ -58,9 +58,11 @@ def access_grants_attributes(collection_type:, creating_user:, grants:)
               access: Hyrax::PermissionTemplateAccess::VIEW
             }
           end
+          # rubocop:disable Lint/Void
           attribute_list
+          # rubocop:enable Lint/Void
           # OVERRIDE END
-        end + managers_of_collection_type(collection_type: collection_type) + grants
+        end + managers_of_collection_type(collection_type:) + grants
       end
       private :access_grants_attributes
     end
diff --git a/app/services/hyrax/collections/permissions_service_decorator.rb b/app/services/hyrax/collections/permissions_service_decorator.rb
index 7a021dd2f..60a29773e 100644
--- a/app/services/hyrax/collections/permissions_service_decorator.rb
+++ b/app/services/hyrax/collections/permissions_service_decorator.rb
@@ -12,7 +12,7 @@ module PermissionsServiceDecorator
       # to have a whole method JUST for that... maybe make #manage_access_to_collection
       # public or use #send to call the private method directly?
       def can_manage_collection?(collection_id:, ability:)
-        manage_access_to_collection?(collection_id: collection_id, ability: ability)
+        manage_access_to_collection?(collection_id:, ability:)
       end
     end
   end
diff --git a/app/services/hyrax/workflow/permission_grantor.rb b/app/services/hyrax/workflow/permission_grantor.rb
index 1efc530eb..91bb2c362 100644
--- a/app/services/hyrax/workflow/permission_grantor.rb
+++ b/app/services/hyrax/workflow/permission_grantor.rb
@@ -12,7 +12,7 @@ module Workflow
     # @see RolesService
     class PermissionGrantor
       def self.grant_default_workflow_roles!(permission_template:, creating_user: nil)
-        new(permission_template: permission_template, creating_user: creating_user).call
+        new(permission_template:, creating_user:).call
       end
 
       attr_accessor :permission_template, :creating_user
@@ -54,7 +54,7 @@ def grant_all_workflow_roles_to_creating_user_and_admins!
           end
         end
 
-        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: nil)
+        grant_workflow_roles!(workflow_agents:, role_filters: nil)
       end
 
       def grant_workflow_roles_to_editors!
@@ -65,7 +65,7 @@ def grant_workflow_roles_to_editors!
           end
         end
 
-        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: editor_sipity_roles)
+        grant_workflow_roles!(workflow_agents:, role_filters: editor_sipity_roles)
       end
 
       def grant_workflow_roles_to_depositors!
@@ -76,7 +76,7 @@ def grant_workflow_roles_to_depositors!
           end
         end
 
-        grant_workflow_roles!(workflow_agents: workflow_agents, role_filters: depositor_sipity_role)
+        grant_workflow_roles!(workflow_agents:, role_filters: depositor_sipity_role)
       end
 
       def grant_workflow_roles!(workflow_agents:, role_filters:)
@@ -89,7 +89,7 @@ def grant_workflow_roles!(workflow_agents:, role_filters:)
         permission_template.available_workflows.each do |workflow|
           role_set.each do |role|
             Hyrax::Workflow::PermissionGenerator.call(roles: role,
-                                                      workflow: workflow,
+                                                      workflow:,
                                                       agents: workflow_agents)
           end
         end
diff --git a/app/services/hyrax/workflow/permission_query.rb b/app/services/hyrax/workflow/permission_query.rb
index 6673c46b7..e214fd978 100644
--- a/app/services/hyrax/workflow/permission_query.rb
+++ b/app/services/hyrax/workflow/permission_query.rb
@@ -53,8 +53,8 @@ def workflow_roles
       # @param entity [Object] an object that can be converted into a Sipity::Entity
       # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
       def scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
-        workflow_actions_scope = scope_workflow_actions_available_for_current_state(entity: entity)
-        workflow_state_actions_scope = scope_permitted_entity_workflow_state_actions(user: user, entity: entity)
+        workflow_actions_scope = scope_workflow_actions_available_for_current_state(entity:)
+        workflow_state_actions_scope = scope_permitted_entity_workflow_state_actions(user:, entity:)
         workflow_actions_scope.where(
           workflow_actions_scope.arel_table[:id].in(
             workflow_state_actions_scope.arel_table.project(
@@ -157,7 +157,7 @@ def scope_roles_associated_with_the_given_entity(entity:)
       # @return [Boolean]
       def authorized_for_processing?(user:, entity:, action:)
         action_name = Sipity::WorkflowAction.name_for(action)
-        scope_permitted_workflow_actions_available_for_current_state(user: user, entity: entity)
+        scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
           .find_by(Sipity::WorkflowAction.arel_table[:name].eq(action_name)).present?
       end
 
@@ -202,7 +202,7 @@ def scope_entities_for_the_user(user:) # rubocop:disable Metrics/AbcSize, Metric
         workflow_states = Sipity::WorkflowState.arel_table
         workflow_state_action_permissions = Sipity::WorkflowStateActionPermission.arel_table
 
-        user_agent_scope = scope_processing_agents_for(user: user)
+        user_agent_scope = scope_processing_agents_for(user:)
         user_agent_contraints = user_agent_scope.arel_table.project(
           user_agent_scope.arel_table[:id]
         ).where(user_agent_scope.arel.constraints)
@@ -290,7 +290,7 @@ def scope_users_for_entity_and_roles(entity:, roles:) # rubocop:disable Metrics/
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def user_emails_for_entity_and_roles(entity:, roles:)
-        scope_users_for_entity_and_roles(entity: entity, roles: roles).pluck(:email)
+        scope_users_for_entity_and_roles(entity:, roles:).pluck(:email)
       end
 
       # @api public
@@ -304,9 +304,9 @@ def user_emails_for_entity_and_roles(entity:, roles:)
       # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
       def scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
         entity = Sipity::Entity(entity)
-        workflow_scope = scope_processing_workflow_roles_for_user_and_workflow(user: user, workflow: entity.workflow)
+        workflow_scope = scope_processing_workflow_roles_for_user_and_workflow(user:, workflow: entity.workflow)
 
-        entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user: user, entity: entity)
+        entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:)
         Sipity::WorkflowRole.where(
           workflow_scope.arel.constraints.reduce.or(entity_specific_scope.arel.constraints.reduce)
         )
@@ -322,7 +322,7 @@ def scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
       # @param workflow [Sipity::Workflow]
       # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
       def scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
-        agent_constraints = scope_processing_agents_for(user: user)
+        agent_constraints = scope_processing_agents_for(user:)
         workflow_role_subquery = workflow_roles[:id].in(
           workflow_responsibilities.project(workflow_responsibilities[:workflow_role_id])
           .where(
@@ -349,7 +349,7 @@ def scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
       # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
       def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:) # rubocop:disable Metrics/MethodLength
         entity = Sipity::Entity(entity)
-        agent_scope = scope_processing_agents_for(user: user)
+        agent_scope = scope_processing_agents_for(user:)
 
         Sipity::WorkflowRole.where(
           workflow_roles[:id].in(
@@ -391,7 +391,7 @@ def scope_permitted_entity_workflow_state_actions(user:, entity:) # rubocop:disa
         entity = Sipity::Entity(entity)
         workflow_state_actions = Sipity::WorkflowStateAction
         permissions = Sipity::WorkflowStateActionPermission
-        role_scope = scope_processing_workflow_roles_for_user_and_entity(user: user, entity: entity)
+        role_scope = scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
 
         workflow_state_actions.where(
           workflow_state_actions.arel_table[:originating_workflow_state_id].eq(entity.workflow_state_id).and(
@@ -443,7 +443,7 @@ def scope_workflow_actions_for_current_state(entity:)
       # @param entity an object that can be converted into a Sipity::Entity
       # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
       def scope_workflow_actions_available_for_current_state(entity:)
-        workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity: entity)
+        workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity:)
         Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce)
       end
     end
diff --git a/app/services/roles_service.rb b/app/services/roles_service.rb
index 49c670aa0..fc8965229 100644
--- a/app/services/roles_service.rb
+++ b/app/services/roles_service.rb
@@ -71,7 +71,7 @@ def create_default_roles!
       return '`AccountElevator.switch!` into an Account before creating default Roles' if Site.instance.is_a?(NilSite)
 
       DEFAULT_ROLES.each do |role_name|
-        find_or_create_site_role!(role_name: role_name)
+        find_or_create_site_role!(role_name:)
       end
     end
 
@@ -90,7 +90,7 @@ def create_default_hyrax_groups_with_roles!
         group_roles.each do |role_name|
           next if role_name.blank?
 
-          group.roles |= [find_or_create_site_role!(role_name: role_name)]
+          group.roles |= [find_or_create_site_role!(role_name:)]
         end
       end
     end
@@ -241,7 +241,7 @@ def prune_stale_guest_users
       stale_guest_users = User.unscoped.where(
         'guest = ? and updated_at < ?',
         true,
-        Time.current - 7.days
+        7.days.ago
       )
       progress = ProgressBar.create(total: stale_guest_users.count)
 
@@ -253,8 +253,9 @@ def prune_stale_guest_users
 
     # rubocop:disable Metrics/MethodLength
     def seed_superadmin!
+      # rubocop:disable Rails/UnknownEnv
       return 'Seed data should not be used in the production environment' if Rails.env.production? || Rails.env.staging?
-
+      # rubocop:enable Rails/UnknownEnv
       user = User.where(email: 'admin@example.com').first_or_initialize do |u|
         if u.new_record?
           u.password = 'testing123'
@@ -279,8 +280,9 @@ def seed_superadmin!
 
     # rubocop:disable Metrics/MethodLength
     def seed_qa_users!
+      # rubocop:disable Rails/UnknownEnv
       return 'Seed data should not be used in the production environment' if Rails.env.production? || Rails.env.staging?
-
+      # rubocop:disable Rails/UnknownEnv
       ActiveRecord::Base.transaction do
         DEFAULT_ROLES.each do |role_name|
           user = User.where(email: "#{role_name}@example.com").first_or_initialize do |u|
@@ -297,7 +299,7 @@ def seed_qa_users!
 
             unless user.has_role?(role_name, Site.instance)
               user.add_default_group_membership!
-              user.roles << find_or_create_site_role!(role_name: role_name)
+              user.roles << find_or_create_site_role!(role_name:)
             end
           end
 
diff --git a/bin/graph b/bin/graph
index 939279f7e..2fb8e9e3a 100644
--- a/bin/graph
+++ b/bin/graph
@@ -53,7 +53,7 @@ class GraphWriter
   end
 
   def write_edge(initial, terminal, label)
-    graph.add_edges(nodes[initial], nodes[terminal], label: label)
+    graph.add_edges(nodes[initial], nodes[terminal], label:)
   end
 
   def attach_edges
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index e294580f0..9dec7f411 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -51,7 +51,7 @@
     # Therefore cannot be used as effectively as ActiveRecord hooks.
     Apartment::Tenant.adapter.class.set_callback :switch, :after, lambda {
       account = Account.find_by(tenant: current)
-      account.switch! if account
+      account&.switch!
     }
   end
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index eb1ed09f6..a7cd551c8 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -301,10 +301,10 @@
 
   [:cas, :openid_connect, :saml].each do |provider|
     path_prefix = "/users/auth/#{provider}"
-    handler = OmniAuth::MultiProvider::Handler.new(path_prefix: path_prefix,
-                                                   identity_provider_id_regex: identity_provider_id_regex,
+    handler = OmniAuth::MultiProvider::Handler.new(path_prefix:,
+                                                   identity_provider_id_regex:,
       &dynamic_options_generator)
-    static_options = { path_prefix: path_prefix }
+    static_options = { path_prefix: }
 
     config.omniauth provider, static_options.merge(handler.provider_options)
   end
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index f8eced815..04954e5e1 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -119,7 +119,7 @@
     if Site.account&.s3_bucket
       "uploads/#{Apartment::Tenant.current}"
     else
-      ENV['HYRAX_UPLOAD_PATH'].present? ? Pathname.new(File.join(ENV['HYRAX_UPLOAD_PATH'], Apartment::Tenant.current)) : Rails.root.join('public', 'uploads', Apartment::Tenant.current)
+      ENV['HYRAX_UPLOAD_PATH'].present? ? Pathname.new(File.join(ENV['HYRAX_UPLOAD_PATH'], Apartment::Tenant.current)) : Rails.public_path.join('uploads', Apartment::Tenant.current)
     end
   }
 
@@ -178,7 +178,7 @@
     # Issue with Hyrax v 2.9.0 where IIIF has mixed content error when running with SSL enabled
     # See Samvera Slack thread https://samvera.slack.com/archives/C0F9JQJDQ/p1596718417351200?thread_ts=1596717896.350700&cid=C0F9JQJDQ
     base_url = base_url.sub(/\Ahttp:/, 'https:')
-    Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size: size)
+    Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size:)
   end
 
   config.iiif_info_url_builder = lambda do |file_id, base_url|
diff --git a/config/routes.rb b/config/routes.rb
index cf42c9caa..1de3009e6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,10 +62,7 @@
         as: "user_#{provider}_omniauth_authorize",
         via: OmniAuth.config.allowed_request_methods
 
-      match "#{path_prefix}/#{provider}/:id/metadata",
-        to: "users/omniauth_callbacks#passthru",
-        as: "user_#{provider}_omniauth_metadata",
-        via: [:get]
+      get "#{path_prefix}/#{provider}/:id/metadata", to: "users/omniauth_callbacks#passthru", as: "user_#{provider}_omniauth_metadata"
 
       match "#{path_prefix}/#{provider}/:id/callback",
         to: "users/omniauth_callbacks##{provider}",
diff --git a/lib/importer/factory/collection_factory.rb b/lib/importer/factory/collection_factory.rb
index 9580c555a..d3c8ebf33 100644
--- a/lib/importer/factory/collection_factory.rb
+++ b/lib/importer/factory/collection_factory.rb
@@ -14,7 +14,7 @@ def find_or_create
 
       def update
         raise "Collection doesn't exist" unless object
-        object.attributes = update_attributes
+        object.attributes = update
         run_callbacks(:save) do
           object.save!
         end
diff --git a/lib/importer/factory/object_factory.rb b/lib/importer/factory/object_factory.rb
index 1a1bbab92..aae8c1b3f 100644
--- a/lib/importer/factory/object_factory.rb
+++ b/lib/importer/factory/object_factory.rb
@@ -17,7 +17,7 @@ def initialize(attributes, files_dir = nil, files = [])
       end
 
       def run
-        arg_hash = { id: attributes[:id], name: 'UPDATE', klass: klass }
+        arg_hash = { id: attributes[:id], name: 'UPDATE', klass: }
         @object = find
         if @object
           ActiveSupport::Notifications.instrument('import.importer', arg_hash) { update }
@@ -31,14 +31,14 @@ def run
       def update
         raise "Object doesn't exist" unless object
         run_callbacks(:save) do
-          work_actor.update(environment(update_attributes))
+          work_actor.update(environment(update))
         end
         log_updated(object)
       end
 
       def create_attributes
         if klass == Collection
-          { collection_type: collection_type }.merge(transform_attributes)
+          { collection_type: }.merge(transform_attributes)
         else
           transform_attributes
         end
diff --git a/lib/importer/mods_parser.rb b/lib/importer/mods_parser.rb
index 34c62cccb..a3013d6ce 100644
--- a/lib/importer/mods_parser.rb
+++ b/lib/importer/mods_parser.rb
@@ -52,7 +52,7 @@ def attributes
     end
 
     def record_attributes
-      common_attributes.merge(collection: collection, series_name: series_name)
+      common_attributes.merge(collection:, series_name:)
                        .merge(files)
     end
 
@@ -85,16 +85,16 @@ def description
         title: untyped_title,
         alternative: alt_title,
         description: mods_description,
-        subject: subject,
+        subject:,
         extent: mods.physical_description.extent.map { |node| strip_whitespace(node.text) },
-        language: language,
+        language:,
         digital_origin: mods.physical_description.digitalOrigin.map(&:text),
         publisher: mods.origin_info.publisher.map(&:text),
         form_of_work: mods.genre.valueURI.map { |uri| RDF::URI.new(uri) },
-        resource_type: resource_type,
-        citation: citation,
+        resource_type:,
+        citation:,
         notes_attributes: notes,
-        record_origin: record_origin,
+        record_origin:,
         description_standard: mods.record_info.descriptionStandard.map(&:text)
       }
     end
@@ -123,7 +123,7 @@ def rights
     def locations
       {
         location: mods.subject.geographic.valueURI.map { |uri| RDF::URI.new(uri) },
-        sub_location: sub_location,
+        sub_location:,
         institution: institutional_location,
         place_of_publication: mods.origin_info.place.placeTerm.map(&:text)
       }.merge(coordinates)
diff --git a/lib/oai/provider/metadata_format/hyku_dublin_core.rb b/lib/oai/provider/metadata_format/hyku_dublin_core.rb
index e6a996397..02998e3c3 100644
--- a/lib/oai/provider/metadata_format/hyku_dublin_core.rb
+++ b/lib/oai/provider/metadata_format/hyku_dublin_core.rb
@@ -4,7 +4,9 @@ module OAI
   module Provider
     module MetadataFormat
       class HykuDublinCore < OAI::Provider::Metadata::Format
+        # rubocop:disable Lint/MissingSuper
         def initialize
+          # rubocop:enable Lint/MissingSuper
           @prefix = 'oai_hyku'
           @schema = 'http://dublincore.org/schemas/xmls/qdc/dcterms.xsd'
           @namespace = 'http://purl.org/dc/terms/'
diff --git a/lib/stanford/importer/mods_parser.rb b/lib/stanford/importer/mods_parser.rb
index 7d61b74de..d8ccff486 100644
--- a/lib/stanford/importer/mods_parser.rb
+++ b/lib/stanford/importer/mods_parser.rb
@@ -32,7 +32,7 @@ def collection_id
 
       def identifier
         id = File.basename(filename, '.mods').sub(/\Adruid_/, '')
-        { identifier: Array.wrap(id), id: id }
+        { identifier: Array.wrap(id), id: }
       end
 
       def open_access
diff --git a/lib/stanford/importer/purl_parser.rb b/lib/stanford/importer/purl_parser.rb
index 314b32dcf..b3e42511a 100644
--- a/lib/stanford/importer/purl_parser.rb
+++ b/lib/stanford/importer/purl_parser.rb
@@ -49,7 +49,7 @@ def attributes
       end
 
       def record_attributes
-        common_attributes.merge(collection: collection)
+        common_attributes.merge(collection:)
                          .merge(files)
       end
 
@@ -67,7 +67,7 @@ def common_attributes
           .merge(dates)
           .merge(locations)
           .merge(rights)
-          .merge(visibility: visibility)
+          .merge(visibility:)
           .merge(identifiers)
           .merge(relations)
       end
@@ -76,11 +76,11 @@ def description
         {
           title: untyped_title,
           description: dc_description,
-          subject: subject,
-          language: language,
+          subject:,
+          language:,
           form_of_work: oai.xpath('./dc:format', DC_NS).map(&:text),
-          resource_type: resource_type,
-          record_origin: record_origin
+          resource_type:,
+          record_origin:
         }
       end
 
diff --git a/lib/tasks/rubocop.rake b/lib/tasks/rubocop.rake
index 86de3ac8d..23ce113db 100644
--- a/lib/tasks/rubocop.rake
+++ b/lib/tasks/rubocop.rake
@@ -7,5 +7,7 @@ begin
     task.requires << 'rubocop-rspec'
     task.fail_on_error = true
   end
+# rubocop:disable Lint/SuppressedException
 rescue LoadError
+  # rubocop: enable Lint/SuppressedException
 end
diff --git a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
index d54534924..03c4dc724 100644
--- a/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
+++ b/lib/wings/services/custom_queries/find_ids_by_model_decorator.rb
@@ -16,7 +16,7 @@ module FindIdsByModelDecorator
       #
       # @return [Enumerable<Valkyrie::ID>]
       def find_ids_by_model(model:, ids: :all) # rubocop:disable Metrics/MethodLength
-        return enum_for(:find_ids_by_model, model: model, ids: ids) unless block_given?
+        return enum_for(:find_ids_by_model, model:, ids:) unless block_given?
         model_name = ModelRegistry.lookup(model).model_name
 
         solr_query = "_query_:\"{!raw f=has_model_ssim}#{model_name}\""
diff --git a/spec/abilities/collection_ability_spec.rb b/spec/abilities/collection_ability_spec.rb
index 5035e5a8a..17b70f9a5 100644
--- a/spec/abilities/collection_ability_spec.rb
+++ b/spec/abilities/collection_ability_spec.rb
@@ -21,7 +21,7 @@
         :collection_lw,
         id: 'col_au',
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -54,7 +54,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -139,7 +139,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -226,7 +226,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -311,7 +311,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -356,7 +356,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -403,7 +403,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
@@ -451,7 +451,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
 
diff --git a/spec/abilities/solr_document_ability_spec.rb b/spec/abilities/solr_document_ability_spec.rb
index ba5ba2033..529539b80 100644
--- a/spec/abilities/solr_document_ability_spec.rb
+++ b/spec/abilities/solr_document_ability_spec.rb
@@ -19,7 +19,7 @@
       create(
         :collection_lw,
         with_permission_template: true,
-        collection_type_gid: collection_type_gid
+        collection_type_gid:
       )
     end
     let!(:solr_document) { SolrDocument.new(collection.to_solr) }
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 158c2decc..904e1ed9a 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -23,7 +23,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
     end
 
     describe "GET #edit" do
diff --git a/spec/controllers/hyrax/generic_works_controller_spec.rb b/spec/controllers/hyrax/generic_works_controller_spec.rb
index 65d075285..8f152e8e4 100644
--- a/spec/controllers/hyrax/generic_works_controller_spec.rb
+++ b/spec/controllers/hyrax/generic_works_controller_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe Hyrax::GenericWorksController do
   let(:user) { FactoryBot.create(:user) }
-  let(:work) { FactoryBot.create(:work_with_one_file, user: user) }
+  let(:work) { FactoryBot.create(:work_with_one_file, user:) }
   let(:file_set) { work.ordered_members.to_a.first }
 
   before do
diff --git a/spec/controllers/hyrax/homepage_controller_spec.rb b/spec/controllers/hyrax/homepage_controller_spec.rb
index 06a1110e0..82cc45800 100644
--- a/spec/controllers/hyrax/homepage_controller_spec.rb
+++ b/spec/controllers/hyrax/homepage_controller_spec.rb
@@ -86,7 +86,7 @@
       it "initializes the presenter with ability and a list of collections" do
         expect(Hyrax::HomepagePresenter).to receive(:new)
                                         .with(controller.current_ability, ["collection results"])
-                                        .and_return(presenter)
+          .and_return(presenter)
         get :index
         expect(response).to be_successful
         expect(assigns(:presenter)).to eq presenter
@@ -94,7 +94,7 @@
     end
 
     context "with featured works" do
-      let!(:my_work) { create(:work, user: user) }
+      let!(:my_work) { create(:work, user:) }
 
       before do
         FeaturedWork.create!(work_id: my_work.id)
@@ -150,7 +150,7 @@
           allow(controller).to receive(:home_page_theme).and_return('institutional_repository')
         end
         # rubocop:disable RSpec/LetSetup
-        let!(:work_with_resource_type) { create(:work, user: user, resource_type: ['Article']) }
+        let!(:work_with_resource_type) { create(:work, user:, resource_type: ['Article']) }
 
         # rubocop:enable RSpec/LetSetup
 
diff --git a/spec/controllers/hyrax/images_controller_spec.rb b/spec/controllers/hyrax/images_controller_spec.rb
index 06b48c7c4..3bad75c9c 100644
--- a/spec/controllers/hyrax/images_controller_spec.rb
+++ b/spec/controllers/hyrax/images_controller_spec.rb
@@ -7,7 +7,7 @@
 
 RSpec.describe Hyrax::ImagesController do
   let(:user) { FactoryBot.create(:user) }
-  let(:work) { FactoryBot.create(:work_with_one_file, user: user) }
+  let(:work) { FactoryBot.create(:work_with_one_file, user:) }
   let(:file_set) { work.ordered_members.to_a.first }
 
   before do
diff --git a/spec/controllers/proprietor/accounts_controller_spec.rb b/spec/controllers/proprietor/accounts_controller_spec.rb
index 93bd83e8f..360d495a0 100644
--- a/spec/controllers/proprietor/accounts_controller_spec.rb
+++ b/spec/controllers/proprietor/accounts_controller_spec.rb
@@ -48,7 +48,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
     end
 
     describe "GET #index" do
@@ -184,7 +184,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
       allow(controller).to receive(:current_account).and_return(account)
     end
 
diff --git a/spec/controllers/proprietor/users_controller_spec.rb b/spec/controllers/proprietor/users_controller_spec.rb
index e6fce5a2d..a961f20aa 100644
--- a/spec/controllers/proprietor/users_controller_spec.rb
+++ b/spec/controllers/proprietor/users_controller_spec.rb
@@ -39,7 +39,7 @@
     let(:account) { FactoryBot.create(:account) }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
     end
 
     describe "GET #index" do
diff --git a/spec/factories/accounts.rb b/spec/factories/accounts.rb
index 9519a3d7d..6bb6379a1 100644
--- a/spec/factories/accounts.rb
+++ b/spec/factories/accounts.rb
@@ -40,7 +40,7 @@
       domain_names_count { 1 }
     end
     after(:create) do |account, evaluator|
-      create_list(:domain_name, evaluator.domain_names_count, account: account)
+      create_list(:domain_name, evaluator.domain_names_count, account:)
     end
 
     trait(:public_schema) do
@@ -62,7 +62,7 @@
       domain_names_count { 1 }
     end
     after(:create) do |account, evaluator|
-      create_list(:domain_name, evaluator.domain_names_count, account: account)
+      create_list(:domain_name, evaluator.domain_names_count, account:)
     end
   end
 end
diff --git a/spec/factories/permission_templates.rb b/spec/factories/permission_templates.rb
index 6d02a4312..127f1376a 100644
--- a/spec/factories/permission_templates.rb
+++ b/spec/factories/permission_templates.rb
@@ -39,15 +39,15 @@
 
     after(:create) do |permission_template, evaluator|
       if evaluator.with_workflows
-        Hyrax::Workflow::WorkflowImporter.load_workflow_for(permission_template: permission_template)
+        Hyrax::Workflow::WorkflowImporter.load_workflow_for(permission_template:)
         Sipity::Workflow.activate!(
-          permission_template: permission_template,
-          workflow_id: permission_template.available_workflows.pluck(:id).first
+          permission_template:,
+          workflow_id: permission_template.available_workflows.pick(:id)
         )
       end
       if evaluator.with_active_workflow
-        workflow = create(:workflow, active: true, permission_template: permission_template)
-        create(:workflow_action, workflow: workflow) # Need to create a single action that can be taken
+        workflow = create(:workflow, active: true, permission_template:)
+        create(:workflow_action, workflow:) # Need to create a single action that can be taken
       end
       AccessHelper.create_access(permission_template, 'user', :manage, evaluator.manage_users) if evaluator.manage_users.present?
       AccessHelper.create_access(permission_template, 'group', :manage, evaluator.manage_groups) if evaluator.manage_groups.present?
@@ -77,8 +77,8 @@ def self.create_access(permission_template_id, agent_type, access, agent_ids)
         FactoryBot.create(:permission_template_access,
                           access,
                           permission_template: permission_template_id,
-                          agent_type: agent_type,
-                          agent_id: agent_id)
+                          agent_type:,
+                          agent_id:)
       end
     end
   end
diff --git a/spec/features/admin_set_form_participants_tab_spec.rb b/spec/features/admin_set_form_participants_tab_spec.rb
index 13bea005e..b65f3f5cb 100644
--- a/spec/features/admin_set_form_participants_tab_spec.rb
+++ b/spec/features/admin_set_form_participants_tab_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
 
       login_as admin
diff --git a/spec/features/appearance_theme_spec.rb b/spec/features/appearance_theme_spec.rb
index 2abccdd6b..6495d6b4a 100644
--- a/spec/features/appearance_theme_spec.rb
+++ b/spec/features/appearance_theme_spec.rb
@@ -12,7 +12,7 @@
     create(:generic_work,
            title: ['Llamas and Alpacas'],
            keyword: ['llama', 'alpaca'],
-           user: user)
+           user:)
   end
 
   # rubocop:enable RSpec/LetSetup
diff --git a/spec/features/assign_workflow_to_group_spec.rb b/spec/features/assign_workflow_to_group_spec.rb
index e6d791630..0ea86069f 100644
--- a/spec/features/assign_workflow_to_group_spec.rb
+++ b/spec/features/assign_workflow_to_group_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
     end
 
diff --git a/spec/features/collection_manager_role_spec.rb b/spec/features/collection_manager_role_spec.rb
index a46118dc7..8f73c6b40 100644
--- a/spec/features/collection_manager_role_spec.rb
+++ b/spec/features/collection_manager_role_spec.rb
@@ -213,7 +213,7 @@
       it 'can add an existing work to a collection' do
         # Make current_user the depositor because the "Add existing works to this collection"
         # button navigates to the My Works index view
-        work = FactoryBot.create(:work, user: user)
+        work = FactoryBot.create(:work, user:)
         expect(collection.member_work_ids).to be_empty
 
         visit "/dashboard/collections/#{collection.id}"
@@ -461,7 +461,7 @@
       it 'can add an existing work to a collection' do
         # Make current_user the depositor because the "Add existing works to this collection"
         # button navigates to the My Works index view
-        work = FactoryBot.create(:work, user: user)
+        work = FactoryBot.create(:work, user:)
         expect(collection.member_work_ids).to be_empty
 
         visit "/dashboard/collections/#{collection.id}"
diff --git a/spec/features/collection_spec.rb b/spec/features/collection_spec.rb
index 93d3a1795..623bd0935 100644
--- a/spec/features/collection_spec.rb
+++ b/spec/features/collection_spec.rb
@@ -4,25 +4,25 @@
 RSpec.describe 'collection', type: :feature, js: true, clean: true do
   let(:user) { create(:user) }
 
-  let(:collection1) { create(:public_collection_lw, user: user) }
-  let(:collection2) { create(:public_collection_lw, user: user) }
+  let(:collection1) { create(:public_collection_lw, user:) }
+  let(:collection2) { create(:public_collection_lw, user:) }
 
   describe 'collection show page' do
     let(:collection) do
       create(
         :public_collection_lw,
-        user: user, description: ['collection description'],
+        user:, description: ['collection description'],
         collection_type_settings: :nestable
       )
     end
-    let!(:work1) { create(:work, title: ["King Louie"], member_of_collections: [collection], user: user) }
-    let!(:work2) { create(:work, title: ["King Kong"], member_of_collections: [collection], user: user) }
+    let!(:work1) { create(:work, title: ["King Louie"], member_of_collections: [collection], user:) }
+    let!(:work2) { create(:work, title: ["King Kong"], member_of_collections: [collection], user:) }
     let!(:col1) do
       create(
         :public_collection_lw,
         title: ["Sub-collection 1"],
         member_of_collections: [collection],
-        user: user
+        user:
       )
     end
     let!(:col2) do
@@ -30,7 +30,7 @@
         :public_collection_lw,
         title: ["Sub-collection 2"],
         member_of_collections: [collection],
-        user: user
+        user:
       )
     end
 
@@ -89,7 +89,7 @@
       let(:collection) do
         build(
           :public_collection_lw,
-          user: user,
+          user:,
           description: ['collection description'],
           collection_type_settings: :not_nestable,
           with_solr_document: true, with_permission_template: true
@@ -119,7 +119,7 @@
 
       login_as user
     end
-    let(:collection) { create(:named_collection_lw, user: user) }
+    let(:collection) { create(:named_collection_lw, user:) }
 
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit "/collections/#{collection.id}"
@@ -141,7 +141,7 @@
 
       login_as user
     end
-    let(:collection) { create(:named_collection_lw, user: user) }
+    let(:collection) { create(:named_collection_lw, user:) }
 
     it "shows a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit "/collections/#{collection.id}"
@@ -262,7 +262,7 @@
 
       before do
         collection.permission_template.access_grants.find_or_create_by!(
-          access: access,
+          access:,
           agent_type: Hyrax::PermissionTemplateAccess::GROUP,
           agent_id: 'admin'
         )
diff --git a/spec/features/create_generic_work_spec.rb b/spec/features/create_generic_work_spec.rb
index 1490a6710..0b730c7ba 100644
--- a/spec/features/create_generic_work_spec.rb
+++ b/spec/features/create_generic_work_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
     end
 
@@ -26,7 +26,7 @@
       create(:editors_group)
       create(:depositors_group)
       # Create a single action that can be taken
-      Sipity::WorkflowAction.create!(name: 'submit', workflow: workflow)
+      Sipity::WorkflowAction.create!(name: 'submit', workflow:)
 
       # Grant the user access to deposit into the admin set.
       Hyrax::PermissionTemplateAccess.create!(
diff --git a/spec/features/create_image_spec.rb b/spec/features/create_image_spec.rb
index 8cd1cf796..7f3d9571d 100644
--- a/spec/features/create_image_spec.rb
+++ b/spec/features/create_image_spec.rb
@@ -16,7 +16,7 @@
       Sipity::Workflow.create!(
         active: true,
         name: 'test-workflow',
-        permission_template: permission_template
+        permission_template:
       )
     end
 
@@ -26,7 +26,7 @@
       create(:editors_group)
       create(:depositors_group)
       # Create a single action that can be taken
-      Sipity::WorkflowAction.create!(name: 'submit', workflow: workflow)
+      Sipity::WorkflowAction.create!(name: 'submit', workflow:)
 
       # Grant the user access to deposit into the admin set.
       Hyrax::PermissionTemplateAccess.create!(
diff --git a/spec/features/cultural_repository_theme_spec.rb b/spec/features/cultural_repository_theme_spec.rb
index 95d815545..b006a214a 100644
--- a/spec/features/cultural_repository_theme_spec.rb
+++ b/spec/features/cultural_repository_theme_spec.rb
@@ -12,7 +12,7 @@
     create(:generic_work,
            title: ['Llamas and Alpacas'],
            keyword: ['llama', 'alpaca'],
-           user: user)
+           user:)
   end
 
   # rubocop:enable RSpec/LetSetup
diff --git a/spec/features/featured_collections_spec.rb b/spec/features/featured_collections_spec.rb
index 67c756d82..14a9e61d4 100644
--- a/spec/features/featured_collections_spec.rb
+++ b/spec/features/featured_collections_spec.rb
@@ -5,11 +5,11 @@
 RSpec.describe "The homepage", :clean_repo do
   let(:user) { create(:user).tap { |u| u.add_role(:admin, Site.instance) } }
   let(:account) { create(:account) }
-  let(:collection1) { create(:collection, user: user) }
-  let(:collection2) { create(:collection, user: user) }
+  let(:collection1) { create(:collection, user:) }
+  let(:collection2) { create(:collection, user:) }
 
   before do
-    Site.update(account: account)
+    Site.update(account:)
     create(:featured_collection, collection_id: collection1.id)
   end
 
diff --git a/spec/features/institutional_repository_theme_spec.rb b/spec/features/institutional_repository_theme_spec.rb
index 46521c417..d7ca4673f 100644
--- a/spec/features/institutional_repository_theme_spec.rb
+++ b/spec/features/institutional_repository_theme_spec.rb
@@ -11,7 +11,7 @@
            title: ['Llamas and Alpacas'],
            keyword: ['llama', 'alpaca'],
            resource_type: ['Software or Program Code'],
-           user: user)
+           user:)
   end
 
   context 'as a repository admin' do
diff --git a/spec/features/oai_pmh_spec.rb b/spec/features/oai_pmh_spec.rb
index 1c3ba1d68..140c6dae9 100644
--- a/spec/features/oai_pmh_spec.rb
+++ b/spec/features/oai_pmh_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "OAI PMH Support", type: :feature do
   let(:user) { create(:user) }
-  let(:work) { create(:work, user: user) }
+  let(:work) { create(:work, user:) }
   let(:identifier) { work.id }
 
   before do
@@ -26,7 +26,7 @@
         end
 
         it 'retrieves a single record' do
-          visit oai_catalog_path(verb: 'GetRecord', metadataPrefix: metadata_prefix, identifier: identifier)
+          visit oai_catalog_path(verb: 'GetRecord', metadataPrefix: metadata_prefix, identifier:)
           expect(page).to have_content("hyku:#{identifier}")
           expect(page).to have_content(work.title.first)
         end
diff --git a/spec/features/show_page_theme_spec.rb b/spec/features/show_page_theme_spec.rb
index 2e66de5b3..05afa2755 100644
--- a/spec/features/show_page_theme_spec.rb
+++ b/spec/features/show_page_theme_spec.rb
@@ -10,7 +10,7 @@
     create(:generic_work,
            title: ['Giant Pandas and Red Pandas'],
            keyword: ['panda'],
-           user: user)
+           user:)
   end
 
   let(:admin_set_id) { Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id }
@@ -19,7 +19,7 @@
     Sipity::Workflow.create!(
       active: true,
       name: 'test-workflow',
-      permission_template: permission_template
+      permission_template:
     )
   end
 
diff --git a/spec/features/work_approval_permissions_spec.rb b/spec/features/work_approval_permissions_spec.rb
index 73b40d4b2..1a62c7a47 100644
--- a/spec/features/work_approval_permissions_spec.rb
+++ b/spec/features/work_approval_permissions_spec.rb
@@ -14,7 +14,7 @@
   let!(:admin_set) do
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('one_step_mediated_deposit')
     admin_set = AdminSet.new(title: ['Mediated Deposit Admin Set'])
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_creator, admin_set.id, 'open') }
diff --git a/spec/features/work_editor_role_spec.rb b/spec/features/work_editor_role_spec.rb
index 3c8f90979..ac2ffb293 100644
--- a/spec/features/work_editor_role_spec.rb
+++ b/spec/features/work_editor_role_spec.rb
@@ -21,7 +21,7 @@
   let!(:admin_set) do
     admin_set = AdminSet.new(title: ['Test Admin Set'])
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('default')
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_depositor, admin_set.id, visibility) }
diff --git a/spec/forms/hyrax/forms/permission_template_form_spec.rb b/spec/forms/hyrax/forms/permission_template_form_spec.rb
index 45508bdfa..df35f09df 100644
--- a/spec/forms/hyrax/forms/permission_template_form_spec.rb
+++ b/spec/forms/hyrax/forms/permission_template_form_spec.rb
@@ -147,12 +147,12 @@ def count_workflow_responsibilities_for(user)
     before do
       create(:permission_template_access,
              :manage,
-             permission_template: permission_template,
+             permission_template:,
              agent_type: 'user',
              agent_id: user.user_key)
       create(:permission_template_access,
              :manage,
-             permission_template: permission_template,
+             permission_template:,
              agent_type: 'group',
              agent_id: 'archivists')
       create(:group, name: 'archivists')
@@ -165,22 +165,22 @@ def count_workflow_responsibilities_for(user)
                                           access: "manage").permit!]
       end
       let(:workflow) do
-        create(:workflow, permission_template: permission_template)
+        create(:workflow, permission_template:)
       end
 
       before do
         role = Sipity::Role.create(name: 'approving')
-        workflow.workflow_roles.create(role: role)
+        workflow.workflow_roles.create(role:)
         # We are testing that this workflow role is removed
         Hyrax::Workflow::PermissionGenerator.call(roles: role,
-                                                  workflow: workflow,
+                                                  workflow:,
                                                   agents: user3)
         permission_template.update!(active_workflow: workflow)
       end
 
       def count_workflow_roles_for(user)
         Hyrax::Workflow::PermissionQuery
-          .scope_processing_workflow_roles_for_user_and_workflow(user: user, workflow: workflow)
+          .scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
           .size
       end
 
@@ -346,7 +346,7 @@ def count_workflow_roles_for(user)
 
     context "for a workflow change" do
       let(:permission_template) { create(:permission_template, source_id: admin_set.id, with_active_workflow: true) }
-      let(:new_workflow) { create(:workflow, permission_template: permission_template, active: false) }
+      let(:new_workflow) { create(:workflow, permission_template:, active: false) }
       let(:input_params) do
         ActionController::Parameters.new(
           workflow_id: new_workflow.id
@@ -367,7 +367,7 @@ def count_workflow_roles_for(user)
     end
 
     let(:attributes) { { workflow_id: workflow.id } }
-    let(:workflow) { create(:workflow, permission_template: permission_template, active: true) }
+    let(:workflow) { create(:workflow, permission_template:, active: true) }
     let(:user) { create(:user) }
     let(:role1) { Sipity::Role.create!(name: 'hello') }
     let(:role2) { Sipity::Role.create!(name: 'goodbye') }
@@ -417,11 +417,11 @@ def count_workflow_roles_for(user)
       let(:error_code) { nil }
       let(:attributes) do
         {
-          visibility: visibility,
-          release_date: release_date,
-          release_period: release_period,
-          release_varies: release_varies,
-          release_embargo: release_embargo
+          visibility:,
+          release_date:,
+          release_period:,
+          release_varies:,
+          release_embargo:
         }
       end
       let(:ac_params) do
@@ -438,7 +438,7 @@ def count_workflow_roles_for(user)
         let(:response) { form.update(ac_params) }
 
         it 'trigger error from #update' do
-          expect(response).to eq(content_tab: "visibility", updated: false, error_code: error_code)
+          expect(response).to eq(content_tab: "visibility", updated: false, error_code:)
           expect(
             I18n.t(
               response[:error_code],
diff --git a/spec/helpers/shared_search_helper_spec.rb b/spec/helpers/shared_search_helper_spec.rb
index 8cce1cd38..4005572fb 100644
--- a/spec/helpers/shared_search_helper_spec.rb
+++ b/spec/helpers/shared_search_helper_spec.rb
@@ -5,7 +5,7 @@
 
   context "shared search records" do
     let(:cname) { 'hyku-me.test' }
-    let(:account) { build(:search_only_account, cname: cname) }
+    let(:account) { build(:search_only_account, cname:) }
 
     let(:uuid) { SecureRandom.uuid }
     let(:request) { instance_double(ActionDispatch::Request, port: 3000, protocol: "https://", host: account.cname) }
diff --git a/spec/indexers/app_indexer_spec.rb b/spec/indexers/app_indexer_spec.rb
index 9d96ece20..6bab43f46 100644
--- a/spec/indexers/app_indexer_spec.rb
+++ b/spec/indexers/app_indexer_spec.rb
@@ -15,7 +15,7 @@
       end
 
       Apartment::Tenant.switch!(account.tenant) do
-        Site.update(account: account)
+        Site.update(account:)
         work
       end
     end
diff --git a/spec/jobs/import_work_from_purl_job_spec.rb b/spec/jobs/import_work_from_purl_job_spec.rb
index 06c759fba..50b555185 100644
--- a/spec/jobs/import_work_from_purl_job_spec.rb
+++ b/spec/jobs/import_work_from_purl_job_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe ImportWorkFromPurlJob do
   let(:user) { create(:user) }
-  let(:log) { Hyrax::Operation.create!(user: user, operation_type: "Import Purl Metadata") }
+  let(:log) { Hyrax::Operation.create!(user:, operation_type: "Import Purl Metadata") }
   let(:druid) { 'bc390xk2647' }
   before do
     stub_request(:get, "https://purl.stanford.edu/bc390xk2647.xml")
diff --git a/spec/lib/importer/factory/etd_factory_spec.rb b/spec/lib/importer/factory/etd_factory_spec.rb
index ba2c793be..2910697af 100644
--- a/spec/lib/importer/factory/etd_factory_spec.rb
+++ b/spec/lib/importer/factory/etd_factory_spec.rb
@@ -12,7 +12,7 @@
     let(:attributes) do
       {
         collection: { id: coll.id },
-        files: files,
+        files:,
         identifier: ['123'],
         title: ['Test image'],
         read_groups: ['public'],
diff --git a/spec/lib/importer/factory/image_factory_spec.rb b/spec/lib/importer/factory/image_factory_spec.rb
index 31f215d7a..464776554 100644
--- a/spec/lib/importer/factory/image_factory_spec.rb
+++ b/spec/lib/importer/factory/image_factory_spec.rb
@@ -12,7 +12,7 @@
     let(:attributes) do
       {
         collection: { id: coll.id },
-        files: files,
+        files:,
         identifier: ['123'],
         title: ['Test image'],
         read_groups: ['public'],
diff --git a/spec/lib/importer/factory/string_literal_processor_spec.rb b/spec/lib/importer/factory/string_literal_processor_spec.rb
index 51da13381..5bec71bbb 100644
--- a/spec/lib/importer/factory/string_literal_processor_spec.rb
+++ b/spec/lib/importer/factory/string_literal_processor_spec.rb
@@ -7,7 +7,7 @@
 
   let(:input) do
     { title: ["Stanford residences"],
-      contributor: [{ name: name, type: "corporate" }] }
+      contributor: [{ name:, type: "corporate" }] }
   end
 
   context "with a single name" do
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 915081436..4509ac097 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -348,7 +348,7 @@
     let!(:account) { FactoryBot.create(:account, tenant: "59500a46-b1fb-412d-94d6-b928e91ef4d9") }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
       Site.instance.admin_emails = ["test@test.com", "test@test.org"]
     end
 
@@ -362,7 +362,7 @@
     let!(:account) { FactoryBot.create(:account, tenant: "02839e1d-b4a4-451a-ab83-4b8968621f1e") }
 
     before do
-      Site.update(account: account)
+      Site.update(account:)
       Site.instance.admin_emails = ["test@test.com", "test@test.org"]
     end
 
diff --git a/spec/models/collection_spec.rb b/spec/models/collection_spec.rb
index c7cc26b21..6ffcd6d21 100644
--- a/spec/models/collection_spec.rb
+++ b/spec/models/collection_spec.rb
@@ -5,10 +5,10 @@
 RSpec.describe Collection do
   let(:user) { create(:user).tap { |u| u.add_role(:admin, Site.instance) } }
   let(:account) { create(:account) }
-  let(:collection) { create(:collection, user: user) }
+  let(:collection) { create(:collection, user:) }
 
   before do
-    Site.update(account: account)
+    Site.update(account:)
   end
 
   it "is a hyrax collection" do
diff --git a/spec/models/fcrepo_endpoint_spec.rb b/spec/models/fcrepo_endpoint_spec.rb
index f20e1f7c3..90ca23032 100644
--- a/spec/models/fcrepo_endpoint_spec.rb
+++ b/spec/models/fcrepo_endpoint_spec.rb
@@ -4,7 +4,7 @@
   let(:base_path) { 'foobar' }
 
   describe '.options' do
-    subject { described_class.new base_path: base_path }
+    subject { described_class.new base_path: }
 
     it 'uses the configured application settings' do
       expect(subject.options[:base_path]).to eq base_path
diff --git a/spec/models/featured_collection_list_spec.rb b/spec/models/featured_collection_list_spec.rb
index cd472fc4f..bc0bc6806 100644
--- a/spec/models/featured_collection_list_spec.rb
+++ b/spec/models/featured_collection_list_spec.rb
@@ -5,12 +5,12 @@
 RSpec.describe FeaturedCollectionList, type: :model do
   let(:user) { create(:user).tap { |u| u.add_role(:admin, Site.instance) } }
   let(:account) { create(:account) }
-  let(:collection1) { create(:collection, user: user) }
-  let(:collection2) { create(:collection, user: user) }
+  let(:collection1) { create(:collection, user:) }
+  let(:collection2) { create(:collection, user:) }
 
   describe 'featured_collections' do
     before do
-      Site.update(account: account)
+      Site.update(account:)
       create(:featured_collection, collection_id: collection1.id)
       create(:featured_collection, collection_id: collection2.id)
     end
@@ -42,7 +42,7 @@
     subject { instance.featured_collections_attributes = attributes }
 
     let(:collection_id) { 'no-need-to-persist' }
-    let(:featured_collection) { create(:featured_collection, collection_id: collection_id) }
+    let(:featured_collection) { create(:featured_collection, collection_id:) }
 
     let(:attributes) do
       ActionController::Parameters.new(
diff --git a/spec/models/hyrax/group_spec.rb b/spec/models/hyrax/group_spec.rb
index f29acc0f0..fda54ae3d 100644
--- a/spec/models/hyrax/group_spec.rb
+++ b/spec/models/hyrax/group_spec.rb
@@ -6,14 +6,14 @@
 module Hyrax
   RSpec.describe Group, type: :model, clean: true do
     describe 'group with no members' do
-      subject { described_class.new(name: name, description: description) }
+      subject { described_class.new(name:, description:) }
 
       let(:name) { 'Empty Group' }
       let(:description) { 'Add members plz' }
       let(:empty_group_attributes) do
         {
-          name: name,
-          description: description,
+          name:,
+          description:,
           number_of_users: 0
         }
       end
diff --git a/spec/models/redis_endpoint_spec.rb b/spec/models/redis_endpoint_spec.rb
index 25f9cd8b1..6c6a3ad60 100644
--- a/spec/models/redis_endpoint_spec.rb
+++ b/spec/models/redis_endpoint_spec.rb
@@ -4,7 +4,7 @@
   let(:namespace) { 'foobar' }
 
   describe '.options' do
-    subject { described_class.new namespace: namespace }
+    subject { described_class.new namespace: }
 
     it 'uses the configured application settings' do
       expect(subject.options[:namespace]).to eq namespace
diff --git a/spec/models/uploaded_file_spec.rb b/spec/models/uploaded_file_spec.rb
index 65767a785..acf04c841 100644
--- a/spec/models/uploaded_file_spec.rb
+++ b/spec/models/uploaded_file_spec.rb
@@ -6,7 +6,7 @@
 # rubocop:disable Metrics/LineLength
 RSpec.describe 'Hyrax::UploadedFile' do # rubocop:disable RSpec/DescribeClass
   let(:file) { File.open(fixture_path + '/images/world.png') }
-  let(:upload) { Hyrax::UploadedFile.create(file: file) }
+  let(:upload) { Hyrax::UploadedFile.create(file:) }
   let(:config) { CarrierWave.configure { |c| c } }
   let(:bucket_name) { 'hyku-carrierwave-test' }
   let(:bigurl) { 'https://demo-application-w5twjcsuyx3v-uploadbucket-4l1zpvmp62nf.s3.amazonaws.com//var/app/current/public/uploads/hyrax/uploaded_file/file/31/image.png?X-Amz-Expires=600\u0026X-Amz-Date=20161214T193306Z\u0026X-Amz-Security-Token=FQoDYXdzEMT//////////wEaDMj3NLTbn4Y3JgbItSK3A57LyrcXBHQlP6lM7cT/2N9naRgRSef4EG/AxCCjMGcEVdt4X5ZsfHdzNiD6L0GODXmrP3quoXNBNZCoUVo3DY5E0P67iz9tYC2Ac%2BILJ%2BBzELNz84XI7C9zg6CCecZ8oeNjCTJXsMZ3xLx2bN099sl%2BY5nduDXAxen2Z63QKw7kiuuEXin/z%2B4ywFSP/Z1Sqbjkq4Qwjs5FUSyyz61wjl1%2Bg8uIJ5u3HTOlb8eZpk7gUCtdmLIE7mK1eZe5azUJC8XBW7Eu7jaRyM2PKMwjVnwepnfgPyEDqJSzKYJt1bGXgnQEN7logEKNOjmOcJqggM5Tc7PD40USAveIQ6E8ny/X0N%2BZ/X1rZTaCiAH1aWwVNqa0M43mlECrBeDv9I9BRMJzp4btvEgHKODrJe2MawDu4L1%2BzVNgOD7TZjrFt9zSEpyQK79dh8oHuyzDL0C%2Bpw3zL2ambsJ5OX6UnMuAmrkBbin1PKh2nHFkL/0xXAb2ZbSV6vKBxzKeQ62HMvv8UqypKbkwOMnstxyGGp00r6m6vL62x%2BTDergiiRfs947NyfJnP5l/rNRNMNesGo6kBmAqpACaBPAo0Z3GwgU%3D\u0026X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=ASIAIB72YBSAAINUZRPQ/20161214/us-east-1/s3/aws4_request\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=f9bfb2b8d6114bccb6e88e4c0526bf19c5658b587ee368d04b42b1881d5359db' }
diff --git a/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb b/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
index a6839c78d..ef8709320 100644
--- a/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
+++ b/spec/presenters/hyku/admin/group/navigation_presenter_spec.rb
@@ -13,8 +13,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'edit' }
-    let(:params) { base_params.merge(action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
@@ -29,8 +29,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'index' }
-    let(:params) { base_params.merge(controller: 'admin/group_users', action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(controller: 'admin/group_users', action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
@@ -45,8 +45,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'index' }
-    let(:params) { base_params.merge(controller: 'admin/group_roles', action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(controller: 'admin/group_roles', action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
@@ -61,8 +61,8 @@
     subject { presenter.tabs }
 
     let(:action) { 'remove' }
-    let(:params) { base_params.merge(action: action) }
-    let(:presenter) { described_class.new(params: params) }
+    let(:params) { base_params.merge(action:) }
+    let(:presenter) { described_class.new(params:) }
 
     it 'has 4 tabs' do
       expect(subject.count).to be(4)
diff --git a/spec/presenters/hyku/menu_presenter_spec.rb b/spec/presenters/hyku/menu_presenter_spec.rb
index 9db639664..f1555a458 100644
--- a/spec/presenters/hyku/menu_presenter_spec.rb
+++ b/spec/presenters/hyku/menu_presenter_spec.rb
@@ -133,17 +133,17 @@
     before do
       allow(Hyku::CollapsableSectionPresenter).to receive(:new).with(
         view_context: context,
-        text: text,
-        id: id,
-        icon_class: icon_class,
-        open: open,
-        html_options: html_options
+        text:,
+        id:,
+        icon_class:,
+        open:,
+        html_options:
       ).and_return(presenter)
     end
 
     it "calls the render method on the CollapsableSectionPresenter with the given block" do
       expect(presenter).to receive(:render)
-      instance.collapsable_section(text, id: id, icon_class: icon_class, open: open, **html_options, &block)
+      instance.collapsable_section(text, id:, icon_class:, open:, **html_options, &block)
     end
   end
 end
diff --git a/spec/requests/catalog_controller_spec.rb b/spec/requests/catalog_controller_spec.rb
index c36a9c43d..313a1f5ac 100644
--- a/spec/requests/catalog_controller_spec.rb
+++ b/spec/requests/catalog_controller_spec.rb
@@ -4,8 +4,8 @@
 
 RSpec.describe CatalogController, type: :request, clean: true, multitenant: true do
   let(:user) { create(:user, email: 'test_user@repo-sample.edu') }
-  let(:work) { build(:work, title: ['welcome test'], id: SecureRandom.uuid, user: user) }
-  let(:hyku_sample_work) { build(:work, title: ['sample test'], id: SecureRandom.uuid, user: user) }
+  let(:work) { build(:work, title: ['welcome test'], id: SecureRandom.uuid, user:) }
+  let(:hyku_sample_work) { build(:work, title: ['sample test'], id: SecureRandom.uuid, user:) }
   let(:sample_solr_connection) { RSolr.connect url: "#{ENV['SOLR_URL']}hydra-sample" }
 
   let(:cross_search_solr) { create(:solr_endpoint, url: "#{ENV['SOLR_URL']}hydra-cross-search-tenant") }
diff --git a/spec/requests/institution_visibility_spec.rb b/spec/requests/institution_visibility_spec.rb
index d850e050d..89ce45717 100644
--- a/spec/requests/institution_visibility_spec.rb
+++ b/spec/requests/institution_visibility_spec.rb
@@ -31,7 +31,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
     Apartment::Tenant.create(account2.tenant)
diff --git a/spec/requests/work_approval_permissions_spec.rb b/spec/requests/work_approval_permissions_spec.rb
index 2615febcb..f2cfb5702 100644
--- a/spec/requests/work_approval_permissions_spec.rb
+++ b/spec/requests/work_approval_permissions_spec.rb
@@ -24,7 +24,7 @@
   let!(:admin_set) do
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('one_step_mediated_deposit')
     admin_set = AdminSet.new(title: ['Mediated Deposit Admin Set'])
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_creator, admin_set.id, 'open') }
diff --git a/spec/requests/work_depositor_role_spec.rb b/spec/requests/work_depositor_role_spec.rb
index 0053ac892..b96956c86 100644
--- a/spec/requests/work_depositor_role_spec.rb
+++ b/spec/requests/work_depositor_role_spec.rb
@@ -25,7 +25,7 @@
 
     %w[open authenticated].each do |visibility|
       context "with #{visibility} visibility" do
-        let(:work) { create(:work, visibility: visibility, admin_set_id: admin_set_id) }
+        let(:work) { create(:work, visibility:, admin_set_id:) }
 
         it "can see the work's public show page" do
           get hyrax_generic_work_path(work)
@@ -43,7 +43,7 @@
     end
 
     context 'with restricted visibility' do
-      let(:work) { create(:work, visibility: 'restricted', admin_set_id: admin_set_id) }
+      let(:work) { create(:work, visibility: 'restricted', admin_set_id:) }
 
       it "cannot see the work's show page" do
         get hyrax_generic_work_path(work)
diff --git a/spec/requests/work_editor_role_spec.rb b/spec/requests/work_editor_role_spec.rb
index 7ab4a1dda..05e5ae2a6 100644
--- a/spec/requests/work_editor_role_spec.rb
+++ b/spec/requests/work_editor_role_spec.rb
@@ -21,7 +21,7 @@
         creator: ['depositor@example.com'],
         keyword: ['asdf'],
         rights_statement: 'http://rightsstatements.org/vocab/CNE/1.0/',
-        visibility: visibility,
+        visibility:,
         admin_set_id: admin_set.id
       }
     }
@@ -29,7 +29,7 @@
   let!(:admin_set) do
     admin_set = AdminSet.new(title: ['Test Admin Set'])
     allow(Hyrax.config).to receive(:default_active_workflow_name).and_return('default')
-    Hyrax::AdminSetCreateService.new(admin_set: admin_set, creating_user: nil).create
+    Hyrax::AdminSetCreateService.new(admin_set:, creating_user: nil).create
     admin_set.reload
   end
   let!(:work) { process_through_actor_stack(build(:work), work_depositor, admin_set.id, visibility) }
diff --git a/spec/requests/work_show_institution_visibility_spec.rb b/spec/requests/work_show_institution_visibility_spec.rb
index 2a37a51da..1798a371d 100644
--- a/spec/requests/work_show_institution_visibility_spec.rb
+++ b/spec/requests/work_show_institution_visibility_spec.rb
@@ -9,7 +9,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
   end
diff --git a/spec/requests/work_show_open_visibility_spec.rb b/spec/requests/work_show_open_visibility_spec.rb
index 222a38d31..052738a79 100644
--- a/spec/requests/work_show_open_visibility_spec.rb
+++ b/spec/requests/work_show_open_visibility_spec.rb
@@ -9,7 +9,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
   end
diff --git a/spec/requests/work_show_private_visibility_spec.rb b/spec/requests/work_show_private_visibility_spec.rb
index 639f98fc6..e226b5978 100644
--- a/spec/requests/work_show_private_visibility_spec.rb
+++ b/spec/requests/work_show_private_visibility_spec.rb
@@ -9,7 +9,7 @@
     WebMock.disable!
     Apartment::Tenant.create(account.tenant)
     Apartment::Tenant.switch(account.tenant) do
-      Site.update(account: account)
+      Site.update(account:)
       work
     end
   end
diff --git a/spec/services/hyrax/workflow/permission_grantor_spec.rb b/spec/services/hyrax/workflow/permission_grantor_spec.rb
index 4ff54dcd3..8abfc46a1 100644
--- a/spec/services/hyrax/workflow/permission_grantor_spec.rb
+++ b/spec/services/hyrax/workflow/permission_grantor_spec.rb
@@ -5,8 +5,8 @@
 RSpec.describe Hyrax::Workflow::PermissionGrantor do
   subject(:permission_grantor) do
     described_class.new(
-      permission_template: permission_template,
-      creating_user: creating_user
+      permission_template:,
+      creating_user:
     )
   end
 
@@ -34,7 +34,7 @@
     it 'initializes an instance and calls #call on it' do
       expect_any_instance_of(described_class).to receive(:call)
 
-      described_class.grant_default_workflow_roles!(permission_template: permission_template)
+      described_class.grant_default_workflow_roles!(permission_template:)
     end
   end
 
diff --git a/spec/services/hyrax/workflow/permission_query_spec.rb b/spec/services/hyrax/workflow/permission_query_spec.rb
index 16baa149f..76c433474 100644
--- a/spec/services/hyrax/workflow/permission_query_spec.rb
+++ b/spec/services/hyrax/workflow/permission_query_spec.rb
@@ -46,8 +46,8 @@ def expect_actions_for(user:, entity:, actions:)
         end
         expect(
           described_class.scope_permitted_workflow_actions_available_for_current_state(
-            user: user,
-            entity: entity
+            user:,
+            entity:
           )
         ).to eq(actions)
       end
@@ -56,26 +56,26 @@ def expect_agents_for(agents:, entity:, role:)
         agents = Array.wrap(agents).map { |agent| PowerConverter.convert_to_sipity_agent(agent) }
         expect(
           described_class.scope_agents_associated_with_entity_and_role(
-            role: role,
-            entity: entity
+            role:,
+            entity:
           )
         ).to contain_exactly(*agents)
       end
 
       def expect_roles_for(entity:, roles:)
         roles = Array.wrap(roles).map { |role| PowerConverter.convert_to_sipity_role(role) }
-        expect(described_class.scope_roles_associated_with_the_given_entity(entity: entity)).to eq(roles)
+        expect(described_class.scope_roles_associated_with_the_given_entity(entity:)).to eq(roles)
       end
 
       def expect_users_for(entity:, roles:, users:)
-        expect(described_class.scope_users_for_entity_and_roles(entity: entity, roles: roles)).to eq(Array.wrap(users))
+        expect(described_class.scope_users_for_entity_and_roles(entity:, roles:)).to eq(Array.wrap(users))
       end
 
       def expect_to_be_authorized(user:, entity:, action:, message: 'should be authorized')
         expect(
           described_class.authorized_for_processing?(
-            user: user,
-            entity: entity, action: action
+            user:,
+            entity:, action:
           )
         ).to be_truthy, message
       end
@@ -83,9 +83,9 @@ def expect_to_be_authorized(user:, entity:, action:, message: 'should be authori
       def expect_to_not_be_authorized(user:, entity:, action:, message: 'should not be authorized')
         expect(
           described_class.authorized_for_processing?(
-            user: user,
-            entity: entity,
-            action: action
+            user:,
+            entity:,
+            action:
           )
         ).to be_falsey, message
       end
@@ -241,7 +241,7 @@ def expect_entities_for(user:, entities:) # rubocop:disable Lint/UnusedMethodArg
         end
 
         context 'when user is persisted' do
-          subject { described_class.scope_processing_agents_for(user: user) }
+          subject { described_class.scope_processing_agents_for(user:) }
 
           let(:user) { create(:user) }
           let!(:group) { create(:group, member_users: [user]) }
diff --git a/spec/services/roles_service_spec.rb b/spec/services/roles_service_spec.rb
index b68fcd742..71ac2a8a4 100644
--- a/spec/services/roles_service_spec.rb
+++ b/spec/services/roles_service_spec.rb
@@ -452,7 +452,7 @@
     context 'when CollectionTypes grant access to other users/groups' do
       before do
         creator_user = FactoryBot.create(:user)
-        FactoryBot.create(:collection_type, creator_user: creator_user)
+        FactoryBot.create(:collection_type, creator_user:)
         FactoryBot.create(:collection_type, creator_group: 'Test Group')
         FactoryBot.create(:collection_type, manager_group: ::Ability.admin_group_name)
         FactoryBot.create(:collection_type, manager_group: ::Ability.registered_group_name)
@@ -629,7 +629,7 @@ def access_count_for(role, permission_template, access)
     permission_template.access_grants.where(
       agent_type: Hyrax::PermissionTemplateAccess::GROUP,
       agent_id: role,
-      access: access
+      access:
     ).count
   end
 end
diff --git a/spec/views/hyrax/admin/users/index.html.erb_spec.rb b/spec/views/hyrax/admin/users/index.html.erb_spec.rb
index 14db24a44..9c39ac219 100644
--- a/spec/views/hyrax/admin/users/index.html.erb_spec.rb
+++ b/spec/views/hyrax/admin/users/index.html.erb_spec.rb
@@ -14,8 +14,8 @@
         :user,
         display_name: "user#{i}",
         email: "email#{i}@example.com",
-        last_sign_in_at: Time.zone.now - 15.minutes,
-        created_at: Time.zone.now - 3.days
+        last_sign_in_at: 15.minutes.ago,
+        created_at: 3.days.ago
       )
     end
     FactoryBot.create(:admin_group, member_users: [users[0]])
@@ -58,8 +58,8 @@
         users << FactoryBot.create(:admin,
                                    display_name: "admin-user#{i}",
                                    email: "admin#{i}@example.com",
-                                   last_sign_in_at: Time.zone.now - 15.minutes,
-                                   created_at: Time.zone.now - 3.days)
+                                   last_sign_in_at: 15.minutes.ago,
+                                   created_at: 3.days.ago)
       end
       render
     end
@@ -79,8 +79,8 @@
         users << FactoryBot.create(:invited_user,
                                    display_name: "invitee#{i}",
                                    email: "invitee#{i}@example.com",
-                                   last_sign_in_at: Time.zone.now - 15.minutes,
-                                   created_at: Time.zone.now - 3.days)
+                                   last_sign_in_at: 15.minutes.ago,
+                                   created_at: 3.days.ago)
       end
       render
     end
diff --git a/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb b/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
index 5dbd31afa..acacc6aaa 100644
--- a/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
+++ b/spec/views/hyrax/content_blocks/edit.html.erb_spec.rb
@@ -43,19 +43,19 @@
   # find a way to read the text from the yaml to test this
   it "renders the announcement instructions" do
     text = "Announcement Text displays on the homepage."
-    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text: text)
+    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text:)
   end
 
   it "renders the banner instructions" do
     text = "Banner Text refers to the text that is displayed over banner image on the homepage."
-    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text: text)
+    expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]', text:)
   end
 
   it "renders the featured researcher instructions" do
     text = "Featured Researcher is a space to enter information and on"
     text += " the home page reserved for highlighting repository users."
     expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]',
-                                   text: text)
+                                   text:)
   end
 
   # Copied from Hyrax v2.9.0 to add home_text form - Adding themes
@@ -66,6 +66,6 @@
     text += " that either requires or allows home page text. We recommend"
     text += " no more than 3 sentences in this area."
     expect(rendered).to have_xpath('//p[@class="content-block-instructions" ]',
-                                   text: text)
+                                   text:)
   end
 end

From c94feea404c97c3f4167a16e996dd7935c44b97d Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Mon, 18 Dec 2023 11:38:35 -0800
Subject: [PATCH 084/126] =?UTF-8?q?=F0=9F=A7=B9=20Post=20review=20adjustme?=
 =?UTF-8?q?nts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These are adjustments made after the PR has been reviewed.
---
 .../admin/appearances/_theme_form.html.erb    | 20 +++++++++--
 app/views/hyrax/contact_form/new.html.erb     | 17 +++++----
 .../collections/_form_discovery.html.erb      | 35 ++++++++++++-------
 .../hyrax/my/_collection_action_menu.html.erb |  2 --
 app/views/single_signon/index.html.erb        |  3 +-
 5 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/app/views/hyrax/admin/appearances/_theme_form.html.erb b/app/views/hyrax/admin/appearances/_theme_form.html.erb
index 2b60e7453..9d0a0d662 100644
--- a/app/views/hyrax/admin/appearances/_theme_form.html.erb
+++ b/app/views/hyrax/admin/appearances/_theme_form.html.erb
@@ -27,6 +27,22 @@
       </div>
     </div>
     <hr />
+    <div class="row">
+      <div class="col-md-6">
+        <% search_options = @search_themes.map { |s| [s[0], s[1], { 'data-image' => image_path("themes/search/#{s[1]}.jpg") }] } %>
+        <%= f.input :search_theme, label: 'Search Results Page Theme' do %>
+          <%= f.select :search_theme, search_options, {}, { prompt: 'Select search results page theme...', class: 'form-control' } %>
+        <% end %>
+        <h4>Search Results Theme notes:</h4>
+        <ul>
+          <li>This will select a default view for the search results page. Users can select their preferred views on the search results page that will override this selection.</li>
+        </ul>
+      </div>
+      <div id="search-wireframe" class="col-md-6">
+        <%= image_tag "themes/search/list_view.jpg", class: "img-fluid" %>
+      </div>
+    </div>
+    <hr />
     <div class="row">
       <div class="col-sm-6">
         <% show_options = @show_theme_names.map { |g| [g[0], g[1], { 'data-image' => image_path("themes/#{g[1]}/#{g[1]}.jpg") }] } %>
@@ -45,7 +61,7 @@
     </div>
     <hr />
   </div>
-  <div class="panel-footer">
-    <%= f.submit class: 'btn btn-primary pull-right' %>
+  <div class="card-footer text-right">
+    <%= f.submit class: 'btn btn-secondary' %>
   </div>
 <% end %>
diff --git a/app/views/hyrax/contact_form/new.html.erb b/app/views/hyrax/contact_form/new.html.erb
index b008f454b..b1c6d774c 100644
--- a/app/views/hyrax/contact_form/new.html.erb
+++ b/app/views/hyrax/contact_form/new.html.erb
@@ -17,10 +17,9 @@
   <% em = '' %>
 <% end %>
 
-<%= form_for @contact_form, url: hyrax.contact_form_index_path,
-                            html: { class: '' } do |f| %>
+<%= form_for @contact_form, url: hyrax.contact_form_index_path, html: { class: 'needs-validation' } do |f| %>
   <%= raw negative_captcha(@captcha) %>
-  <%= f.text_field :contact_method, class: 'hide' %>
+  <%= f.text_field :contact_method, class: 'd-none' %>
 
   <div class="form-group row">
     <%= f.label :category, t('hyrax.contact_form.type_label'), class: "col-sm-2 col-form-label" %>
@@ -30,13 +29,13 @@
   </div>
 
   <div class="form-group row">
-    <%= f.label :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 col-form-label" %>
-    <div class="col-sm-10"><%= f.text_field :name, value: nm, class: 'form-control', required: true %></div>
+    <%= negative_label_tag(@captcha, :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 col-form-label") %>
+    <div class="col-sm-10"><%= negative_text_field_tag(@captcha, :name, value: nm, class: 'form-control', required: true) %></div>
   </div>
 
   <div class="form-group row">
-    <%= f.label :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 col-form-label" %>
-    <div class="col-sm-10"><%= f.text_field :email, value: em, class: 'form-control', required: true %></div>
+    <%= negative_label_tag(@captcha, :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 col-form-label") %>
+    <div class="col-sm-10"><%= negative_text_field_tag(@captcha, :email, value: em, class: 'form-control', required: true) %></div>
   </div>
 
   <div class="form-group row">
@@ -45,8 +44,8 @@
   </div>
 
   <div class="form-group row">
-    <%= f.label :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 col-form-label" %>
-    <div class="col-sm-10"><%= f.text_area :message, rows: 4, class: 'form-control', required: true %></div>
+    <%= negative_label_tag(@captcha, :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 col-form-label") %>
+    <div class="col-sm-10"><%= negative_text_area_tag(@captcha, :message, rows: 4, class: 'form-control', required: true) %></div>
   </div>
 
   <%= f.submit value: t('hyrax.contact_form.button_label'), class: "btn btn-primary" %>
diff --git a/app/views/hyrax/dashboard/collections/_form_discovery.html.erb b/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
index 7b9fa4c14..2163c824f 100644
--- a/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_discovery.html.erb
@@ -8,56 +8,65 @@
   <p><%= t('.para2') %></p>
 
   <%# OVERRIDE: add conditional title %>
-  <div class="form-check" <% if cannot?(:manage_discovery, @collection) %>title="<%= t('permissions.collections.cannot.manage_discovery') %>"<% end %>>
-    <label class="form-check-label">
+  <div class="form-group" <% if cannot?(:manage_discovery, @collection) %>title="<%= t('permissions.collections.cannot.manage_discovery') %>"<% end %>>
+    <div class="custom-control custom-radio">
       <input
         type="radio"
         id="visibility_open"
         name="<%= f.object_name %>[visibility]"
         value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>"
+        class="custom-control-input"
         <% if @collection.open_access? %>
-          checked="true"
+          checked="checked"
         <% end %>
         <%# OVERRIDE: add conditional disable %>
         <% if cannot?(:manage_discovery, @collection) %>
           disabled="disabled"
         <% end %>
       />
-      <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
-    </label>
+      <label class="custom-control-label" for="visibility_open">
+        <strong><%= t('hyrax.visibility.open.text') %></strong> - <%= t('hyrax.visibility.open.note_html') %>
+      </label>
+    </div>
 
-    <label class="form-check-label">
+    <div class="custom-control custom-radio">
       <input
         type="radio"
         id="visibility_registered"
         name="<%= f.object_name %>[visibility]"
         value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>"
+        class="custom-control-input"
         <% if @collection.authenticated_only_access? %>
-          checked="true"
+          checked="checked"
         <% end %>
         <%# OVERRIDE: add conditional disable %>
         <% if cannot?(:manage_discovery, @collection) %>
           disabled="disabled"
         <% end %>
       />
-      <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
-    </label>
+      <label class="custom-control-label" for="visibility_registered">
+        <strong><%= t('hyrax.visibility.authenticated.text', institution: institution_name) %></strong> - <%= t('hyrax.visibility.authenticated.note_html', institution: institution_name) %>
+      </label>
+    </div>
 
-    <label class="form-check-label">
+    <div class="custom-control custom-radio">
       <input
         type="radio"
         id="visibility_restricted"
         name="<%= f.object_name %>[visibility]"
         value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"
+        class="custom-control-input"
         <% if @collection.private_access? %>
-          checked="true"
+          checked="checked"
         <% end %>
         <%# OVERRIDE: add conditional disable %>
         <% if cannot?(:manage_discovery, @collection) %>
           disabled="disabled"
         <% end %>
       />
-      <strong><%= t('hyrax.visibility.restricted.text') %></strong>- <%= t('hyrax.visibility.restricted.note_html') %>
-    </label>
+      <label class="custom-control-label" for="visibility_restricted">
+        <strong><%= t('hyrax.visibility.restricted.text') %></strong> - <%= t('hyrax.visibility.restricted.note_html') %>
+      </label>
+    </div>
   </div>
 </div>
diff --git a/app/views/hyrax/my/_collection_action_menu.html.erb b/app/views/hyrax/my/_collection_action_menu.html.erb
index ea9fa8e62..98cc23db7 100644
--- a/app/views/hyrax/my/_collection_action_menu.html.erb
+++ b/app/views/hyrax/my/_collection_action_menu.html.erb
@@ -44,9 +44,7 @@
       <% end %>
     </li>
 
-    <%# OVERRIDE begin %>
     <% if Hyrax::CollectionType.any_nestable? %>
-    <%# OVERRIDE end %>
       <% # The user should have deposit access to the parent we are adding, and read access to the child (the collection we are linking here). %>
       <li class="dropdown-item" role="menuitem" tabindex="-1">
         <%= link_to "#",
diff --git a/app/views/single_signon/index.html.erb b/app/views/single_signon/index.html.erb
index b7b1e3008..4858ef235 100644
--- a/app/views/single_signon/index.html.erb
+++ b/app/views/single_signon/index.html.erb
@@ -10,6 +10,7 @@
             <br />
             <%= t('.sign_in_with_provider', provider: ip.name) %>
           </div>
+          <span class='sso-button-fake btn btn-primary'>Sign In</span>
         <% end %>
       </div>
     <% end %>
@@ -18,6 +19,6 @@
 
 <% if @identity_providers.count == 1 %>
   <script>
-     $('form.button_to').submit();
+    $('form.button_to').submit();
   </script>
 <% end %>

From 4275a229906dcac80f27bd4825fc017a9323ca80 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Mon, 18 Dec 2023 14:34:13 -0800
Subject: [PATCH 085/126] =?UTF-8?q?=F0=9F=A7=B9=20Clean=20up=20a=20couple?=
 =?UTF-8?q?=20blacklight=20views?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will account for the new versions of Blacklight and
Blacklight Gallery.  The masonry view no longer exists so we can't tell
how it's broken as of right now.  I'm sure we'll run into it during our
testing.

NOTE:  These changes refer to the shared search tenant.
---
 ...eader_default.html.erb => _index_header.html.erb} | 12 +++++++-----
 app/views/catalog/_index_masonry_default.html.erb    |  2 --
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename app/views/catalog/{_index_header_default.html.erb => _index_header.html.erb} (83%)
 delete mode 100644 app/views/catalog/_index_masonry_default.html.erb

diff --git a/app/views/catalog/_index_header_default.html.erb b/app/views/catalog/_index_header.html.erb
similarity index 83%
rename from app/views/catalog/_index_header_default.html.erb
rename to app/views/catalog/_index_header.html.erb
index 89d92ad8c..ca310a3d7 100644
--- a/app/views/catalog/_index_header_default.html.erb
+++ b/app/views/catalog/_index_header.html.erb
@@ -1,9 +1,9 @@
-<%# OVERRIDE blacklight-gallery v0.12.0: 
-    TODO: commented out because bookmarks fail for shared search tenant. 
+<%# OVERRIDE Blacklight v7.35.0:
+    TODO: commented out because bookmarks fail for shared search tenant.
         If a bookmark is saved in shared tenant, it errors on subsequent views. %>
 
 <%# header bar for doc items in index view -%>
-<div class="documentHeader row">
+<header class="documentHeader row">
   <%# main title container for doc partial view
       How many bootstrap columns need to be reserved
       for bookmarks control depends on size.
@@ -12,13 +12,15 @@
     <% # bookmark functions for items/docs -%>
     <%#= render_index_doc_actions document, wrapping_class: "index-document-functions col-sm-3 col-lg-2" %>
   <% end %>
+
   <h3 class="index_title document-title-heading <%= document_actions.present? ? "col-sm-9 col-lg-10" : "col-md-12" %>">
     <% if counter = document_counter_with_offset(document_counter) %>
       <span class="document-counter">
         <%= t('blacklight.search.documents.counter', counter: counter) %>
       </span>
     <% end %>
-    <%= link_to_document document, document_show_link_field(document), counter: counter %>
+    <%= link_to_document document, counter: counter %>
   </h3>
+
   <%= document_actions %>
-</div>
+</header>
diff --git a/app/views/catalog/_index_masonry_default.html.erb b/app/views/catalog/_index_masonry_default.html.erb
deleted file mode 100644
index dfec1309c..000000000
--- a/app/views/catalog/_index_masonry_default.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<%# OVERRIDE blacklight-gallery: for shared search URLs %>
-<%= link_to document.title_or_label, generate_work_url(document.to_h, request) %>

From 6563c87a0651003be088d1711501d3e94fd3b0f3 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Mon, 18 Dec 2023 15:24:40 -0800
Subject: [PATCH 086/126] =?UTF-8?q?=F0=9F=A7=B9=20Bring=20back=20`Blacklig?=
 =?UTF-8?q?htHelperBehavior`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will bring back the `BlacklightHelperBehavior` module but it
will be namespaced under `Hyku` to avoid conflicts.  We will then
include it in the `HyraxHelper` module so those methods should override
the ones in `Blacklight::BlacklightHelperBehavior`.
---
 .../blacklight_helper_behavior.rb.old         | 423 ------------------
 .../hyku/blacklight_helper_behavior.rb        |  63 +++
 app/helpers/hyrax_helper.rb                   |   1 +
 3 files changed, 64 insertions(+), 423 deletions(-)
 delete mode 100644 app/helpers/blacklight/blacklight_helper_behavior.rb.old
 create mode 100644 app/helpers/hyku/blacklight_helper_behavior.rb

diff --git a/app/helpers/blacklight/blacklight_helper_behavior.rb.old b/app/helpers/blacklight/blacklight_helper_behavior.rb.old
deleted file mode 100644
index b1c0778e4..000000000
--- a/app/helpers/blacklight/blacklight_helper_behavior.rb.old
+++ /dev/null
@@ -1,423 +0,0 @@
-# frozen_string_literal: true
-
-# Override Blacklight v6.23.0 to add preferred view from search theme - Hyku Theming
-# Methods added to this helper will be available to all templates in the hosting application
-module Blacklight
-  module BlacklightHelperBehavior
-    include BlacklightUrlHelper
-    include BlacklightConfigurationHelper
-    include HashAsHiddenFieldsHelper
-    include RenderConstraintsHelper
-    include RenderPartialsHelper
-    include FacetsHelper
-    extend Deprecation
-    self.deprecation_horizon = 'Blacklight version 7.0.0'
-
-    ##
-    # Get the name of this application, from either:
-    #  - the Rails configuration
-    #  - an i18n string (key: blacklight.application_name; preferred)
-    #
-    # @return [String] the application name
-    def application_name
-      if Rails.application.config.respond_to? :application_name
-        Deprecation.warn(
-          self, "BlacklightHelper#application_name will no longer delegate to config.application_name
-          in version 7.0. Set the i18n for blacklight.application_name instead"
-        )
-        return Rails.application.config.application_name
-      end
-
-      t('blacklight.application_name')
-    end
-
-    ##
-    # Get the page's HTML title
-    #
-    # @return [String]
-    def render_page_title
-      (content_for(:page_title) if content_for?(:page_title)) || @page_title || application_name
-    end
-
-    ##
-    # Create <link rel="alternate"> links from a documents dynamically
-    # provided export formats.
-    #
-    # Returns empty string if no links available.
-    #
-    # @param [SolrDocument] document
-    # @param [Hash] options
-    # @option options [Boolean] :unique ensures only one link is output for every
-    #     content type, e.g. as required by atom
-    # @option options [Array<String>] :exclude array of format shortnames to not include in the output
-    def render_link_rel_alternates(document = @document, options = {})
-      return if document.nil?
-      presenter(document).link_rel_alternates(options)
-    end
-
-    ##
-    # Render OpenSearch headers for this search
-    # @return [String]
-    def render_opensearch_response_metadata
-      render partial: 'catalog/opensearch_response_metadata'
-    end
-
-    ##
-    # Render classes for the <body> element
-    # @return [String]
-    def render_body_class
-      extra_body_classes.join " "
-    end
-
-    ##
-    # List of classes to be applied to the <body> element
-    # @see render_body_class
-    # @return [Array<String>]
-    def extra_body_classes
-      @extra_body_classes ||= [
-        'blacklight-' + controller.controller_name,
-        'blacklight-' + [controller.controller_name, controller.action_name].join('-')
-      ]
-    end
-
-    ##
-    # Render the search navbar
-    # @return [String]
-    def render_search_bar
-      render partial: 'catalog/search_form'
-    end
-
-    ##
-    # Determine whether to render a given field in the index view.
-    #
-    # @param [SolrDocument] document
-    # @param [Blacklight::Configuration::Field] field_config
-    # @return [Boolean]
-    def should_render_index_field?(document, field_config)
-      should_render_field?(field_config, document) && document_has_value?(document, field_config)
-    end
-
-    ##
-    # Determine whether to render a given field in the show view
-    #
-    # @param [SolrDocument] document
-    # @param [Blacklight::Configuration::Field] field_config
-    # @return [Boolean]
-    def should_render_show_field?(document, field_config)
-      should_render_field?(field_config, document) && document_has_value?(document, field_config)
-    end
-
-    ##
-    # Check if a document has (or, might have, in the case of accessor methods) a value for
-    # the given solr field
-    # @param [SolrDocument] document
-    # @param [Blacklight::Configuration::Field] field_config
-    # @return [Boolean]
-    def document_has_value?(document, field_config)
-      document.has?(field_config.field) ||
-        (document.has_highlight_field? field_config.field if field_config.highlight) ||
-        field_config.accessor
-    end
-
-    ##
-    # Determine whether to display spellcheck suggestions
-    #
-    # @param [Blacklight::Solr::Response] response
-    # @return [Boolean]
-    def should_show_spellcheck_suggestions?(response)
-      response.total <= spell_check_max &&
-        !response.spelling.nil? &&
-        response.spelling.words.any?
-    end
-
-    ##
-    # Render the index field label for a document
-    #
-    # @overload render_index_field_label(options)
-    #   Use the default, document-agnostic configuration
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    # @overload render_index_field_label(document, options)
-    #   Allow an extention point where information in the document
-    #   may drive the value of the field
-    #   @param [SolrDocument] doc
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    def render_index_field_label(*args)
-      options = args.extract_options!
-      document = args.first
-
-      field = options[:field]
-      html_escape t(
-        :"blacklight.search.index.#{document_index_view_type}.label",
-        default: :'blacklight.search.index.label',
-        label: index_field_label(document, field)
-      )
-    end
-
-    ##
-    # Render the index field label for a document
-    #
-    # @overload render_index_field_value(options)
-    #   Use the default, document-agnostic configuration
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    #   @option opts [String] :value
-    #   @option opts [String] :document
-    # @overload render_index_field_value(document, options)
-    #   Allow an extention point where information in the document
-    #   may drive the value of the field
-    #   @param [SolrDocument] doc
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    #   @option opts [String] :value
-    # @overload render_index_field_value(document, field, options)
-    #   Allow an extention point where information in the document
-    #   may drive the value of the field
-    #   @param [SolrDocument] doc
-    #   @param [String] field
-    #   @param [Hash] opts
-    #   @option opts [String] :value
-    # @deprecated use IndexPresenter#field_value
-    def render_index_field_value(*args)
-      render_field_value(*args)
-    end
-    deprecation_deprecate render_index_field_value: 'replaced by IndexPresenter#field_value'
-
-    # @deprecated use IndexPresenter#field_value
-    def render_field_value(*args)
-      options = args.extract_options!
-      document = args.shift || options[:document]
-
-      field = args.shift || options[:field]
-      presenter(document).field_value field, options.except(:document, :field)
-    end
-    deprecation_deprecate render_field_value: 'replaced by IndexPresenter#field_value'
-
-    ##
-    # Render the show field label for a document
-    #
-    # @overload render_document_show_field_label(options)
-    #   Use the default, document-agnostic configuration
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    # @overload render_document_show_field_label(document, options)
-    #   Allow an extention point where information in the document
-    #   may drive the value of the field
-    #   @param [SolrDocument] doc
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    def render_document_show_field_label(*args)
-      options = args.extract_options!
-      document = args.first
-
-      field = options[:field]
-
-      t(:'blacklight.search.show.label', label: document_show_field_label(document, field))
-    end
-
-    ##
-    # Render the index field label for a document
-    #
-    # @overload render_document_show_field_value(options)
-    #   Use the default, document-agnostic configuration
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    #   @option opts [String] :value
-    #   @option opts [String] :document
-    # @overload render_document_show_field_value(document, options)
-    #   Allow an extention point where information in the document
-    #   may drive the value of the field
-    #   @param [SolrDocument] doc
-    #   @param [Hash] opts
-    #   @option opts [String] :field
-    #   @option opts [String] :value
-    # @overload render_document_show_field_value(document, field, options)
-    #   Allow an extention point where information in the document
-    #   may drive the value of the field
-    #   @param [SolrDocument] doc
-    #   @param [String] field
-    #   @param [Hash] opts
-    #   @option opts [String] :value
-    # @deprecated use ShowPresenter#field_value
-    def render_document_show_field_value(*args)
-      render_field_value(*args)
-    end
-    deprecation_deprecate render_document_show_field_value: 'replaced by ShowPresenter#field_value'
-
-    ##
-    # Get the value of the document's "title" field, or a placeholder
-    # value (if empty)
-    #
-    # @param [SolrDocument] document
-    # @return [String]
-    def document_heading(document = nil)
-      document ||= @document
-      presenter(document).heading
-    end
-
-    ##
-    # Get the document's "title" to display in the <title> element.
-    # (by default, use the #document_heading)
-    #
-    # @see #document_heading
-    # @param [SolrDocument] document
-    # @return [String]
-    def document_show_html_title(document = nil)
-      document ||= @document
-
-      presenter(document).html_title
-    end
-
-    ##
-    # Render the document "heading" (title) in a content tag
-    # @overload render_document_heading(document, options)
-    #   @param [SolrDocument] document
-    #   @param [Hash] options
-    #   @option options [Symbol] :tag
-    # @overload render_document_heading(options)
-    #   @param [Hash] options
-    #   @option options [Symbol] :tag
-    def render_document_heading(*args)
-      options = args.extract_options!
-      document = args.first
-      tag = options.fetch(:tag, :h4)
-      document ||= @document
-
-      content_tag(tag, presenter(document).heading, itemprop: "name")
-    end
-
-    ##
-    # Get the value for a document's field, and prepare to render it.
-    # - highlight_field
-    # - accessor
-    # - solr field
-    #
-    # Rendering:
-    #   - helper_method
-    #   - link_to_search
-    # @param [SolrDocument] document
-    # @param [String] _field name
-    # @param [Blacklight::Configuration::Field] field_config solr field configuration
-    # @param [Hash] options additional options to pass to the rendering helpers
-    def get_field_values(document, _field, field_config, options = {})
-      presenter(document).field_values field_config, options
-    end
-    deprecation_deprecate :get_field_values
-
-    ##
-    # Get the current "view type" (and ensure it is a valid type)
-    #
-    # @param [Hash] query_params the query parameters to check
-    # @return [Symbol]
-    def document_index_view_type(query_params = params)
-      view_param = query_params[:view]
-      # Override Blacklight v6.23.0 to add preferred view from search theme - Hyku Theming
-      view_param ||= search_results_theme.split('_').first
-      view_param ||= session[:preferred_view]
-      if view_param && document_index_views.keys.include?(view_param.to_sym)
-        view_param.to_sym
-      else
-        default_document_index_view_type
-      end
-    end
-
-    ##
-    # Render a partial of an arbitrary format inside a
-    # template of a different format. (e.g. render an HTML
-    # partial from an XML template)
-    # code taken from:
-    # http://stackoverflow.com/questions/339130/how-do-i-render-a-partial-of-a-different-format-in-rails (zgchurch)
-    #
-    # @param [String] format suffix
-    # @yield
-    def with_format(format, _block)
-      old_formats = formats
-      self.formats = [format]
-      yield
-      self.formats = old_formats
-      nil
-    end
-
-    ##
-    # Should we render a grouped response (because the response
-    # contains a grouped response instead of the normal response)
-    def render_grouped_response?(response = @response)
-      response.grouped?
-    end
-
-    ##
-    # Returns a document presenter for the given document
-    # TODO: Move this to the controller. It can just pass a presenter or set of presenters.
-    def presenter(document)
-      case action_name
-      when 'show', 'citation'
-        show_presenter(document)
-      when 'index'
-        index_presenter(document)
-      else
-        Deprecation.warn(
-          Blacklight::BlacklightHelperBehavior, "Unable to determine presenter type for
-            #{action_name} on #{controller_name}, falling back on deprecated Blacklight::DocumentPresenter"
-        )
-        presenter_class.new(document, self)
-      end
-    end
-
-    def show_presenter(document)
-      show_presenter_class(document).new(document, self)
-    end
-
-    def index_presenter(document)
-      index_presenter_class(document).new(document, self)
-    end
-
-    def presenter_class
-      blacklight_config.document_presenter_class
-    end
-    deprecation_deprecate presenter_class: "replaced by show_presenter_class and index_presenter_class"
-
-    ##
-    # Override this method if you want to use a different presenter class
-    def show_presenter_class(_document)
-      blacklight_config.show.document_presenter_class
-    end
-
-    def index_presenter_class(_document)
-      blacklight_config.index.document_presenter_class
-    end
-
-    ##
-    # Open Search discovery tag for HTML <head> links
-    def opensearch_description_tag(title, href)
-      tag :link, href: href, title: title, type: "application/opensearchdescription+xml", rel: "search"
-    end
-
-    # OVERIDE: Blacklight::UrlHelperBehavior:
-    #   override link_to_document to substitute method generate_work_url
-    #   to fix URLs for gallery view groupings in shared tenants
-    #     link_to_document(doc, 'VIEW', :counter => 3)
-    def link_to_document(doc, field_or_opts = nil, opts = { counter: nil })
-      if field_or_opts.is_a? Hash
-        opts = field_or_opts
-      else
-        field = field_or_opts
-      end
-
-      field ||= document_show_link_field(doc)
-      label = index_presenter(doc).label field, opts
-      # pull solr_document from input if we don't already have a solr_document
-      document = doc&.try(:solr_document) || doc
-      link_to label, generate_work_url(document, request), document_link_params(document, opts)
-    end
-
-    # OVERIDE: Blacklight::UrlHelperBehavior:
-    # disable link jacking for tracking
-    # see https://playbook-staging.notch8.com/en/samvera/hyku/troubleshooting/multi-tenancy-and-full-urls
-    # If we need to preserve the link jacking for tracking, then we need to also amend
-    # method `session_tracking_params`so that instead of a path we have a URL
-    def document_link_params(_doc, opts)
-      opts.except(:label, :counter)
-    end
-  end
-end
diff --git a/app/helpers/hyku/blacklight_helper_behavior.rb b/app/helpers/hyku/blacklight_helper_behavior.rb
new file mode 100644
index 000000000..91be4cd8a
--- /dev/null
+++ b/app/helpers/hyku/blacklight_helper_behavior.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# Override Blacklight v7.35.0 to add preferred view from search theme - Hyku Theming
+# Methods added to this helper will be available to all templates in the hosting application
+module Hyku
+  module BlacklightHelperBehavior
+    ##
+    # Get the current "view type" (and ensure it is a valid type)
+    #
+    # @param [Hash] query_params the query parameters to check
+    # @return [Symbol]
+    def document_index_view_type(query_params = params)
+      view_param = query_params[:view]
+      view_param ||= search_results_theme.split('_').first
+      view_param ||= session[:preferred_view]
+      if view_param && document_index_views.key?(view_param.to_sym)
+        view_param.to_sym
+      else
+        default_document_index_view_type
+      end
+    end
+
+    # OVERRIDE: Blacklight::UrlHelperBehavior:
+    #   override link_to_document to substitute method generate_work_url
+    #   to fix URLs for gallery view groupings in shared tenants
+    #     link_to_document(doc, 'VIEW', :counter => 3)
+    # rubocop:disable Metrics/MethodLength
+    def link_to_document(doc, field_or_opts = nil, opts = { counter: nil })
+      label = case field_or_opts
+              when NilClass
+                document_presenter(doc).heading
+              when Hash
+                opts = field_or_opts
+                document_presenter(doc).heading
+              when Proc, Symbol
+                Deprecation.warn(self, "passing a #{field_or_opts.class} to link_to_document is deprecated and will be removed in Blacklight 8")
+                Deprecation.silence(Blacklight::IndexPresenter) do
+                  index_presenter(doc).label field_or_opts, opts
+                end
+              else # String
+                field_or_opts
+              end
+
+      # pull solr_document from input if we don't already have a solr_document
+      document = doc&.try(:solr_document) || doc
+      Deprecation.silence(Blacklight::UrlHelperBehavior) do
+        link_to label, generate_work_url(document, request), document_link_params(document, opts)
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    # OVERRIDE: Blacklight::UrlHelperBehavior:
+    # disable link jacking for tracking
+    # see https://playbook-staging.notch8.com/en/samvera/hyku/troubleshooting/multi-tenancy-and-full-urls
+    # If we need to preserve the link jacking for tracking, then we need to also amend
+    # method `session_tracking_params`so that instead of a path we have a URL
+    # @private
+    def document_link_params(_doc, opts)
+      opts.except(:label, :counter)
+    end
+    private :document_link_params
+  end
+end
diff --git a/app/helpers/hyrax_helper.rb b/app/helpers/hyrax_helper.rb
index c8f57f902..fd1caaecb 100644
--- a/app/helpers/hyrax_helper.rb
+++ b/app/helpers/hyrax_helper.rb
@@ -4,6 +4,7 @@ module HyraxHelper
   include ::BlacklightHelper
   include Hyrax::BlacklightOverride
   include Hyrax::HyraxHelperBehavior
+  include Hyku::BlacklightHelperBehavior
 
   def application_name
     Site.application_name || super

From 1c04b9ebac23677b146f9dd6a708518108a7deff Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Mon, 18 Dec 2023 19:15:13 -0500
Subject: [PATCH 087/126] =?UTF-8?q?=F0=9F=A7=B9=20Hyrax=205=20upgrade=20ad?=
 =?UTF-8?q?ditional=20specs=20(#2067)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹 More spec & controller fixes

 Ref https://github.com/scientist-softserv/hykuup_knapsack/issues/55

 - Contact form controller and pages controller duplicate some of the
 homepage controller behavior, so corresponding fixes are needed.
 - Update collections factory and collection_ability_spec to match hyrax
 and stop calling `.gid` on a collection_type.
 - Adjust permission_template_form_spec to adjust for removal of method
 `reset_access_controls!` and add a few new expectations instead.

* 🧹 Begin work on Roles Service

Working with Permission Templates has changed, requiring an adjustment
to both logic and specs.

* 🧹 Solr Document Ability Spec

* Rubocop fixes

* Fix typo of collection variable

* Reinstate some collections factory overrides

* Revert Rubocop changes

Caused spec failure in roles_service_spec.

* Fix create_default_admin_set_job_spec

* Restore mistakenly removed capta use

* 🧹 Stanford import specs

We have plans to remove the Stanford import logic, but for now, this
handles the specs that were failing, in an attempt to get CI to pass.

* Make Rubocop happy

* Fix typo
---
 .rubocop.yml                                  |   4 +
 .../hyrax/contact_form_controller.rb          |  42 +++---
 app/controllers/hyrax/pages_controller.rb     |  20 +--
 app/models/role.rb                            |   2 +-
 app/services/roles_service.rb                 |   4 +-
 lib/stanford/importer/purl_retriever.rb       |   2 +-
 spec/abilities/collection_ability_spec.rb     |   8 +-
 spec/abilities/solr_document_ability_spec.rb  |   2 +-
 spec/factories/collections.rb                 | 120 ++++--------------
 .../forms/permission_template_form_spec.rb    |   3 +-
 .../jobs/create_default_admin_set_job_spec.rb |   3 +-
 spec/lib/importer/mods_importer_spec.rb       |   2 +-
 .../lib/stanford/importer/purl_parser_spec.rb |   2 +-
 spec/services/roles_service_spec.rb           |   8 +-
 14 files changed, 80 insertions(+), 142 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index fd4518693..fc1044e12 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -74,6 +74,10 @@ Rails/ApplicationMailer:
 Rails/ApplicationRecord:
   Enabled: false
 
+Rails/HasAndBelongsToMany:
+  Exclude:
+    - 'app/models/role.rb'
+
 Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/endpoint.rb'
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
index e0c81d2c8..46bf0e59f 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller.rb
@@ -1,53 +1,55 @@
 # frozen_string_literal: true
 
-# OVERRIDE: Hyrax v3.4.0
-# - add inject_theme_views method for theming
-# - add homepage presenter for access to feature flippers
-# - add access to content blocks in the show method
-# - add @featured_collection_list to new method
+# OVERRIDE: Hyrax v5.0.0
+# - adds inject_theme_views method for theming
+# - adds homepage presenter for access to feature flippers
+# - adds access to content blocks in the show method
+# - adds @featured_collection_list to new method
+# - adds captcha
 
 module Hyrax
   class ContactFormController < ApplicationController
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
+    # OVERRIDE: Add for theming
     # Adds Hydra behaviors into the application controller
     include Blacklight::SearchContext
     include Blacklight::AccessControls::Catalog
     before_action :build_contact_form
     layout 'homepage'
+
     # OVERRIDE: Adding inject theme views method for theming
     around_action :inject_theme_views
     class_attribute :model_class
     self.model_class = Hyrax::ContactForm
     before_action :setup_negative_captcha, only: %i[new create]
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
+
+    # OVERRIDE: Add for theming
     # The search builder for finding recent documents
     # Override of Blacklight::RequestBuilders
     def search_builder_class
       Hyrax::HomepageSearchBuilder
     end
 
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
+    # OVERRIDE: Add for theming
     class_attribute :presenter_class
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
     self.presenter_class = Hyrax::HomepagePresenter
 
     helper Hyrax::ContentBlockHelper
 
     def new
-      # OVERRIDE: Hyrax v3.4.0 Add for theming
+      # OVERRIDE: Add for theming
       @presenter = presenter_class.new(current_ability, collections)
       @featured_researcher = ContentBlock.for(:researcher)
       @marketing_text = ContentBlock.for(:marketing)
       @home_text = ContentBlock.for(:home_text)
       @featured_work_list = FeaturedWorkList.new
-      # OVERRIDE: Hyrax 3.4.0 add @featured_collection_list
       @featured_collection_list = FeaturedCollectionList.new
       @announcement_text = ContentBlock.for(:announcement)
     end
 
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def create
-      # not spam, form is valid, and captcha is valid
+      # not spam and a valid form
+      # Override to include captcha
       @captcha.values[:category] = params[:contact_form][:category]
       @captcha.values[:contact_method] = params[:contact_form][:contact_method]
       @captcha.values[:subject] = params[:contact_form][:subject]
@@ -58,14 +60,13 @@ def create
         after_deliver
       else
         flash.now[:error] = 'Sorry, this message was not sent successfully. ' +
-                            @contact_form.errors.full_messages.map(&:to_s).join(", ") +
-                            "" + @captcha.error
+                            @contact_form.errors.full_messages.map(&:to_s).join(", ")
       end
       render :new
     rescue RuntimeError => exception
       handle_create_exception(exception)
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def handle_create_exception(exception)
       logger.error("Contact form failed to send: #{exception.inspect}")
@@ -90,11 +91,12 @@ def contact_form_params
     end
 
     # OVERRIDE: return collections for theming
+    # Return 6 collections, sorts by title
     def collections(rows: 6)
-      builder = Hyrax::CollectionSearchBuilder.new(self)
-                                              .rows(rows)
-      response = repository.search(builder)
-      response.documents
+      Hyrax::CollectionsService.new(self).search_results do |builder|
+        builder.rows(rows)
+        builder.merge(sort: "title_ssi")
+      end
     rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
       []
     end
diff --git a/app/controllers/hyrax/pages_controller.rb b/app/controllers/hyrax/pages_controller.rb
index 2d54917fe..ed12e044d 100644
--- a/app/controllers/hyrax/pages_controller.rb
+++ b/app/controllers/hyrax/pages_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE: Hyrax v3.4.0
+# OVERRIDE: Hyrax v5.0.0
 # - add inject_theme_views method for theming
 # - add homepage presenter for access to feature flippers
 # - add access to content blocks in the show method
@@ -12,7 +12,7 @@ class PagesController < ApplicationController
     load_and_authorize_resource class: ContentBlock, except: :show
     layout :pages_layout
 
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
+    # OVERRIDE: Add for theming
     # Adds Hydra behaviors into the application controller
     include Blacklight::SearchContext
     include Blacklight::AccessControls::Catalog
@@ -20,7 +20,7 @@ class PagesController < ApplicationController
     # OVERRIDE: Adding inject theme views method for theming
     around_action :inject_theme_views
 
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
+    # OVERRIDE: Add for theming
     # The search builder for finding recent documents
     # Override of Blacklight::RequestBuilders
     def search_builder_class
@@ -29,20 +29,19 @@ def search_builder_class
 
     # OVERRIDE: Hyrax v3.4.0 Add for theming
     class_attribute :presenter_class
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
     self.presenter_class = Hyrax::HomepagePresenter
 
     helper Hyrax::ContentBlockHelper
 
     def show
       @page = ContentBlock.for(params[:key])
-      # OVERRIDE: Hyrax v3.4.0 Add for theming
+
+      # OVERRIDE: Additional for theming
       @presenter = presenter_class.new(current_ability, collections)
       @featured_researcher = ContentBlock.for(:researcher)
       @marketing_text = ContentBlock.for(:marketing)
       @home_text = ContentBlock.for(:home_text)
       @featured_work_list = FeaturedWorkList.new
-      # OVERRIDE here to add featured collection list to show page
       @featured_collection_list = FeaturedCollectionList.new
       @announcement_text = ContentBlock.for(:announcement)
     end
@@ -87,11 +86,12 @@ def pages_layout
     end
 
     # OVERRIDE: return collections for theming
+    # Return 6 collections, sorts by title
     def collections(rows: 6)
-      builder = Hyrax::CollectionSearchBuilder.new(self)
-                                              .rows(rows)
-      response = repository.search(builder)
-      response.documents
+      Hyrax::CollectionsService.new(self).search_results do |builder|
+        builder.rows(rows)
+        builder.merge(sort: "title_ssi")
+      end
     rescue Blacklight::Exceptions::ECONNREFUSED, Blacklight::Exceptions::InvalidRequest
       []
     end
diff --git a/app/models/role.rb b/app/models/role.rb
index 7e3b3b543..f30b58e30 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Role < ApplicationRecord
-  has_many :users, through: :users_roles
+  has_and_belongs_to_many :users, join_table: :users_roles
   has_many :group_roles, dependent: :destroy
   has_many :groups, through: :group_roles
 
diff --git a/app/services/roles_service.rb b/app/services/roles_service.rb
index fc8965229..3d4b57f67 100644
--- a/app/services/roles_service.rb
+++ b/app/services/roles_service.rb
@@ -128,7 +128,7 @@ def create_collection_accesses!
           agent_id: 'collection_reader'
         )
 
-        c.reset_access_controls! if pt.access_grants.count != original_access_grants_count
+        pt.reset_access_controls_for(collection: c) if pt.access_grants.count != original_access_grants_count
       end
     end
     # rubocop:enable Metrics/MethodLength
@@ -165,7 +165,7 @@ def create_admin_set_accesses!
           agent_id: 'work_editor'
         )
 
-        as.reset_access_controls! if pt.access_grants.count != original_access_grants_count
+        pt.reset_access_controls_for(collection: as) if pt.access_grants.count != original_access_grants_count
       end
     end
     # rubocop:enable Metrics/MethodLength
diff --git a/lib/stanford/importer/purl_retriever.rb b/lib/stanford/importer/purl_retriever.rb
index 373d5f7bb..1ddf32b50 100644
--- a/lib/stanford/importer/purl_retriever.rb
+++ b/lib/stanford/importer/purl_retriever.rb
@@ -23,7 +23,7 @@ def path
 
       def conn
         @conn ||= Faraday.new(url: 'https://purl.stanford.edu') do |faraday|
-          faraday.adapter :httpclient
+          faraday.adapter Faraday.default_adapter
           faraday.use Faraday::Response::RaiseError # raise exceptions on 40x, 50x responses
         end
       end
diff --git a/spec/abilities/collection_ability_spec.rb b/spec/abilities/collection_ability_spec.rb
index 17b70f9a5..8caad8577 100644
--- a/spec/abilities/collection_ability_spec.rb
+++ b/spec/abilities/collection_ability_spec.rb
@@ -10,7 +10,7 @@
   let(:ability) { Ability.new(current_user) }
   let(:user) { create(:user) }
   let(:current_user) { user }
-  let(:collection_type_gid) { create(:collection_type).gid }
+  let(:collection_type_gid) { create(:collection_type).to_global_id.to_s }
   let(:solr_document) { SolrDocument.new(collection.to_solr) }
   let(:id) { collection.id }
 
@@ -321,7 +321,7 @@
              permission_template: collection.permission_template,
              agent_type: 'user',
              agent_id: user.user_key)
-      collection.reset_access_controls!
+      collection.permission_template.reset_access_controls_for(collection:)
     end
 
     it 'allows most abilities' do
@@ -366,7 +366,7 @@
              permission_template: collection.permission_template,
              agent_type: 'user',
              agent_id: user.user_key)
-      collection.reset_access_controls!
+      collection.permission_template.reset_access_controls_for(collection:)
     end
 
     it 'allows deposit related abilities' do
@@ -413,7 +413,7 @@
              permission_template: collection.permission_template,
              agent_type: 'user',
              agent_id: user.user_key)
-      collection.reset_access_controls!
+      collection.permission_template.reset_access_controls_for(collection:)
     end
 
     it 'allows viewing only ability' do
diff --git a/spec/abilities/solr_document_ability_spec.rb b/spec/abilities/solr_document_ability_spec.rb
index 529539b80..b0a0382ef 100644
--- a/spec/abilities/solr_document_ability_spec.rb
+++ b/spec/abilities/solr_document_ability_spec.rb
@@ -14,7 +14,7 @@
 
   # OVERRIDE: add specs for custom ability logic
   context 'with Collection solr doc' do
-    let(:collection_type_gid) { create(:collection_type).gid }
+    let(:collection_type_gid) { create(:collection_type).to_global_id }
     let(:collection) do
       create(
         :collection_lw,
diff --git a/spec/factories/collections.rb b/spec/factories/collections.rb
index ab4ed9e42..c0607e8d7 100644
--- a/spec/factories/collections.rb
+++ b/spec/factories/collections.rb
@@ -52,7 +52,7 @@
         attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge) # rubocop:disable Metrics/LineLength
 
         create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: collection.id)
-        collection.reset_access_controls!
+        collection.permission_template.reset_access_controls_for(collection:)
       end
     end
 
@@ -68,16 +68,15 @@
   end
 
   # ---
-  # NOTE(bkiahstroud): Everything below this point in the file was brought over from Hyrax 2.5.1.
-  # TODO(bkiahstroud): Work needs to be done to reconcile these two factories.
+  # Everything below this point in the file was brought over from Hyrax 5.0.0.
+  # Work needs to be done to reconcile these two factories.
   # ---
-
   # Tests that create a Fedora Object are very slow.  This factory lets you control which parts of the object ecosystem
   # get built.
   #
-  # PREFERRED: Use build whenever possible.  You can control the creation of the permission template, collection type,
-  #            and solr document by passing parameters to the build(:collection_lw) method.  That way you can build
-  #            only the parts needed for a specific test.
+  # PREFERRED: Use build whenever possible.  You can control the creation of the permission template, collection type, and
+  #            solr document by passing parameters to the build(:collection_lw) method.  That way you can build only the parts
+  #            needed for a specific test.
   #
   # AVOID: Do not use create unless absolutely necessary.  It will create everything including the Fedora object.
   #
@@ -85,16 +84,13 @@
   #          NOTE: A user is automatically created as the owner of the collection.
   #   let(:collection) { build(:collection_lw) }
   #
-  # @example Simple build of a collection with no additional parts created.  User is the owner of the collection.
-  # Lightest weight.
+  # @example Simple build of a collection with no additional parts created.  User is the owner of the collection.  Lightest weight.
   #   let(:collection) { build(:collection_lw, user:) }
   #
-  # @example Simple build of a collection with only solr-document.  Owner is given edit-access in solr-document.
-  # Light weight.
+  # @example Simple build of a collection with only solr-document.  Owner is given edit-access in solr-document. Light weight.
   #   let(:collection) { build(:collection_lw, with_solr_document: true) }
   #
-  # @example Simple build of a collection with only a permission template created.  Owner is set as a manager.
-  # Light weight.
+  # @example Simple build of a collection with only a permission template created.  Owner is set as a manager.  Light weight.
   #   let(:collection) { build(:collection_lw, with_permission_template: true) }
   #
   # @example Build a collection with only a permission template created.  Permissions are set based on
@@ -118,18 +114,11 @@
   #                         manage_groups: [group_name],    # multiple groups can be listed
   #                         deposit_groups: [group_name],
   #                         view_groups: [group_name],  } }
-  #   let(:collection) do
-  #     build(
-  #       :collection_lw,
-  #       user: ,
-  #       with_permission_template: permissions,
-  #       with_solr_document: true
-  #     )
-  #   end
+  #   let(:collection) { build(:collection_lw, user: , with_permission_template: permissions, with_solr_document: true) }
   #
   # @example Build a collection generating its collection type with specific settings. Light Weight.
   #          NOTE: Do not use this approach if you need access to the collection type in the test.
-  #          DEFAULT: If `collection_type_settings` and `collection_type_gid` are not specified, then the default
+  #          DEFAULT: If `collection_type_settings` and `collection_type` are not specified, then the default
   #          User Collection type will be used.
   #   # Any not specified default to ON.  At least one setting should be specified.
   #   let(:settings) { [
@@ -152,56 +141,26 @@
   #                      :allow_multiple_membership, # OR :not_allow_multiple_membership
   #                    ] }
   #   let(:collection_type) { create(:collection_lw_type, settings) }
-  #   let(:collection) { build(:collection_lw, collection_type_gid: collection_type.gid) }
-  #
-  # @example Build a collection with nesting fields set in the solr document.  Light weight.
-  #          NOTE: The property `with_nesting_attributes` is only supported for building collections.  The attributes
-  #                will be overwritten by the save process when creating a collection, thus effectively ignoring
-  #                this property.
-  #   let(:collection) { build(:collection_lw, with_nesting_attributes: { ancestors: ['Parent_1'],
-  #                                                                       parent_ids: ['Parent_1'],
-  #                                                                       pathnames: ['Parent_1/Collection123'],
-  #                                                                       depth: 2 }) }
-  #
-  # @example Create a collection with everything.  Extreme heavy weight.  This is very slow and should be avoided.
-  #          NOTE: Everything gets created.
-  #          NOTE: Build options effect created collections as follows...
-  #                 * `with_permission_template` can specify user/group permissions.
-  #                    A permission template is always created.
-  #                 * `collection_type_settings` can specify to create a collection type with specific settings
-  #                 * `with_solr_document` is ignored.  A solr document is always created.
-  #                 * `with_nested_attributes` is ignored.
-  #          NOTE: Additional process is required for testing nested collections with Fedora objects.  See next example.
-  #   let(:collection) { create(:collection_lw) }
-  #
-  # @example Create collections for use with nested collection index testing.
-  #          NOTE: For light weight nested collection testing using solr documents only,
-  #                see `with_nested_attributes` above
-  #          NOTE: Full indexed nested collections with solr documents and Fedora objects are created by...
-  #                 * creating multiple collections (expensive)
-  #                 * nesting them and saving - causing reindex of the Fedora objects (expensive)
-  #                For tests of nesting functionality requiring the Fedora object and reindexing, in the test itself
-  #                include `:with_nested_reindexing`
-  #    it "returns the collection and its members", :with_nested_reindexing do
+  #   let(:collection) { build(:collection_lw, collection_type: collection_type) }
 
   factory :collection_lw, class: Collection do
     transient do
       user { create(:user) }
 
+      collection_type { nil }
       collection_type_settings { nil }
       with_permission_template { false }
-      with_nesting_attributes { nil }
       with_solr_document { false }
     end
     sequence(:title) { |n| ["Collection Title #{n}"] }
 
     after(:build) do |collection, evaluator|
+      collection.collection_type_gid = evaluator.collection_type.to_global_id if evaluator.collection_type&.id.present?
       collection.apply_depositor_metadata(evaluator.user.user_key)
 
       CollectionLwFactoryHelper.process_collection_type_settings(collection, evaluator)
       CollectionLwFactoryHelper.process_with_permission_template(collection, evaluator)
       CollectionLwFactoryHelper.process_with_solr_document(collection, evaluator)
-      CollectionLwFactoryHelper.process_with_nesting_attributes(collection, evaluator)
     end
 
     before(:create) do |collection, evaluator|
@@ -210,7 +169,7 @@
     end
 
     after(:create) do |collection, _evaluator|
-      collection.reset_access_controls!
+      collection.permission_template.reset_access_controls_for(collection:, interpret_visibility: true)
     end
 
     factory :public_collection_lw, traits: [:public_lw]
@@ -248,14 +207,13 @@
   factory :user_collection_lw, class: Collection do
     transient do
       user { create(:user) }
+      collection_type { create(:user_collection_type) }
     end
 
     sequence(:title) { |n| ["User Collection Title #{n}"] }
 
     after(:build) do |collection, evaluator|
       collection.apply_depositor_metadata(evaluator.user.user_key)
-      collection_type = create(:user_collection_type)
-      collection.collection_type_gid = collection_type.gid
     end
   end
 
@@ -294,8 +252,7 @@ def self.permission_from_template(permission_template_attributes, permission_key
     end
     private_class_method :permission_from_template
 
-    # @param [Hash] permission_template_attributes where names
-    # identify the role and value are the user keys for that role
+    # @param [Hash] permission_template_attributes where names identify the role and value are the user keys for that role
     # @parem [String] creator_user is the user who created the new collection
     # @param [Boolean] include_creator, when true, adds the creator_user as a manager
     # @returns array of user keys
@@ -305,8 +262,7 @@ def self.user_managers(permission_template_attributes, creator_user)
       managers
     end
 
-    # @param [Hash] permission_template_attributes where names
-    # identify the role and value are the user keys for that role
+    # @param [Hash] permission_template_attributes where names identify the role and value are the user keys for that role
     # @returns array of user keys
     # OVERRIDE: add default PermissionTemplateAccess group with :manage access for :collection_manager role
     def self.group_managers(permission_template_attributes)
@@ -315,29 +271,25 @@ def self.group_managers(permission_template_attributes)
       group_managers
     end
 
-    # @param [Hash] permission_template_attributes where names
-    # identify the role and value are the user keys for that role
+    # @param [Hash] permission_template_attributes where names identify the role and value are the user keys for that role
     # @returns array of user keys
     def self.user_depositors(permission_template_attributes)
       permission_from_template(permission_template_attributes, :deposit_users)
     end
 
-    # @param [Hash] permission_template_attributes where names
-    # identify the role and value are the user keys for that role
+    # @param [Hash] permission_template_attributes where names identify the role and value are the user keys for that role
     # @returns array of user keys
     def self.group_depositors(permission_template_attributes)
       permission_from_template(permission_template_attributes, :deposit_groups)
     end
 
-    # @param [Hash] permission_template_attributes where names
-    # identify the role and value are the user keys for that role
+    # @param [Hash] permission_template_attributes where names identify the role and value are the user keys for that role
     # @returns array of user keys
     def self.user_viewers(permission_template_attributes)
       permission_from_template(permission_template_attributes, :view_users)
     end
 
-    # @param [Hash] permission_template_attributes where names
-    # identify the role and value are the user keys for that role
+    # @param [Hash] permission_template_attributes where names identify the role and value are the user keys for that role
     # @returns array of user keys
     # OVERRIDE: add default PermissionTemplateAccess groups with
     # :view access for :collection_editor and :collection_reader roles
@@ -348,8 +300,7 @@ def self.group_viewers(permission_template_attributes)
     end
 
     # Process the collection_type_settings transient property such that...
-    # * creates the collection type with specified settings if collection_type_settings
-    #   has settings (ignores collection_type_gid)
+    # * creates the collection type with specified settings if collection_type_settings has settings (ignores collection_type_gid)
     # * uses passed in collection type if collection_type_gid is specified AND collection_type_settings is nil
     # * uses default User Collection type if neither are specified
     # @param [Collection] collection object being built/created by the factory
@@ -371,9 +322,7 @@ def self.process_collection_type_settings(collection, evaluator)
     # @param [Class] evaluator holding the transient properties for the current build/creation process
     # @param [Boolean] if true, force the permission template to be created
     def self.process_with_permission_template(collection, evaluator, force = false)
-      return unless force ||
-                    evaluator.with_permission_template ||
-                    RSpec.current_example.metadata[:with_nested_reindexing]
+      return unless force || evaluator.with_permission_template
       collection.id ||= FactoryBot.generate(:object_id)
       attributes = { source_id: collection.id }
       attributes[:manage_users] = user_managers(evaluator.with_permission_template, evaluator.user)
@@ -381,22 +330,7 @@ def self.process_with_permission_template(collection, evaluator, force = false)
       attributes[:manage_groups] = group_managers(evaluator.with_permission_template)
       attributes[:view_groups] = group_viewers(evaluator.with_permission_template)
       attributes = evaluator.with_permission_template.merge(attributes) if evaluator.with_permission_template.respond_to?(:merge)
-      FactoryBot.create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: collection.id) # rubocop:disable Style/GuardClause
-    end
-
-    # Process the with_nesting_attributes transient property such that...
-    # * adds nesting related solr-document fields for ancestors, parent_ids, pathnames, and depth
-    # @param [Collection] collection object being built/created by the factory
-    # @param [Class] evaluator holding the transient properties for the current build/creation process
-    def self.process_with_nesting_attributes(collection, evaluator)
-      return unless evaluator.with_nesting_attributes.present? && collection.nestable?
-      Hyrax::Adapters::NestingIndexAdapter.add_nesting_attributes(
-        solr_doc: solr_document_with_permissions(collection, evaluator),
-        ancestors: evaluator.with_nesting_attributes[:ancestors],
-        parent_ids: evaluator.with_nesting_attributes[:parent_ids],
-        pathnames: evaluator.with_nesting_attributes[:pathnames],
-        depth: evaluator.with_nesting_attributes[:depth]
-      )
+      FactoryBot.create(:permission_template, attributes) unless Hyrax::PermissionTemplate.find_by(source_id: collection.id)
     end
 
     # Process the with_solr_document transient property such that...
@@ -406,9 +340,7 @@ def self.process_with_nesting_attributes(collection, evaluator)
     # @param [Class] evaluator holding the transient properties for the current build/creation process
     def self.process_with_solr_document(collection, evaluator)
       return unless evaluator.with_solr_document
-      # will create the solr document there instead
-      return if evaluator.with_nesting_attributes.present? && collection.nestable?
-      ActiveFedora::SolrService.add(solr_document_with_permissions(collection, evaluator), commit: true)
+      Hyrax::SolrService.add(solr_document_with_permissions(collection, evaluator), commit: true)
     end
 
     # Return the collection's solr document with permissions added, such that...
diff --git a/spec/forms/hyrax/forms/permission_template_form_spec.rb b/spec/forms/hyrax/forms/permission_template_form_spec.rb
index df35f09df..2c791d163 100644
--- a/spec/forms/hyrax/forms/permission_template_form_spec.rb
+++ b/spec/forms/hyrax/forms/permission_template_form_spec.rb
@@ -11,9 +11,10 @@
 
   it { is_expected.to delegate_method(:available_workflows).to(:model) }
   it { is_expected.to delegate_method(:active_workflow).to(:model) }
+  it { is_expected.to delegate_method(:source).to(:model) }
   it { is_expected.to delegate_method(:source_model).to(:model) }
+  it { is_expected.to delegate_method(:source_id).to(:model) }
   it { is_expected.to delegate_method(:visibility).to(:model) }
-  it { is_expected.to delegate_method(:reset_access_controls!).to(:source_model) }
 
   it 'is expected to delegate method #active_workflow_id to #active_workflow#id' do
     workflow = double(:workflow, id: 1234, active: true)
diff --git a/spec/jobs/create_default_admin_set_job_spec.rb b/spec/jobs/create_default_admin_set_job_spec.rb
index 6ee759a0c..92f7c172e 100644
--- a/spec/jobs/create_default_admin_set_job_spec.rb
+++ b/spec/jobs/create_default_admin_set_job_spec.rb
@@ -5,8 +5,7 @@
 
   describe '#perform' do
     it 'creates a new admin set for an account' do
-      expect(AdminSet).to receive(:find_or_create_default_admin_set_id).once
-      described_class.perform_now(account)
+      expect { described_class.perform_now(account) }.to change(AdminSet, :count).by(1)
     end
   end
 end
diff --git a/spec/lib/importer/mods_importer_spec.rb b/spec/lib/importer/mods_importer_spec.rb
index be03fa535..adb3937d6 100644
--- a/spec/lib/importer/mods_importer_spec.rb
+++ b/spec/lib/importer/mods_importer_spec.rb
@@ -64,7 +64,7 @@
     context 'when the collection already exists' do
       let!(:existing) { FactoryBot.create(:collection, id: 'kx532cb7981', title: ['Test Collection']) }
 
-      it 'adds metadata to existing collection' do
+      it 'adds metadata to existing collection', skip: 'importer.import(file) throws an error in ObjectFactory' do
         coll = nil
         expect do
           coll = importer.import(file)
diff --git a/spec/lib/stanford/importer/purl_parser_spec.rb b/spec/lib/stanford/importer/purl_parser_spec.rb
index 40374385a..42e51c61e 100644
--- a/spec/lib/stanford/importer/purl_parser_spec.rb
+++ b/spec/lib/stanford/importer/purl_parser_spec.rb
@@ -3,7 +3,7 @@
 require 'stanford'
 
 RSpec.describe Stanford::Importer::PurlParser do
-  let(:xml) { fixture_file('purl/bc390xk2647.xml').read }
+  let(:xml) { fixture_file_upload('purl/bc390xk2647.xml').read }
   let(:parser) { described_class.new(xml) }
 
   describe "attributes" do
diff --git a/spec/services/roles_service_spec.rb b/spec/services/roles_service_spec.rb
index 71ac2a8a4..8db8ad79f 100644
--- a/spec/services/roles_service_spec.rb
+++ b/spec/services/roles_service_spec.rb
@@ -158,7 +158,7 @@
       end
 
       it "does not reset the Collection's access controls unnecessarily" do
-        expect_any_instance_of(Collection).not_to receive(:reset_access_controls!)
+        expect_any_instance_of(Hyrax::PermissionTemplate).not_to receive(:reset_access_controls_for)
 
         roles_service.create_collection_accesses!
       end
@@ -236,7 +236,7 @@
       end
 
       it "resets the Collection's access controls" do
-        expect_any_instance_of(Collection).to receive(:reset_access_controls!).once
+        expect_any_instance_of(Hyrax::PermissionTemplate).to receive(:reset_access_controls_for).once
 
         roles_service.create_collection_accesses!
       end
@@ -253,7 +253,7 @@
       end
 
       it "does not reset the AdminSet's access controls unnecessarily" do
-        expect_any_instance_of(AdminSet).not_to receive(:reset_access_controls!)
+        expect_any_instance_of(Hyrax::PermissionTemplate).not_to receive(:reset_access_controls_for)
 
         roles_service.create_admin_set_accesses!
       end
@@ -351,7 +351,7 @@
       end
 
       it "resets the AdminSet's access controls" do
-        expect_any_instance_of(AdminSet).to receive(:reset_access_controls!).once
+        expect_any_instance_of(Hyrax::PermissionTemplate).to receive(:reset_access_controls_for).once
 
         roles_service.create_admin_set_accesses!
       end

From 2845fd581387e0f1cf213813a615e45183157184 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Tue, 19 Dec 2023 11:33:48 -0500
Subject: [PATCH 088/126] Update Hyrax to pull in most recent changes

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 3e37563c1..6adeb2c90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,7 +39,7 @@ GIT
 
 GIT
   remote: https://github.com/samvera/hyrax.git
-  revision: 0108fed6c83dd4a449b37cc1a6c19787ec54921d
+  revision: b7891b758411c59f71ff54212e0d250fcc47e35f
   branch: double_combo
   specs:
     hyrax (5.0.0.rc2)

From ae6b9cd3bc23ec0875fe34d3b5efbd9fb3ccf0b0 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Tue, 19 Dec 2023 11:57:31 -0500
Subject: [PATCH 089/126] More spec fixes

Menu presenter: removed html_options
Application Helper: override for missing_translations now receives
`false` when translation wasn't found rather than a string.
---
 app/helpers/application_helper.rb           | 9 ++++++++-
 spec/presenters/hyku/menu_presenter_spec.rb | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e4cd54f18..7bbc7c3e3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,6 +26,13 @@ def locale_for(type:, term:, record_class:)
   end
 
   def missing_translation(value, _options = {})
-    value.include?('translation missing')
+    case value.class
+    when FalseClass, NilClass
+      true
+    when String
+      value.include?('translation missing')
+    else
+      raise "Unexpected value #{value.inspect}"
+    end
   end
 end
diff --git a/spec/presenters/hyku/menu_presenter_spec.rb b/spec/presenters/hyku/menu_presenter_spec.rb
index f1555a458..d2ee95ae7 100644
--- a/spec/presenters/hyku/menu_presenter_spec.rb
+++ b/spec/presenters/hyku/menu_presenter_spec.rb
@@ -125,7 +125,7 @@
     let(:id) { "sample_id" }
     let(:icon_class) { "sample-icon-class" }
     let(:open) { true }
-    let(:html_options) { { class: "sample-class", data: { test: "test" } } }
+    let(:title) { "Cats" }
     let(:block) { proc { "<li>Item</li>" } }
 
     let(:presenter) { instance_double("CollapsableSectionPresenter") }
@@ -137,13 +137,13 @@
         id:,
         icon_class:,
         open:,
-        html_options:
+        title:
       ).and_return(presenter)
     end
 
     it "calls the render method on the CollapsableSectionPresenter with the given block" do
       expect(presenter).to receive(:render)
-      instance.collapsable_section(text, id:, icon_class:, open:, **html_options, &block)
+      instance.collapsable_section(text, id:, icon_class:, open:, title:, &block)
     end
   end
 end

From f086c09f7bf4d65e1d99464fc5d36c6aec689ea6 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Tue, 19 Dec 2023 12:56:50 -0500
Subject: [PATCH 090/126] Fix missing translation logic

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7bbc7c3e3..0f7fb4d98 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,7 +26,7 @@ def locale_for(type:, term:, record_class:)
   end
 
   def missing_translation(value, _options = {})
-    case value.class
+    case value
     when FalseClass, NilClass
       true
     when String

From 716b7ef55f7b51fc20f4750a8bdf0ffa226b0854 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Tue, 19 Dec 2023 13:55:28 -0500
Subject: [PATCH 091/126] Fix  missing_translation override

Simplify and fix override. A missing translation now returns `false`
instead of the text `translation missing`.

The super method requires the `option` parameter, so we opted to keep
the override.
---
 app/helpers/application_helper.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0f7fb4d98..0e8cba8e7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -26,13 +26,7 @@ def locale_for(type:, term:, record_class:)
   end
 
   def missing_translation(value, _options = {})
-    case value
-    when FalseClass, NilClass
-      true
-    when String
-      value.include?('translation missing')
-    else
-      raise "Unexpected value #{value.inspect}"
-    end
+    return true if value.try(:false?)
+    false
   end
 end

From 75d519f92b05992a2f4d2311cc4017072e895e24 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 19 Dec 2023 13:39:18 -0500
Subject: [PATCH 092/126] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20copied=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The overrides are no longer necessary.  In reviewing the diff between
what I'm removing and what is in the `double_combo` branch; the major
change was adding an operator for the `reduce` function.  The breaking
problem was that the method signature of one of the copied methods has
changed in Hyrax 5.0.

The removal considers that Hyrax::Group is of two different classes:

- In Hyrax, it is a plain old Ruby object
- In Hyku, it is descended from ActiveRecord::Base

The two classes have different instantiation parameters.  Hence the
introduction of `Hyrax::Group.new` in this code.
---
 app/models/hyrax/group.rb                     |  20 +
 .../hyrax/workflow/permission_query.rb        | 452 ------------------
 spec/models/hyrax/group_spec.rb               |  12 +
 .../hyrax/workflow/permission_query_spec.rb   | 257 ----------
 4 files changed, 32 insertions(+), 709 deletions(-)
 delete mode 100644 app/services/hyrax/workflow/permission_query.rb
 delete mode 100644 spec/services/hyrax/workflow/permission_query_spec.rb

diff --git a/app/models/hyrax/group.rb b/app/models/hyrax/group.rb
index 290ed6e2f..6a35e8fb3 100644
--- a/app/models/hyrax/group.rb
+++ b/app/models/hyrax/group.rb
@@ -16,6 +16,26 @@ class Group < ApplicationRecord
     before_destroy :can_destroy?
     after_destroy :remove_all_members
 
+    ##
+    # What is going on here?  In Hyrax proper, the Group model is a plain old Ruby object (PORO). In
+    # Hyku, the {Hyrax::Group} is based on ActiveRecord.
+    #
+    # The Hyrax version instantiates with a single string parameter.  Importantly, we want to re-use
+    # the Hyrax::Workflow::PermissionQuery logic, without re-writing it.  In particular we want to
+    # consider the Hyrax::Workflow::PermissionQuery#scope_processing_agents_for which casts the
+    # group to a Sipity::Agent
+    #
+    # @see https://github.com/samvera/hyrax/blob/main/app/models/hyrax/group.rb
+    # @see https://github.com/samvera/hyrax/blob/main/app/services/hyrax/workflow/permission_query.rb
+    def self.new(*args)
+      # This logic path is likely coming from Hyrax specific code; in which it expects a string.
+      if args.size == 1 && args.first.is_a?(String)
+        find_by_intialize_by(name: args.first)
+      else
+        super
+      end
+    end
+
     def self.name_prefix
       DEFAULT_NAME_PREFIX
     end
diff --git a/app/services/hyrax/workflow/permission_query.rb b/app/services/hyrax/workflow/permission_query.rb
deleted file mode 100644
index e214fd978..000000000
--- a/app/services/hyrax/workflow/permission_query.rb
+++ /dev/null
@@ -1,452 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE Hyrax v3.4.2 Expand functionality for Groups with Roles Feature
-# @see https://github.com/samvera/hyku/wiki/Groups-with-Roles-Feature
-# rubocop:disable Metrics/ModuleLength
-module Hyrax
-  module Workflow
-    # Welcome intrepid developer. You have stumbled into some complex data
-    # interactions. There are a lot of data collaborators regarding these tests.
-    # I would love this to be more in isolation, but that is not in the cards as
-    # there are at least 16 database tables interacting to ultimately answer the
-    # following question:
-    #
-    # * What actions can a given user take on an entity?
-    #
-    # Could there be more efficient queries? Yes. However, the composition of
-    # queries has proven to be a very powerful means of understanding and
-    # exploring the problem.
-    #
-    # @note There is an indication of public or private api. The intent of this
-    #   is to differentiate what are methods that are the primary entry points
-    #   as understood as of the commit that has the @api tag. However, these are
-    #   public methods because they have been tested in isolation and are used
-    #   to help compose the `@api public` methods.
-    #
-    # @todo Refactor the large ABC methods in this module.
-    module PermissionQuery
-      module_function
-
-      def entity_responsibilities
-        @entity_responsibilities ||= Sipity::EntitySpecificResponsibility.arel_table
-      end
-
-      def workflow_responsibilities
-        @workflow_responsibilities ||= Sipity::WorkflowResponsibility.arel_table
-      end
-
-      def workflow_roles
-        @workflow_roles ||= Sipity::WorkflowRole.arel_table
-      end
-
-      # @api public
-      #
-      # For the given :user and :entity return only workflow actions that meet all of the following:
-      #
-      # * available for the :entity's workflow state
-      # * permitted to be taken by one or more roles in which the user is assigned
-      #   either at the workflow level or the entity level.
-      #
-      # * Actions to which the user Only actions permitted to the user
-      #
-      # @param user [User]
-      # @param entity [Object] an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
-      def scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
-        workflow_actions_scope = scope_workflow_actions_available_for_current_state(entity:)
-        workflow_state_actions_scope = scope_permitted_entity_workflow_state_actions(user:, entity:)
-        workflow_actions_scope.where(
-          workflow_actions_scope.arel_table[:id].in(
-            workflow_state_actions_scope.arel_table.project(
-              workflow_state_actions_scope.arel_table[:workflow_action_id]
-            ).where(workflow_state_actions_scope.arel.constraints.reduce)
-          )
-        )
-      end
-
-      # @api public
-      #
-      # Agents associated with the given :entity and how they are associated
-      # with the given.
-      #
-      # @param entity [Object] that can be converted into a Sipity::Entity
-      # @param role [Object] that can be converted into a Sipity::Role
-      # @return [ActiveRecord::Relation<Sipity::Agent>] augmented with
-      #
-      def scope_agents_associated_with_entity_and_role(entity:, role:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        entity = Sipity::Entity(entity)
-        role = Sipity::Role(role)
-
-        agents = Sipity::Agent.arel_table
-
-        agents_select_manager = agents.project(
-          :*,
-          Arel.sql("'#{Sipity::Agent::ENTITY_LEVEL_AGENT_RELATIONSHIP}'").as('agent_processing_relationship')
-        ).where(
-          agents[:id].in(
-            entity_responsibilities.project(entity_responsibilities[:agent_id]).join(workflow_roles).on(
-              workflow_roles[:id].eq(entity_responsibilities[:workflow_role_id])
-            ).where(
-              entity_responsibilities[:entity_id].eq(entity.id).and(
-                workflow_roles[:role_id].eq(role.id)
-              )
-            )
-          )
-        ).union(
-          agents.project(
-            :*,
-            Arel.sql("'#{Sipity::Agent::WORKFLOW_LEVEL_AGENT_RELATIONSHIP}'").as('agent_processing_relationship')
-          ).where(
-            agents[:id].in(
-              workflow_responsibilities.project(workflow_responsibilities[:agent_id]).join(workflow_roles).on(
-                workflow_roles[:id].eq(workflow_responsibilities[:workflow_role_id])
-              ).where(
-                workflow_roles[:workflow_id].eq(entity.workflow_id).and(
-                  workflow_roles[:role_id].eq(role.id)
-                )
-              )
-            )
-          )
-        )
-        # I would love to use the following:
-        #  `Agent.find_by_sql(agents_select_manager.to_sql)`
-        #
-        # However AREL is adding an opening and closing parenthesis to the query
-        # statement. So I needed to massage that output, as follows:
-        #
-        # ```ruby
-        #  Agent.find_by_sql(
-        #    agents_select_manager.to_sql.sub(/\A\s*\(\s*(.*)\s*\)\s*\Z/,'\1')
-        #  )
-        # ```
-        #
-        # Instead I'm taking an example from:
-        # https://github.com/danshultz/mastering_active_record_sample_code/blob/a656c60ca7a2e27b5cd1aadbdf3bdc1814c37000/app/models/beer.rb#L77-L81
-        #
-        # Note, I'm making a dynamic query with a result the same as the table
-        # name of the model that I'm using.
-        Sipity::Agent.from(agents.create_table_alias(agents_select_manager, agents.table_name)).all
-      end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-      # @api public
-      #
-      # Roles associated with the given :entity
-      # @param entity [Object] that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::Role>]
-      def scope_roles_associated_with_the_given_entity(entity:)
-        entity = Sipity::Entity(entity)
-        return Sipity::Role.none unless entity
-        Sipity::Role.where(
-          Sipity::Role.arel_table[:id].in(
-            workflow_roles.project(workflow_roles[:role_id]).where(
-              workflow_roles[:workflow_id].eq(entity.workflow_id)
-            )
-          )
-        )
-      end
-
-      # @api public
-      #
-      # Is the user authorized to take the processing action on the given
-      # entity?
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @param action an object that can be converted into a Sipity::WorkflowAction#name
-      # @return [Boolean]
-      def authorized_for_processing?(user:, entity:, action:)
-        action_name = Sipity::WorkflowAction.name_for(action)
-        scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
-          .find_by(Sipity::WorkflowAction.arel_table[:name].eq(action_name)).present?
-      end
-
-      # @api public
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * All of the Processing Agents directly associated with the given :user
-      #
-      # @param user [User]
-      # @return [ActiveRecord::Relation<Sipity::Agent>]
-      def scope_processing_agents_for(user:)
-        return Sipity::Agent.none if user.blank?
-        return Sipity::Agent.none unless user.persisted?
-        user_agent = Sipity::Agent(user)
-        group_agents = user.groups.map do |g|
-          Sipity::Agent(Hyrax::Group.new(name: g))
-        end
-        Sipity::Agent.where(id: group_agents + [user_agent])
-      end
-
-      PermissionScope = Struct.new(:entity, :workflow)
-      private_constant :PermissionScope
-
-      # @api public
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * Sipity::Entity in a state in which I have access to based on:
-      #   - The entity specific responsibility
-      #     - For which I've been assigned a role
-      #   - The workflow specific responsibility
-      #     - For which I've been assigned a role
-      #
-      # @param [User] user
-      #
-      # @return [ActiveRecord::Relation<Sipity::Entity>]
-      #
-      def scope_entities_for_the_user(user:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        entities = Sipity::Entity.arel_table
-        workflow_state_actions = Sipity::WorkflowStateAction.arel_table
-        workflow_states = Sipity::WorkflowState.arel_table
-        workflow_state_action_permissions = Sipity::WorkflowStateActionPermission.arel_table
-
-        user_agent_scope = scope_processing_agents_for(user:)
-        user_agent_contraints = user_agent_scope.arel_table.project(
-          user_agent_scope.arel_table[:id]
-        ).where(user_agent_scope.arel.constraints)
-
-        join_builder = lambda do |responsibility|
-          entities.project(
-            entities[:id]
-          ).join(workflow_state_actions).on(
-            workflow_state_actions[:originating_workflow_state_id].eq(entities[:workflow_state_id])
-          ).join(workflow_state_action_permissions).on(
-            workflow_state_action_permissions[:workflow_state_action_id].eq(workflow_state_actions[:id])
-          ).join(workflow_states).on(
-            workflow_states[:id].eq(workflow_state_actions[:originating_workflow_state_id])
-          ).join(responsibility).on(
-            responsibility[:workflow_role_id].eq(workflow_state_action_permissions[:workflow_role_id])
-          )
-        end
-
-        where_builder = ->(responsibility) { responsibility[:agent_id].in(user_agent_contraints) }
-
-        entity_specific_joins = join_builder.call(entity_responsibilities)
-        workflow_specific_joins = join_builder.call(workflow_responsibilities)
-
-        entity_specific_where = where_builder.call(entity_responsibilities).and(
-          entities[:id].eq(entity_responsibilities[:entity_id])
-        )
-        workflow_specific_where = where_builder.call(workflow_responsibilities)
-
-        Sipity::Entity.where(
-          entities[:id].in(entity_specific_joins.where(entity_specific_where))
-          .or(entities[:id].in(workflow_specific_joins.where(workflow_specific_where)))
-        )
-      end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-      # @api public
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * Users that are directly associated with the given entity through one or
-      #   more of the given roles within the entity's workflow
-      # * Users that are indirectly associated with the given entity by group
-      #   and role.
-      #
-      # @param roles [Sipity::Role]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<User>]
-      #
-      def scope_users_for_entity_and_roles(entity:, roles:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-        entity = Sipity::Entity(entity)
-        role_ids = Array.wrap(roles).map { |role| Sipity::Role(role).id }
-        user_polymorphic_type = ::User.base_class
-
-        user_table = ::User.arel_table
-        agent_table = Sipity::Agent.arel_table
-
-        workflow_role_id_subquery = workflow_roles.project(workflow_roles[:id]).where(
-          workflow_roles[:workflow_id].eq(entity.workflow_id).and(workflow_roles[:role_id].in(role_ids))
-        )
-
-        workflow_agent_id_subquery = workflow_responsibilities.project(workflow_responsibilities[:agent_id]).where(
-          workflow_responsibilities[:workflow_role_id].in(workflow_role_id_subquery)
-        )
-
-        entity_agent_id_subquery = entity_responsibilities.project(entity_responsibilities[:agent_id]).where(
-          entity_responsibilities[:workflow_role_id].in(workflow_role_id_subquery)
-            .and(entity_responsibilities[:entity_id].eq(entity.id))
-        )
-
-        # Default to "integer" for adapters like Postgres and Sqlite, but cast
-        # to "signed" for Mysql. The type CAST causes a SQL syntax error for an
-        # unsupported type depending on which adapter is being used.
-        type = ActiveRecord::Base.connection.adapter_name.casecmp("mysql2").zero? ? "signed" : "integer"
-        cast = Arel::Nodes::NamedFunction.new "CAST", [agent_table[:proxy_for_id].as(type)]
-
-        sub_query_for_user = agent_table.project(cast).where(
-          agent_table[:id].in(workflow_agent_id_subquery)
-            .or(agent_table[:id].in(entity_agent_id_subquery))
-        ).where(
-          agent_table[:proxy_for_type].eq(user_polymorphic_type)
-        )
-
-        ::User.where(user_table[:id].in(sub_query_for_user))
-      end
-      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-      def user_emails_for_entity_and_roles(entity:, roles:)
-        scope_users_for_entity_and_roles(entity:, roles:).pluck(:email)
-      end
-
-      # @api public
-      #
-      # For the given :user and :entity, return an ActiveRecord::Relation that,
-      # if resolved, will be all of the assocated workflow roles for both the
-      # workflow responsibilities and the entity specific responsibilities.
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
-      def scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
-        entity = Sipity::Entity(entity)
-        workflow_scope = scope_processing_workflow_roles_for_user_and_workflow(user:, workflow: entity.workflow)
-
-        entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:)
-        Sipity::WorkflowRole.where(
-          workflow_scope.arel.constraints.reduce.or(entity_specific_scope.arel.constraints.reduce)
-        )
-      end
-
-      # @api private
-      #
-      # For the given :user and :workflow, return an ActiveRecord::Relation that,
-      # if resolved, will be all of the assocated workflow roles that are
-      # assigned to directly to the workflow.
-      #
-      # @param user [User]
-      # @param workflow [Sipity::Workflow]
-      # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
-      def scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
-        agent_constraints = scope_processing_agents_for(user:)
-        workflow_role_subquery = workflow_roles[:id].in(
-          workflow_responsibilities.project(workflow_responsibilities[:workflow_role_id])
-          .where(
-            workflow_responsibilities[:agent_id].in(
-              agent_constraints.arel_table.project(
-                agent_constraints.arel_table[:id]
-              ).where(agent_constraints.arel.constraints)
-            )
-          )
-        )
-        Sipity::WorkflowRole.where(
-          workflow_roles[:workflow_id].eq(workflow.id).and(workflow_role_subquery)
-        )
-      end
-
-      # @api private
-      #
-      # For the given :user and :entity, return an ActiveRecord::Relation that,
-      # if resolved, will be all of the assocated workflow roles that are
-      # assigned to specifically to the entity (and not the parent workflow).
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
-      def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:) # rubocop:disable Metrics/MethodLength
-        entity = Sipity::Entity(entity)
-        agent_scope = scope_processing_agents_for(user:)
-
-        Sipity::WorkflowRole.where(
-          workflow_roles[:id].in(
-            entity_responsibilities.project(entity_responsibilities[:workflow_role_id])
-            .where(
-              entity_responsibilities[:agent_id].in(
-                agent_scope.arel_table.project(
-                  agent_scope.arel_table[:id]
-                ).where(
-                  agent_scope.arel.constraints.reduce.and(entity_responsibilities[:entity_id].eq(entity.id))
-                )
-              )
-            )
-          )
-        )
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      # @api private
-      #
-      # For the given :user and :entity, return an ActiveRecord::Relation,
-      # that if resolved, will be collection of
-      # Sipity::WorkflowStateAction object to which the user has
-      # permission to do something.
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * The actions are available for the given entity's current state
-      # * The actions are available for the given user based on their role.
-      #   Either:
-      #   - Directly via an agent associated with a user
-      #   - Indirectly via an agent associated with a group
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowStateAction>]
-      #
-      def scope_permitted_entity_workflow_state_actions(user:, entity:) # rubocop:disable Metrics/MethodLength
-        entity = Sipity::Entity(entity)
-        workflow_state_actions = Sipity::WorkflowStateAction
-        permissions = Sipity::WorkflowStateActionPermission
-        role_scope = scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
-
-        workflow_state_actions.where(
-          workflow_state_actions.arel_table[:originating_workflow_state_id].eq(entity.workflow_state_id).and(
-            workflow_state_actions.arel_table[:id].in(
-              permissions.arel_table.project(
-                permissions.arel_table[:workflow_state_action_id]
-              ).where(
-                permissions.arel_table[:workflow_role_id].in(
-                  role_scope.arel_table.project(role_scope.arel_table[:id]).where(
-                    role_scope.arel.constraints.reduce
-                  )
-                )
-              )
-            )
-          )
-        )
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      # @api public
-      #
-      # For the given :entity return an ActiveRecord::Relation that when
-      # resolved will be only the workflow actions that:
-      #
-      # * Are available for the entity's workflow_state
-      #
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
-      def scope_workflow_actions_for_current_state(entity:)
-        entity = Sipity::Entity(entity)
-        state_actions_table = Sipity::WorkflowStateAction.arel_table
-        Sipity::WorkflowAction.where(
-          Sipity::WorkflowAction.arel_table[:id].in(
-            state_actions_table.project(state_actions_table[:workflow_action_id])
-              .where(state_actions_table[:originating_workflow_state_id].eq(entity.workflow_state_id))
-          )
-        )
-      end
-
-      # @api private
-      #
-      # For the given :entity, return an ActiveRecord::Relation, that
-      # if resolved, that lists all of the actions available for the entity and
-      # its current state.
-      #
-      # * All actions that are associated with actions that do not have prerequsites
-      # * All actions that have prerequisites and all of those prerequisites are complete
-      #
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
-      def scope_workflow_actions_available_for_current_state(entity:)
-        workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity:)
-        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce)
-      end
-    end
-  end
-end
-# rubocop:enable Metrics/ModuleLength
diff --git a/spec/models/hyrax/group_spec.rb b/spec/models/hyrax/group_spec.rb
index fda54ae3d..72b508906 100644
--- a/spec/models/hyrax/group_spec.rb
+++ b/spec/models/hyrax/group_spec.rb
@@ -5,6 +5,18 @@
 # rubocop:disable Metrics/ModuleLength
 module Hyrax
   RSpec.describe Group, type: :model, clean: true do
+    describe '.new' do
+      context 'when provided a string' do
+        it 'instantiates with the string as the name' do
+          expect(described_class.new("Boaty McBoatFace").name).to eq('Boaty McBoatFace')
+        end
+      end
+      context 'when provided a hash' do
+        it 'instantiates' do
+          expect(described_class.new(name: "Boaty McBoatFace").name).to eq('Boaty McBoatFace')
+        end
+      end
+    end
     describe 'group with no members' do
       subject { described_class.new(name:, description:) }
 
diff --git a/spec/services/hyrax/workflow/permission_query_spec.rb b/spec/services/hyrax/workflow/permission_query_spec.rb
deleted file mode 100644
index 76c433474..000000000
--- a/spec/services/hyrax/workflow/permission_query_spec.rb
+++ /dev/null
@@ -1,257 +0,0 @@
-# frozen_string_literal: true
-
-module Hyrax
-  module Workflow # rubocop:disable Metrics/ModuleLength
-    RSpec.describe PermissionQuery, ci: 'skip', clean: true do
-      let(:reviewing_user) { create(:user) }
-      let(:completing_user) { create(:user) }
-      let(:workflow_config) do
-        {
-          workflows: [{
-            name: 'testing',
-            actions: [{
-              name: "forward", from_states: [{ names: ["initial"], roles: ["reviewing"] }], transition_to: 'forwarded'
-            }, {
-              name: "complete",
-              from_states: [{ names: ["forwarded"], roles: ["completing"] }],
-              transition_to: 'completed'
-            }]
-          }]
-        }
-      end
-
-      let(:sipity_entity) do
-        Sipity::Entity.create!(proxy_for_global_id: 'gid://internal/Mock/1',
-                               workflow: sipity_workflow,
-                               workflow_state: PowerConverter.convert_to_sipity_workflow_state(
-                                 'initial',
-                                 scope: sipity_workflow
-                               ))
-      end
-      let(:sipity_workflow) { create(:workflow, name: 'testing') }
-
-      before do
-        Hyrax::Workflow::WorkflowImporter.generate_from_hash(
-          data: workflow_config,
-          permission_template: sipity_workflow.permission_template
-        )
-      end
-
-      def expect_actions_for(user:, entity:, actions:)
-        actions = Array.wrap(actions).map do |action|
-          PowerConverter.convert_to_sipity_action(
-            action,
-            scope: entity.workflow
-          )
-        end
-        expect(
-          described_class.scope_permitted_workflow_actions_available_for_current_state(
-            user:,
-            entity:
-          )
-        ).to eq(actions)
-      end
-
-      def expect_agents_for(agents:, entity:, role:)
-        agents = Array.wrap(agents).map { |agent| PowerConverter.convert_to_sipity_agent(agent) }
-        expect(
-          described_class.scope_agents_associated_with_entity_and_role(
-            role:,
-            entity:
-          )
-        ).to contain_exactly(*agents)
-      end
-
-      def expect_roles_for(entity:, roles:)
-        roles = Array.wrap(roles).map { |role| PowerConverter.convert_to_sipity_role(role) }
-        expect(described_class.scope_roles_associated_with_the_given_entity(entity:)).to eq(roles)
-      end
-
-      def expect_users_for(entity:, roles:, users:)
-        expect(described_class.scope_users_for_entity_and_roles(entity:, roles:)).to eq(Array.wrap(users))
-      end
-
-      def expect_to_be_authorized(user:, entity:, action:, message: 'should be authorized')
-        expect(
-          described_class.authorized_for_processing?(
-            user:,
-            entity:, action:
-          )
-        ).to be_truthy, message
-      end
-
-      def expect_to_not_be_authorized(user:, entity:, action:, message: 'should not be authorized')
-        expect(
-          described_class.authorized_for_processing?(
-            user:,
-            entity:,
-            action:
-          )
-        ).to be_falsey, message
-      end
-
-      def expect_entities_for(user:, entities:) # rubocop:disable Lint/UnusedMethodArgument
-        Array.wrap(entities).map { |entity| PowerConverter.convert(entity, to: :sipity_entity) }
-      end
-
-      describe 'entity_responsibilities' do
-        it 'is a Sipity::EntitySpecificResponsibility.arel_table' do
-          expect(described_class.entity_responsibilities).to be_an_instance_of Arel::Table
-        end
-      end
-
-      describe 'workflow_responsibilities' do
-        it 'is a Sipity::WorkflowResponsibility.arel_table' do
-          expect(described_class.workflow_responsibilities).to be_an_instance_of Arel::Table
-        end
-      end
-
-      describe 'workflow_roles' do
-        it 'is a Sipity::WorkflowRole.arel_table' do
-          expect(described_class.workflow_roles).to be_an_instance_of Arel::Table
-        end
-      end
-
-      describe 'permissions assigned at the workflow level' do
-        let(:reviewing_group_member) { create(:user) }
-        let(:reviewing_group) { create(:group, member_users: [reviewing_group_member]) }
-
-        before do
-          PermissionGenerator.call(roles: 'reviewing', workflow: sipity_workflow, agents: reviewing_user)
-          PermissionGenerator.call(roles: 'reviewing', workflow: sipity_workflow, agents: reviewing_group)
-          PermissionGenerator.call(roles: 'completing', workflow: sipity_workflow, agents: completing_user)
-        end
-
-        # rubocop:disable RSpec/ExampleLength
-        it 'will fullfil the battery of tests (of which they are nested because setup is expensive)' do
-          expect_agents_for(entity: sipity_entity, role: 'reviewing', agents: [reviewing_user, reviewing_group])
-          expect_agents_for(entity: sipity_entity, role: 'completing', agents: [completing_user])
-
-          expect_actions_for(user: reviewing_user, entity: sipity_entity, actions: ['forward'])
-          expect_actions_for(user: reviewing_group_member, entity: sipity_entity, actions: ['forward'])
-          expect_actions_for(user: completing_user, entity: sipity_entity, actions: [])
-
-          expect_users_for(users: reviewing_user, entity: sipity_entity, roles: 'reviewing')
-          expect_users_for(users: completing_user, entity: sipity_entity, roles: 'completing')
-
-          expect_entities_for(user: reviewing_user, entities: [sipity_entity])
-          expect_entities_for(user: completing_user, entities: [])
-
-          expect_roles_for(entity: sipity_entity, roles: ['reviewing', 'completing'])
-
-          expect_to_be_authorized(user: reviewing_user, entity: sipity_entity, action: 'forward')
-          expect_to_not_be_authorized(user: reviewing_user, entity: sipity_entity, action: 'complete')
-          expect_to_not_be_authorized(user: completing_user, entity: sipity_entity, action: 'forward')
-          expect_to_not_be_authorized user: completing_user, entity: sipity_entity, action: 'complete',
-                                      message: 'should be unauthorized because ' \
-                                               'the action is not available in this state'
-
-          # Then transition to Sipity::Entity
-          sipity_entity.update!(
-            workflow_state: PowerConverter.convert_to_sipity_workflow_state('forwarded', scope: sipity_workflow)
-          )
-
-          # Now permissions have changed
-          expect_actions_for(user: reviewing_user, entity: sipity_entity, actions: [])
-          expect_actions_for(user: completing_user, entity: sipity_entity, actions: ['complete'])
-
-          expect_to_not_be_authorized user: reviewing_user, entity: sipity_entity, action: 'forward',
-                                      message: 'should be unauthorized because ' \
-                                               'the action is not available in this state'
-          expect_to_not_be_authorized(user: reviewing_user, entity: sipity_entity, action: 'complete')
-          expect_to_not_be_authorized(user: completing_user, entity: sipity_entity, action: 'forward')
-          expect_to_be_authorized(user: completing_user, entity: sipity_entity, action: 'complete')
-
-          expect_entities_for(user: reviewing_user, entities: [])
-          expect_entities_for(user: completing_user, entities: [sipity_entity])
-        end
-        # rubocop:enable RSpec/ExampleLength
-      end
-
-      # rubocop:disable RSpec/ExampleLength
-      # NOTE: I am stacking up expectations because these tests are non-trivial to build (lots of database interactions)
-      describe 'permissions assigned at the entity level' do
-        it 'will fullfil the battery of tests (of which they are nested because setup is expensive)' do
-          PermissionGenerator.call(
-            roles: 'reviewing',
-            entity: sipity_entity,
-            workflow: sipity_workflow,
-            agents: reviewing_user
-          )
-          PermissionGenerator.call(
-            roles: 'completing',
-            entity: sipity_entity,
-            workflow: sipity_workflow,
-            agents: completing_user
-          )
-
-          expect_agents_for(entity: sipity_entity, role: 'reviewing', agents: [reviewing_user])
-          expect_agents_for(entity: sipity_entity, role: 'completing', agents: [completing_user])
-
-          expect_actions_for(user: reviewing_user, entity: sipity_entity, actions: ['forward'])
-          expect_actions_for(user: completing_user, entity: sipity_entity, actions: [])
-
-          expect_users_for(users: reviewing_user, entity: sipity_entity, roles: 'reviewing')
-          expect_users_for(users: completing_user, entity: sipity_entity, roles: 'completing')
-
-          expect_entities_for(user: reviewing_user, entities: [sipity_entity])
-          expect_entities_for(user: completing_user, entities: [])
-
-          expect_roles_for(entity: sipity_entity, roles: ['reviewing', 'completing'])
-
-          expect_to_be_authorized(user: reviewing_user, entity: sipity_entity, action: 'forward')
-          expect_to_not_be_authorized(user: reviewing_user, entity: sipity_entity, action: 'complete')
-          expect_to_not_be_authorized(user: completing_user, entity: sipity_entity, action: 'forward')
-          expect_to_not_be_authorized user: completing_user, entity: sipity_entity, action: 'complete',
-                                      message: 'should be unauthorized because ' \
-                                               'the action is not available in this state'
-
-          # Then transition to Sipity::Entity
-          sipity_entity.update!(
-            workflow_state: PowerConverter.convert_to_sipity_workflow_state('forwarded', scope: sipity_workflow)
-          )
-
-          # Now permissions have changed
-          expect_actions_for(user: reviewing_user, entity: sipity_entity, actions: [])
-          expect_actions_for(user: completing_user, entity: sipity_entity, actions: ['complete'])
-
-          expect_to_not_be_authorized user: reviewing_user, entity: sipity_entity, action: 'forward',
-                                      message: 'should be unauthorized because ' \
-                                               'the action is not available in this state'
-          expect_to_not_be_authorized(user: reviewing_user, entity: sipity_entity, action: 'complete')
-          expect_to_not_be_authorized(user: completing_user, entity: sipity_entity, action: 'forward')
-          expect_to_be_authorized(user: completing_user, entity: sipity_entity, action: 'complete')
-
-          expect_entities_for(user: reviewing_user, entities: [])
-          expect_entities_for(user: completing_user, entities: [sipity_entity])
-        end
-      end
-      # rubocop:enable RSpec/ExampleLength
-
-      describe '.scope_processing_agents_for' do
-        context 'when user is not persisted' do
-          subject { described_class.scope_processing_agents_for(user: ::User.new) }
-
-          it { is_expected.to eq([]) }
-        end
-        context 'when user is non-trivial' do
-          subject { described_class.scope_processing_agents_for(user: nil) }
-
-          it { is_expected.to eq([]) }
-        end
-
-        context 'when user is persisted' do
-          subject { described_class.scope_processing_agents_for(user:) }
-
-          let(:user) { create(:user) }
-          let!(:group) { create(:group, member_users: [user]) }
-
-          it 'will equal [kind_of(Sipity::Agent)]' do
-            is_expected.to include(PowerConverter.convert_to_sipity_agent(user),
-                                   PowerConverter.convert_to_sipity_agent(group))
-          end
-        end
-      end
-    end
-  end
-end

From ac83919e343578317a0469e7912bec868b6a68cb Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 19 Dec 2023 14:45:49 -0500
Subject: [PATCH 093/126] =?UTF-8?q?=F0=9F=A7=B9=20Fix=20missing=20method?=
 =?UTF-8?q?=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/hyrax/group.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/hyrax/group.rb b/app/models/hyrax/group.rb
index 6a35e8fb3..27a6a327a 100644
--- a/app/models/hyrax/group.rb
+++ b/app/models/hyrax/group.rb
@@ -30,7 +30,7 @@ class Group < ApplicationRecord
     def self.new(*args)
       # This logic path is likely coming from Hyrax specific code; in which it expects a string.
       if args.size == 1 && args.first.is_a?(String)
-        find_by_intialize_by(name: args.first)
+        find_by(name: args.first) || super(name: args.first)
       else
         super
       end

From e33ffab835dc532cf2cd46451ef4dc804f376cc1 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 19 Dec 2023 15:33:10 -0500
Subject: [PATCH 094/126] =?UTF-8?q?=F0=9F=90=9B=20Ensure=20:maxFileSize=20?=
 =?UTF-8?q?is=20integer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, we were casting the value to string.  However
Hyrax attempts to do division on that string.

See https://github.com/samvera/hyrax/blob/b7891b758411c59f71ff54212e0d250fcc47e35f/app/views/hyrax/base/_form_files.html.erb#L6-L15
---
 app/models/concerns/account_settings.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/concerns/account_settings.rb b/app/models/concerns/account_settings.rb
index 54d8df829..85e98fd5d 100644
--- a/app/models/concerns/account_settings.rb
+++ b/app/models/concerns/account_settings.rb
@@ -162,7 +162,7 @@ def reload_library_config
     Hyrax.config do |config|
       config.contact_email = contact_email
       config.geonames_username = geonames_username
-      config.uploader[:maxFileSize] = file_size_limit
+      config.uploader[:maxFileSize] = file_size_limit.to_i
     end
 
     Devise.mailer_sender = contact_email

From 0daf9f08e486c118e6d70fded42a04823de28f0e Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 19 Dec 2023 15:49:15 -0500
Subject: [PATCH 095/126] Skip taking a picture on failure

---
 spec/rails_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e67ad2d18..b531672ab 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -161,7 +161,7 @@
 
   config.after(:each, type: :feature) do |example|
     # rubocop:disable Lint/Debugger
-    save_and_open_page if example.exception.present?
+    save_and_open_page if example.exception.present? && !ENV['CI']
     # rubocop:enable Lint/Debugger
     Warden.test_reset!
     Capybara.reset_sessions!

From 6bac28ba2ee520697e7dfb7572ca65b75983bae4 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 19 Dec 2023 16:03:45 -0500
Subject: [PATCH 096/126] =?UTF-8?q?=F0=9F=A7=B9=20Fix=20issue=20regarding?=
 =?UTF-8?q?=20Valkyrie::Identifier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The encountered error was:

```
NoMethodError:
  undefined method `split' for #<Valkyrie::ID:0x0000ffffa5f04bc8
  @id="admin_set/default">
```
---
 config/initializers/hyrax.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 04954e5e1..00bd002ed 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -189,6 +189,12 @@
     # See Samvera Slack thread https://samvera.slack.com/archives/C0F9JQJDQ/p1596718417351200?thread_ts=1596717896.350700&cid=C0F9JQJDQ
     uri.sub(/\Ahttp:/, 'https:')
   end
+
+  ##
+  # A Valkyrie::Identifier is not a string but can be cast to a string.  What we have here is in
+  # essence a "super" method.
+  original_translator = config.translate_id_to_uri
+  config.translate_id_to_uri = ->(id) { original_translator.call(id.to_s) }
 end
 # rubocop:enable Metrics/BlockLength
 

From d758340590b8458bea3a277f88888fd3b9aef867 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 19 Dec 2023 16:32:24 -0500
Subject: [PATCH 097/126] =?UTF-8?q?=F0=9F=A7=B9=20Favor=20Sipity::Entity?=
 =?UTF-8?q?=20function=20over=20to=5Fsipity=5Fentity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Sipity conversion methods are now explicit functions (much like the
`Array()` function).

- https://github.com/samvera/hyrax/blob/5aaa568d348a180add2a1337d9d794b740703df8/app/models/sipity.rb#L20
---
 spec/requests/work_approval_permissions_spec.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/requests/work_approval_permissions_spec.rb b/spec/requests/work_approval_permissions_spec.rb
index f2cfb5702..8850581bc 100644
--- a/spec/requests/work_approval_permissions_spec.rb
+++ b/spec/requests/work_approval_permissions_spec.rb
@@ -39,11 +39,11 @@
     end
 
     it 'can approve a work' do
-      expect(work.to_sipity_entity.workflow_state.name).to eq('pending_review')
+      expect(Sipity::Entity(work).workflow_state.name).to eq('pending_review')
 
       put hyrax_workflow_action_path(work), params: { workflow_action: { name: 'approve', comment: '' } }
 
-      expect(work.to_sipity_entity.reload.workflow_state.name).to eq('deposited')
+      expect(Sipity::Entity(work).reload.workflow_state.name).to eq('deposited')
     end
 
     it 'can see works submitted for review in the dashboard' do
@@ -59,11 +59,11 @@
     end
 
     it 'can approve a work' do
-      expect(work.to_sipity_entity.workflow_state.name).to eq('pending_review')
+      expect(Sipity::Entity(work).workflow_state.name).to eq('pending_review')
 
       put hyrax_workflow_action_path(work), params: { workflow_action: { name: 'approve', comment: '' } }
 
-      expect(work.to_sipity_entity.reload.workflow_state.name).to eq('deposited')
+      expect(Sipity::Entity(work).reload.workflow_state.name).to eq('deposited')
     end
 
     it 'can see works submitted for review in the dashboard' do
@@ -79,12 +79,12 @@
     end
 
     it 'cannot approve a work' do
-      expect(work.to_sipity_entity.workflow_state.name).to eq('pending_review')
+      expect(Sipity::Entity(work).workflow_state.name).to eq('pending_review')
 
       put hyrax_workflow_action_path(work), params: { workflow_action: { name: 'approve', comment: '' } }
 
       expect(response).to have_http_status(:unauthorized)
-      expect(work.to_sipity_entity.reload.workflow_state.name).to eq('pending_review')
+      expect(Sipity::Entity(work).reload.workflow_state.name).to eq('pending_review')
     end
 
     it 'cannot see works submitted for review in the dashboard' do
@@ -96,12 +96,12 @@
 
   context 'when signed in as a user with no special access' do
     it 'cannot approve a work' do
-      expect(work.to_sipity_entity.workflow_state.name).to eq('pending_review')
+      expect(Sipity::Entity(work).workflow_state.name).to eq('pending_review')
 
       put hyrax_workflow_action_path(work), params: { workflow_action: { name: 'approve', comment: '' } }
 
       expect(response).to have_http_status(:unauthorized)
-      expect(work.to_sipity_entity.reload.workflow_state.name).to eq('pending_review')
+      expect(Sipity::Entity(work).reload.workflow_state.name).to eq('pending_review')
     end
 
     it 'cannot see works submitted for review in the dashboard' do

From a9dc46e710021d9154e86c006eb74b5c2e769884 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Tue, 19 Dec 2023 17:03:20 -0500
Subject: [PATCH 098/126] Update Hyrax IIIF AV gem

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 6adeb2c90..be0d46300 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,7 +28,7 @@ GIT
 
 GIT
   remote: https://github.com/samvera-labs/hyrax-iiif_av.git
-  revision: 4bc4af3ebbc47b68a313108c72c319945c673c1b
+  revision: 66a94059f192a295bfb4503d247986f16b183330
   branch: rails_hyrax_upgrade
   specs:
     hyrax-iiif_av (0.2.0)

From 095edca9a50e647eb1b3ee31a34711c32151912e Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Tue, 19 Dec 2023 22:27:55 -0800
Subject: [PATCH 099/126] =?UTF-8?q?=F0=9F=A7=B9=20Review=20controller=20ov?=
 =?UTF-8?q?errides?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Many of the controllers just needed to be updated with the decorator
pattern.  We're creating a new concern for all the Hyku specific
overrides in Hyku::WorksControllerBehavior.  This has to be included in
the Controller classes after Hyrax::WorksControllerBehavior to override
the relevant methods.
---
 .../hyku/works_controller_behavior.rb         | 111 +++
 .../hyrax/admin/users_controller_behavior.rb  |   8 +-
 .../hyrax/works_controller_behavior.rb        | 526 ------------
 ...rb => appearances_controller_decorator.rb} |  19 +-
 .../hyrax/admin/workflow_roles_controller.rb  |  51 --
 ...b => contact_form_controller_decorator.rb} |  53 +-
 .../content_blocks_controller_decorator.rb    |   6 +-
 .../hyrax/dashboard/collections_controller.rb | 749 ------------------
 .../collections_controller_decorator.rb       | 182 +++++
 .../hyrax/generic_works_controller.rb         |   1 +
 app/controllers/hyrax/images_controller.rb    |   1 +
 .../hyrax/my/works_controller_decorator.rb    |  18 -
 ...oller.rb => pages_controller_decorator.rb} |  64 +-
 .../workflow_responsibility_form_decorator.rb |  23 +
 ...flow_responsibility_form_decorator_spec.rb |  21 +
 15 files changed, 382 insertions(+), 1451 deletions(-)
 create mode 100644 app/controllers/concerns/hyku/works_controller_behavior.rb
 delete mode 100644 app/controllers/concerns/hyrax/works_controller_behavior.rb
 rename app/controllers/hyrax/admin/{appearances_controller.rb => appearances_controller_decorator.rb} (83%)
 delete mode 100644 app/controllers/hyrax/admin/workflow_roles_controller.rb
 rename app/controllers/hyrax/{contact_form_controller.rb => contact_form_controller_decorator.rb} (76%)
 delete mode 100644 app/controllers/hyrax/dashboard/collections_controller.rb
 create mode 100644 app/controllers/hyrax/dashboard/collections_controller_decorator.rb
 delete mode 100644 app/controllers/hyrax/my/works_controller_decorator.rb
 rename app/controllers/hyrax/{pages_controller.rb => pages_controller_decorator.rb} (56%)
 create mode 100644 app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb
 create mode 100644 spec/forms/hyrax/forms/workflow_responsibility_form_decorator_spec.rb

diff --git a/app/controllers/concerns/hyku/works_controller_behavior.rb b/app/controllers/concerns/hyku/works_controller_behavior.rb
new file mode 100644
index 000000000..96b6f4e53
--- /dev/null
+++ b/app/controllers/concerns/hyku/works_controller_behavior.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+# OVERRIDE: Hyrax v5.0.0rc2 to add inject_show_theme_views - Hyku theming
+#           and correct hostname of manifests
+#           and to add Hyrax IIIF AV
+module Hyku
+  # include this module after including Hyrax::WorksControllerBehavior to override
+  # Hyrax::WorksControllerBehavior methods with the ones defined here
+  module WorksControllerBehavior
+    extend ActiveSupport::Concern
+
+    # Adds behaviors for hyrax-iiif_av plugin and provides #manifest and #iiif_manifest_builder
+    include Hyrax::IiifAv::ControllerBehavior
+
+    included do
+      # add around action to load theme show page views
+      around_action :inject_show_theme_views, except: :delete
+    end
+
+    def json_manifest
+      iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
+    end
+
+    private
+
+    def iiif_manifest_presenter
+      Hyrax::IiifManifestPresenter.new(search_result_document(id: params[:id])).tap do |p|
+        p.hostname = request.hostname
+        p.ability = current_ability
+      end
+    end
+
+    def format_error_messages(errors)
+      errors.messages.map do |field, messages|
+        field_name = field.to_s.humanize
+        messages.map { |message| "#{field_name} #{message.sub(/^./, &:downcase)}" }
+      end.flatten.join("\n")
+    end
+
+    # Creating a form object that can re-render most of the submitted parameters.
+    # Required for ActiveFedora::Base objects only.
+    def rebuild_form(original_input_params_for_form)
+      build_form
+      @form = Hyrax::Forms::FailedSubmissionFormWrapper
+              .new(form: @form,
+                   input_params: original_input_params_for_form)
+    end
+
+    def after_update_error(errors)
+      respond_to do |wants|
+        wants.html do
+          flash[:error] = format_error_messages(errors)
+          build_form unless @form.is_a? Hyrax::ChangeSet
+          render 'edit', status: :unprocessable_entity
+        end
+        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
+      end
+    end
+
+    def available_admin_sets
+      # only returns admin sets in which the user can deposit
+      admin_set_results = Hyrax::AdminSetService.new(self).search_results(:deposit)
+
+      # get all the templates at once, reducing query load
+      templates = Hyrax::PermissionTemplate.where(source_id: admin_set_results.map(&:id)).to_a
+
+      admin_sets = admin_set_results.map do |admin_set_doc|
+        template = templates.find { |temp| temp.source_id == admin_set_doc.id.to_s }
+
+        ## OVERRIDE Hyrax v5.0.0rc2
+        # Removes a short-circuit that allowed users with manage access to
+        # the given permission_template to always be able to edit a record's sharing
+        # (i.e. the "Sharing" tab in forms).
+        #
+        # We remove this because there is currently a bug in Hyrax where, if the
+        # workflow does not allow access grants, changes to a record's sharing
+        # are not being persisted, leading to a confusing UX.
+        # @see https://github.com/samvera/hyrax/issues/5904
+        #
+        # TEMPORARY: This override should be removed when the bug is resolved in
+        # upstream Hyrax and brought into this project.
+        #
+        # determine if sharing tab should be visible
+        sharing = !!template&.active_workflow&.allows_access_grant?
+
+        Hyrax::AdminSetSelectionPresenter::OptionsEntry
+          .new(admin_set: admin_set_doc, permission_template: template, permit_sharing: sharing)
+      end
+
+      Hyrax::AdminSetSelectionPresenter.new(admin_sets:)
+    end
+
+    # added to prepend the show theme views into the view_paths
+    def inject_show_theme_views
+      if show_page_theme && show_page_theme != 'default_show'
+        original_paths = view_paths
+        Hyku::Application.theme_view_path_roots.each do |root|
+          show_theme_view_path = File.join(root, 'app', 'views', "themes", show_page_theme.to_s)
+          prepend_view_path(show_theme_view_path)
+        end
+        yield
+        # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+        # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
+        view_paths=(original_paths)
+        # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
+      else
+        yield
+      end
+    end
+  end
+end
diff --git a/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb b/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb
index 8b15f9e23..d58ad7ce0 100644
--- a/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb
+++ b/app/controllers/concerns/hyrax/admin/users_controller_behavior.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.2 Authorize User access and set up roles dropdown
+# OVERRIDE Hyrax v5.0.0rc2 Authorize User access and set up roles dropdown
 module Hyrax
   module Admin
     module UsersControllerBehavior
       extend ActiveSupport::Concern
       include Blacklight::SearchContext
       included do
-        # OVERRIDE Hyrax v3.4.2 Replace :ensure_admin! with :ensure_access! to leverage User abilities.
+        # OVERRIDE Hyrax v5.0.0rc2 Replace :ensure_admin! with :ensure_access! to leverage User abilities.
         # @see app/models/concerns/hyrax/ability/user_ability.rb
         before_action :ensure_access!
         with_themed_layout 'dashboard'
@@ -19,7 +19,7 @@ def index
         add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
         add_breadcrumb t(:'hyrax.admin.users.index.title'), hyrax.admin_users_path
         @presenter = Hyrax::Admin::UsersPresenter.new
-        # OVERRIDE Hyrax v3.4.2 Sets up a list of role names to be used by a dropdown input that
+        # OVERRIDE Hyrax v5.0.0rc2 Sets up a list of role names to be used by a dropdown input that
         # allows users to be invited with a specific role.
         @invite_roles_options = if current_ability.admin?
                                   ::RolesService::DEFAULT_ROLES
@@ -30,7 +30,7 @@ def index
 
       private
 
-      # OVERRIDE Hyrax v3.4.2 Replace :ensure_admin! with :ensure_access! to leverage User abilities.
+      # OVERRIDE Hyrax v5.0.0rc2 Replace :ensure_admin! with :ensure_access! to leverage User abilities.
       # @see app/models/concerns/hyrax/ability/user_ability.rb
       def ensure_access!
         authorize! :read, ::User
diff --git a/app/controllers/concerns/hyrax/works_controller_behavior.rb b/app/controllers/concerns/hyrax/works_controller_behavior.rb
deleted file mode 100644
index f7ea802a0..000000000
--- a/app/controllers/concerns/hyrax/works_controller_behavior.rb
+++ /dev/null
@@ -1,526 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE: Hyrax 3.4.0 to add inject_show_theme_views - Hyku theming and correct hostname of manifests
-# OVERRIDE: Hyrax 3.4.0 to add Hyrax IIIF AV
-require 'iiif_manifest'
-
-# rubocop:disable Metrics/ModuleLength
-# rubocop:disable Metrics/LineLength
-module Hyrax
-  module WorksControllerBehavior
-    extend ActiveSupport::Concern
-    include Blacklight::Base
-    include Blacklight::AccessControls::Catalog
-
-    # Adds behaviors for hyrax-iiif_av plugin and provides #manifest and #iiif_manifest_builder
-    include Hyrax::IiifAv::ControllerBehavior
-
-    included do
-      with_themed_layout :decide_layout
-      copy_blacklight_config_from(::CatalogController)
-
-      class_attribute :_curation_concern_type, :show_presenter, :work_form_service, :search_builder_class
-      class_attribute :iiif_manifest_builder, instance_accessor: false
-      self.show_presenter = Hyku::WorkShowPresenter
-      self.work_form_service = Hyrax::WorkFormService
-      self.search_builder_class = WorkSearchBuilder
-      # Set to nil for the #iiif_manifest_builder (provided by Hyrax::IiifAv) to work
-      self.iiif_manifest_builder = nil
-
-      attr_accessor :curation_concern
-      helper_method :curation_concern, :contextual_path
-
-      rescue_from WorkflowAuthorizationException, with: :render_unavailable
-      # add around action to load theme show page views
-      around_action :inject_show_theme_views, except: :delete # rubocop:disable Rails/LexicallyScopedActionFilter
-    end
-
-    class_methods do
-      def curation_concern_type=(curation_concern_type)
-        load_and_authorize_resource class: curation_concern_type,
-                                    instance_name: :curation_concern,
-                                    except: %i[show file_manager inspect_work manifest]
-
-        # Load the fedora resource to get the etag.
-        # No need to authorize for the file manager, because it does authorization via the presenter.
-        load_resource class: curation_concern_type, instance_name: :curation_concern, only: :file_manager
-
-        self._curation_concern_type = curation_concern_type
-        # We don't want the breadcrumb action to occur until after the concern has
-        # been loaded and authorized
-        before_action :save_permissions, only: :update # rubocop:disable Rails/LexicallyScopedActionFilter
-      end
-
-      def curation_concern_type
-        _curation_concern_type
-      end
-
-      def cancan_resource_class
-        Hyrax::ControllerResource
-      end
-    end
-
-    def new
-      @admin_set_options = available_admin_sets
-      # TODO: move these lines to the work form builder in Hyrax
-      curation_concern.depositor = current_user.user_key
-      curation_concern.admin_set_id = admin_set_id_for_new
-      build_form
-    end
-
-    def create
-      case curation_concern
-      when ActiveFedora::Base
-        original_input_params_for_form = params[hash_key_for_curation_concern].deep_dup
-        actor.create(actor_environment) ? after_create_response : after_create_error(curation_concern.errors, original_input_params_for_form)
-      else
-        create_valkyrie_work
-      end
-    end
-
-    # Finds a solr document matching the id and sets @presenter
-    # @raise CanCan::AccessDenied if the document is not found or the user doesn't have access to it.
-    def show
-      @user_collections = user_collections
-
-      respond_to do |wants|
-        wants.html { presenter && parent_presenter }
-        wants.json do
-          # load @curation_concern manually because it's skipped for html
-          @curation_concern = Hyrax.query_service.find_by(alternate_identifier: params[:id])
-          curation_concern # This is here for authorization checks (we could add authorize! but let's use the same method for CanCanCan)
-          render :show, status: :ok
-        end
-        additional_response_formats(wants)
-        wants.ttl { render body: presenter.export_as_ttl, mime_type: Mime[:ttl] }
-        wants.jsonld { render body: presenter.export_as_jsonld, mime_type: Mime[:jsonld] }
-        wants.nt { render body: presenter.export_as_nt, mime_type: Mime[:nt] }
-      end
-    end
-    # rubocop:enable Metrics/AbcSize
-
-    def edit
-      @admin_set_options = available_admin_sets
-      build_form
-    end
-
-    def update
-      case curation_concern
-      when ActiveFedora::Base
-        actor.update(actor_environment) ? after_update_response : after_update_error(curation_concern.errors)
-      else
-        update_valkyrie_work
-      end
-    end
-
-    def destroy
-      case curation_concern
-      when ActiveFedora::Base
-        title = curation_concern.to_s
-        env = Actors::Environment.new(curation_concern, current_ability, {})
-        return unless actor.destroy(env)
-        Hyrax.config.callback.run(:after_destroy, curation_concern.id, current_user, warn: false)
-      else
-        transactions['work_resource.destroy']
-          .with_step_args('work_resource.delete' => { user: current_user })
-          .call(curation_concern)
-          .value!
-
-        title = Array(curation_concern.title).first
-      end
-
-      after_destroy_response(title)
-    end
-
-    def file_manager
-      @form = Forms::FileManagerForm.new(curation_concern, current_ability)
-    end
-
-    def inspect_work
-      raise Hydra::AccessDenied unless current_ability.admin?
-      presenter
-    end
-
-    def json_manifest
-      iiif_manifest_builder.manifest_for(presenter: iiif_manifest_presenter)
-    end
-
-    private
-
-    def iiif_manifest_presenter
-      IiifManifestPresenter.new(search_result_document(id: params[:id])).tap do |p|
-        p.hostname = request.hostname
-        p.ability = current_ability
-      end
-    end
-
-    def user_collections
-      collections_service.search_results(:deposit)
-    end
-
-    def collections_service
-      Hyrax::CollectionsService.new(self)
-    end
-
-    def admin_set_id_for_new
-      Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id.to_s
-    end
-
-    def build_form
-      @form = work_form_service.build(curation_concern, current_ability, self)
-    end
-
-    def actor
-      @actor ||= Hyrax::CurationConcern.actor
-    end
-
-    ##
-    # @return [#errors]
-    def create_valkyrie_work
-      form = build_form
-      return after_create_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
-
-      result =
-        transactions['change_set.create_work']
-        .with_step_args(
-          'work_resource.add_to_parent' => { parent_id: params[:parent_id], user: current_user },
-          'work_resource.add_file_sets' => { uploaded_files:, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-          'change_set.set_user_as_depositor' => { user: current_user },
-          'work_resource.change_depositor' => { user: ::User.find_by_user_key(form.on_behalf_of) }
-        )
-        .call(form)
-      @curation_concern = result.value_or { return after_create_error(transaction_err_msg(result)) }
-      after_create_response
-    end
-
-    def update_valkyrie_work
-      form = build_form
-      return after_update_error(form_err_msg(form)) unless form.validate(params[hash_key_for_curation_concern])
-      result =
-        transactions['change_set.update_work']
-        .with_step_args('work_resource.add_file_sets' => { uploaded_files:, file_set_params: params[hash_key_for_curation_concern][:file_set] },
-                        'work_resource.update_work_members' => { work_members_attributes: })
-        .call(form)
-      @curation_concern = result.value_or { return after_update_error(transaction_err_msg(result)) }
-      after_update_response
-    end
-
-    def work_members_attributes
-      params[hash_key_for_curation_concern][:work_members_attributes]&.permit!&.to_h
-    end
-
-    def form_err_msg(form)
-      form.errors.messages.values.flatten.to_sentence
-    end
-
-    def transaction_err_msg(result)
-      result.failure.first
-    end
-
-    def presenter
-      @presenter ||= show_presenter.new(search_result_document(id: params[:id]), current_ability, request)
-    end
-
-    def parent_presenter
-      return @parent_presenter unless params[:parent_id]
-
-      @parent_presenter ||=
-        show_presenter.new(search_result_document(id: params[:parent_id]), current_ability, request)
-    end
-
-    # Include 'hyrax/base' in the search path for views, while prefering
-    # our local paths. Thus we are unable to just override `self.local_prefixes`
-    def _prefixes
-      @_prefixes ||= super + ['hyrax/base']
-    end
-
-    def actor_environment
-      Actors::Environment.new(curation_concern, current_ability, attributes_for_actor)
-    end
-
-    def hash_key_for_curation_concern
-      _curation_concern_type.model_name.param_key
-    end
-
-    def contextual_path(presenter, parent_presenter)
-      ::Hyrax::ContextualPath.new(presenter, parent_presenter).show
-    end
-
-    # @deprecated
-    def curation_concern_from_search_results
-      Deprecation.warn("'##{__method__}' will be removed in Hyrax 4.0.  " \
-        "Instead, use '#search_result_document'.")
-      search_params = params.deep_dup
-      search_params.delete :page
-      search_result_document(search_params)
-    end
-
-    ##
-    # Only returns unsuppressed documents the user has read access to
-    #
-    # @api public
-    #
-    # @param search_params [ActionController::Parameters] this should
-    #   include an :id key, but based on implementation and use of the
-    #   WorkSearchBuilder, it need not.
-    #
-    # @return [SolrDocument]
-    #
-    # @raise [WorkflowAuthorizationException] when the object is not
-    #   found via the search builder's search logic BUT the object is
-    #   suppressed AND the user can read it (Yeah, it's confusing but
-    #   after a lot of debugging that's the logic)
-    #
-    # @raise [CanCan::AccessDenied] when the object is not found via
-    #   the search builder's search logic BUT the object is not
-    #   supressed OR not readable by the user (Yeah.)
-    #
-    # @note This is Jeremy, I have suspicions about the first line of
-    #   this comment (eg, "Only return unsuppressed...").  The
-    #   reason is that I've encounter situations in the specs
-    #   where the document_list is empty but if I then query Solr
-    #   for the object by ID, I get a document that is NOT
-    #   suppressed AND can be read.  In other words, I believe
-    #   there is more going on in the search_results method
-    #   (e.g. a filter is being applied that is beyond what the
-    #   comment indicates)
-    #
-    # @see #document_not_found!
-    def search_result_document(search_params)
-      _, document_list = search_results(search_params)
-      return document_list.first unless document_list.empty?
-      document_not_found!
-    end
-
-    def document_not_found!
-      doc = ::SolrDocument.find(params[:id])
-      raise WorkflowAuthorizationException if doc.suppressed? && current_ability.can?(:read, doc)
-      raise CanCan::AccessDenied.new(nil, :show)
-    end
-
-    def render_unavailable
-      message = I18n.t("hyrax.workflow.unauthorized")
-      respond_to do |wants|
-        wants.html do
-          unavailable_presenter
-          flash[:notice] = message
-          render 'unavailable', status: :unauthorized
-        end
-        wants.json { render plain: message, status: :unauthorized }
-        additional_response_formats(wants)
-        wants.ttl { render plain: message, status: :unauthorized }
-        wants.jsonld { render plain: message, status: :unauthorized }
-        wants.nt { render plain: message, status: :unauthorized }
-      end
-    end
-
-    def unavailable_presenter
-      @presenter ||= show_presenter.new(::SolrDocument.find(params[:id]), current_ability, request)
-    end
-
-    def decide_layout
-      layout = case action_name
-               when 'show'
-                 '1_column'
-               else
-                 'dashboard'
-               end
-      File.join(theme, layout)
-    end
-
-    ##
-    # @todo should the controller know so much about browse_everything?
-    #   hopefully this can be refactored to be more reusable.
-    #
-    # Add uploaded_files to the parameters received by the actor.
-    # rubocop:disable Metrics/MethodLength
-    def attributes_for_actor
-      raw_params = params[hash_key_for_curation_concern]
-      attributes = if raw_params
-                     work_form_service.form_class(curation_concern).model_attributes(raw_params)
-                   else
-                     {}
-                   end
-
-      # If they selected a BrowseEverything file, but then clicked the
-      # remove button, it will still show up in `selected_files`, but
-      # it will no longer be in uploaded_files. By checking the
-      # intersection, we get the files they added via BrowseEverything
-      # that they have not removed from the upload widget.
-      uploaded_files = params.fetch(:uploaded_files, [])
-      selected_files = params.fetch(:selected_files, {}).values
-      browse_everything_urls = uploaded_files &
-                               selected_files.pluck(:url)
-
-      # we need the hash of files with url and file_name
-      browse_everything_files = selected_files
-                                .select { |v| uploaded_files.include?(v[:url]) }
-      attributes[:remote_files] = browse_everything_files
-      # Strip out any BrowseEverthing files from the regular uploads.
-      attributes[:uploaded_files] = uploaded_files -
-                                    browse_everything_urls
-      attributes
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    def after_create_response
-      respond_to do |wants|
-        wants.html do
-          # Calling `#t` in a controller context does not mark _html keys as html_safe
-          flash[:notice] = view_context.t('hyrax.works.create.after_create_html', application_name: view_context.application_name)
-
-          redirect_to [main_app, curation_concern]
-        end
-        wants.json { render :show, status: :created, location: polymorphic_path([main_app, curation_concern]) }
-      end
-    end
-
-    def format_error_messages(errors)
-      errors.messages.map do |field, messages|
-        field_name = field.to_s.humanize
-        messages.map { |message| "#{field_name} #{message.sub(/^./, &:downcase)}" }
-      end.flatten.join("\n")
-    end
-
-    def after_create_error(errors, original_input_params_for_form = nil)
-      respond_to do |wants|
-        wants.html do
-          flash[:error] = format_error_messages(errors)
-          rebuild_form(original_input_params_for_form) if original_input_params_for_form.present?
-          render 'new', status: :unprocessable_entity
-        end
-        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
-      end
-    end
-
-    # Creating a form object that can re-render most of the submitted parameters.
-    # Required for ActiveFedora::Base objects only.
-    def rebuild_form(original_input_params_for_form)
-      build_form
-      @form = Hyrax::Forms::FailedSubmissionFormWrapper
-              .new(form: @form,
-                   input_params: original_input_params_for_form)
-    end
-
-    def after_update_response
-      return redirect_to hyrax.confirm_access_permission_path(curation_concern) if permissions_changed? && concern_has_file_sets?
-
-      respond_to do |wants|
-        wants.html { redirect_to [main_app, curation_concern], notice: "Work \"#{curation_concern}\" successfully updated." }
-        wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
-      end
-    end
-
-    def after_update_error(errors)
-      respond_to do |wants|
-        wants.html do
-          flash[:error] = format_error_messages(errors)
-          build_form unless @form.is_a? Hyrax::ChangeSet
-          render 'edit', status: :unprocessable_entity
-        end
-        wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
-      end
-    end
-
-    def after_destroy_response(title)
-      respond_to do |wants|
-        wants.html { redirect_to hyrax.my_works_path, notice: "Deleted #{title}" }
-        wants.json { render_json_response(response_type: :deleted, message: "Deleted #{curation_concern.id}") }
-      end
-    end
-
-    def additional_response_formats(format)
-      format.endnote do
-        send_data(presenter.solr_document.export_as_endnote,
-                  type: "application/x-endnote-refer",
-                  filename: presenter.solr_document.endnote_filename)
-      end
-    end
-
-    def save_permissions
-      @saved_permissions =
-        case curation_concern
-        when ActiveFedora::Base
-          curation_concern.permissions.map(&:to_hash)
-        else
-          Hyrax::AccessControl.for(resource: curation_concern).permissions
-        end
-    end
-
-    def permissions_changed?
-      @saved_permissions !=
-        case curation_concern
-        when ActiveFedora::Base
-          curation_concern.permissions.map(&:to_hash)
-        else
-          Hyrax::AccessControl.for(resource: curation_concern).permissions
-        end
-    end
-
-    def concern_has_file_sets?
-      case curation_concern
-      when ActiveFedora::Common
-        curation_concern.file_sets.present?
-      else
-        Hyrax.custom_queries.find_child_file_set_ids(resource: curation_concern).any?
-      end
-    end
-
-    def uploaded_files
-      UploadedFile.find(params.fetch(:uploaded_files, []))
-    end
-
-    def available_admin_sets
-      # only returns admin sets in which the user can deposit
-      admin_set_results = Hyrax::AdminSetService.new(self).search_results(:deposit)
-
-      # get all the templates at once, reducing query load
-      templates = PermissionTemplate.where(source_id: admin_set_results.map(&:id)).to_a
-
-      admin_sets = admin_set_results.map do |admin_set_doc|
-        template = templates.find { |temp| temp.source_id == admin_set_doc.id.to_s }
-
-        ## OVERRIDE Hyrax v3.4.2
-        # Removes a short-circuit that allowed users with manage access to
-        # the given permission_template to always be able to edit a record's sharing
-        # (i.e. the "Sharing" tab in forms).
-        #
-        # We remove this because there is currently a bug in Hyrax where, if the
-        # workflow does not allow access grants, changes to a record's sharing
-        # are not being persisted, leading to a confusing UX.
-        # @see https://github.com/samvera/hyrax/issues/5904
-        #
-        # TEMPORARY: This override should be removed when the bug is resolved in
-        # upstream Hyrax and brought into this project.
-        #
-        # determine if sharing tab should be visible
-        sharing = !!template&.active_workflow&.allows_access_grant? # rubocop:disable Style/DoubleNegation
-
-        AdminSetSelectionPresenter::OptionsEntry
-          .new(admin_set: admin_set_doc, permission_template: template, permit_sharing: sharing)
-      end
-
-      AdminSetSelectionPresenter.new(admin_sets:)
-    end
-
-    # added to prepend the show theme views into the view_paths
-    def inject_show_theme_views
-      if show_page_theme && show_page_theme != 'default_show'
-        original_paths = view_paths
-        Hyku::Application.theme_view_path_roots.each do |root|
-          show_theme_view_path = File.join(root, 'app', 'views', "themes", show_page_theme.to_s)
-          prepend_view_path(show_theme_view_path)
-        end
-        yield
-        # rubocop:disable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-        # Do NOT change this line. This is calling the Rails view_paths=(paths) method and not a variable assignment.
-        view_paths=(original_paths)
-        # rubocop:enable Lint/UselessAssignment, Layout/SpaceAroundOperators, Style/RedundantParentheses
-      else
-        yield
-      end
-    end
-  end
-end
-# rubocop:enable Metrics/ModuleLength
-# rubocop:enable Metrics/LineLength
diff --git a/app/controllers/hyrax/admin/appearances_controller.rb b/app/controllers/hyrax/admin/appearances_controller_decorator.rb
similarity index 83%
rename from app/controllers/hyrax/admin/appearances_controller.rb
rename to app/controllers/hyrax/admin/appearances_controller_decorator.rb
index dbd0abf41..287c27df1 100644
--- a/app/controllers/hyrax/admin/appearances_controller.rb
+++ b/app/controllers/hyrax/admin/appearances_controller_decorator.rb
@@ -1,15 +1,10 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax 3.4 to add selectable themes
+# OVERRIDE Hyrax v5.0.0rc2 to add selectable themes
 
 module Hyrax
   module Admin
-    class AppearancesController < ApplicationController
-      before_action :require_permissions
-      with_themed_layout 'dashboard'
-      class_attribute :form_class
-      self.form_class = Hyrax::Forms::Admin::Appearance
-
+    module AppearancesControllerDecorator
       def show
         # TODO: make selected font the font that show in select box
         # TODO add body and headline font to the import url
@@ -44,14 +39,6 @@ def update
 
       private
 
-      def update_params
-        params.require(:admin_appearance).permit(form_class.permitted_params)
-      end
-
-      def require_permissions
-        authorize! :update, :appearance
-      end
-
       def add_breadcrumbs
         add_breadcrumb t(:'hyrax.controls.home'), root_path
         add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
@@ -88,3 +75,5 @@ def load_search_themes
     end
   end
 end
+
+Hyrax::Admin::AppearancesController.prepend(Hyrax::Admin::AppearancesControllerDecorator)
diff --git a/app/controllers/hyrax/admin/workflow_roles_controller.rb b/app/controllers/hyrax/admin/workflow_roles_controller.rb
deleted file mode 100644
index a82fabcad..000000000
--- a/app/controllers/hyrax/admin/workflow_roles_controller.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE Hyrax v3.4.2 Expand to allow adding groups to workflow roles
-module Hyrax
-  module Admin
-    class WorkflowRolesController < ApplicationController
-      before_action :require_permissions
-      with_themed_layout 'dashboard'
-
-      def index
-        add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb t(:'hyrax.admin.workflow_roles.header'), hyrax.admin_workflow_roles_path
-        @presenter = WorkflowRolesPresenter.new
-      end
-
-      def destroy
-        responsibility = Sipity::WorkflowResponsibility.find(params[:id])
-        authorize! :destroy, responsibility
-        responsibility.destroy
-        redirect_to admin_workflow_roles_path
-      end
-
-      # OVERRIDE: Add WorkflowResponsibilityGroupForm
-      def create
-        authorize! :create, Sipity::WorkflowResponsibility
-
-        # Determine which form it is, user or group
-        form_params = params[:sipity_workflow_responsibility]
-        form = if form_params[:user_id].present?
-                 Forms::WorkflowResponsibilityForm.new(form_params)
-               else
-                 Forms::WorkflowResponsibilityGroupForm.new(form_params)
-               end
-
-        begin
-          form.save!
-        rescue ActiveRecord::RecordNotUnique
-          logger.info "Not unique *****\n\n\n"
-        end
-        redirect_to admin_workflow_roles_path
-      end
-
-      private
-
-      def require_permissions
-        authorize! :read, :admin_dashboard
-      end
-    end
-  end
-end
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller_decorator.rb
similarity index 76%
rename from app/controllers/hyrax/contact_form_controller.rb
rename to app/controllers/hyrax/contact_form_controller_decorator.rb
index 46bf0e59f..63d7bef19 100644
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ b/app/controllers/hyrax/contact_form_controller_decorator.rb
@@ -1,26 +1,31 @@
 # frozen_string_literal: true
 
-# OVERRIDE: Hyrax v5.0.0
+# OVERRIDE: Hyrax v5.0.0rc2
 # - adds inject_theme_views method for theming
 # - adds homepage presenter for access to feature flippers
 # - adds access to content blocks in the show method
 # - adds @featured_collection_list to new method
 # - adds captcha
-
 module Hyrax
-  class ContactFormController < ApplicationController
+  module ContactFormControllerDecorator
+    extend ActiveSupport::Concern
+
     # OVERRIDE: Add for theming
     # Adds Hydra behaviors into the application controller
     include Blacklight::SearchContext
     include Blacklight::AccessControls::Catalog
-    before_action :build_contact_form
-    layout 'homepage'
 
-    # OVERRIDE: Adding inject theme views method for theming
-    around_action :inject_theme_views
-    class_attribute :model_class
-    self.model_class = Hyrax::ContactForm
-    before_action :setup_negative_captcha, only: %i[new create]
+    prepended do
+      # OVERRIDE: Adding inject theme views method for theming
+      around_action :inject_theme_views
+      before_action :setup_negative_captcha, only: %i[new create]
+
+      # OVERRIDE: Add for theming
+      class_attribute :presenter_class
+      self.presenter_class = Hyrax::HomepagePresenter
+
+      helper Hyrax::ContentBlockHelper
+    end
 
     # OVERRIDE: Add for theming
     # The search builder for finding recent documents
@@ -29,12 +34,6 @@ def search_builder_class
       Hyrax::HomepageSearchBuilder
     end
 
-    # OVERRIDE: Add for theming
-    class_attribute :presenter_class
-    self.presenter_class = Hyrax::HomepagePresenter
-
-    helper Hyrax::ContentBlockHelper
-
     def new
       # OVERRIDE: Add for theming
       @presenter = presenter_class.new(current_ability, collections)
@@ -68,28 +67,8 @@ def create
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-    def handle_create_exception(exception)
-      logger.error("Contact form failed to send: #{exception.inspect}")
-      flash.now[:error] = 'Sorry, this message was not delivered.'
-      render :new
-    end
-
-    # Override this method if you want to perform additional operations
-    # when a email is successfully sent, such as sending a confirmation
-    # response to the user.
-    def after_deliver; end
-
     private
 
-    def build_contact_form
-      @contact_form = model_class.new(contact_form_params)
-    end
-
-    def contact_form_params
-      return {} unless params.key?(:contact_form)
-      params.require(:contact_form).permit(:contact_method, :category, :name, :email, :subject, :message)
-    end
-
     # OVERRIDE: return collections for theming
     # Return 6 collections, sorts by title
     def collections(rows: 6)
@@ -134,3 +113,5 @@ def setup_negative_captcha
     end
   end
 end
+
+Hyrax::ContactFormController.prepend(Hyrax::ContactFormControllerDecorator)
diff --git a/app/controllers/hyrax/content_blocks_controller_decorator.rb b/app/controllers/hyrax/content_blocks_controller_decorator.rb
index afaa2201f..bcca43e36 100644
--- a/app/controllers/hyrax/content_blocks_controller_decorator.rb
+++ b/app/controllers/hyrax/content_blocks_controller_decorator.rb
@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.0 to add home_text to permitted_params - Adding themes
+# OVERRIDE Hyrax v5.0.0rc2 to add home_text to permitted_params - Adding themes
+
 module Hyrax
   module ContentBlocksControllerDecorator
-    # override hyrax v2.9.0 added the home_text content block to permitted_params - Adding Themes
+    private
+
     def permitted_params
       params.require(:content_block).permit(:marketing,
                                             :announcement,
diff --git a/app/controllers/hyrax/dashboard/collections_controller.rb b/app/controllers/hyrax/dashboard/collections_controller.rb
deleted file mode 100644
index 95e25f557..000000000
--- a/app/controllers/hyrax/dashboard/collections_controller.rb
+++ /dev/null
@@ -1,749 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE Hyrax v3.4.2
-# - Fix file upload in logo and banner
-# - Use work titles for collection thumbnail select & to add an option to reset to the default thumbnail
-module Hyrax
-  module Dashboard
-    ## Shows a list of all collections to the admins
-    class CollectionsController < Hyrax::My::CollectionsController
-      include Blacklight::AccessControls::Catalog
-      include Blacklight::Base
-
-      configure_blacklight do |config|
-        config.search_builder_class = Hyrax::Dashboard::CollectionsSearchBuilder
-      end
-
-      include BreadcrumbsForCollections
-      with_themed_layout 'dashboard'
-
-      before_action :filter_docs_with_read_access!, except: %i[show edit]
-      before_action :remove_select_something_first_flash, except: :show
-
-      include Hyrax::Collections::AcceptsBatches
-
-      # include the render_check_all view helper method
-      helper Hyrax::BatchEditsHelper
-      # include the display_trophy_link view helper method
-      helper Hyrax::TrophyHelper
-
-      # Catch permission errors
-      rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_collection_access
-
-      # actions: index, create, new, edit, show, update, destroy, permissions, citation
-      before_action :authenticate_user!, except: [:index]
-
-      class_attribute :presenter_class,
-        :form_class,
-        :single_item_search_builder_class,
-        :membership_service_class
-
-      self.presenter_class = Hyrax::CollectionPresenter
-
-      self.form_class = Hyrax::Forms::CollectionForm
-
-      # The search builder to find the collection
-      self.single_item_search_builder_class = SingleCollectionSearchBuilder
-      # The search builder to find the collections' members
-      self.membership_service_class = Collections::CollectionMemberSearchService
-
-      load_and_authorize_resource except: [:index, :create],
-                                  instance_name: :collection,
-                                  class: Hyrax.config.collection_model
-
-      def deny_collection_access(exception)
-        if exception.action == :edit
-          redirect_to(url_for(action: 'show'), alert: 'You do not have sufficient privileges to edit this document')
-        elsif current_user&.persisted?
-          redirect_to root_url, alert: exception.message
-        else
-          session['user_return_to'] = request.url
-          redirect_to main_app.new_user_session_url, alert: exception.message
-        end
-      end
-
-      def new
-        # Coming from the UI, a collection type id should always be present.  Coming from the API, if a collection type id is not specified,
-        # use the default collection type (provides backward compatibility with versions < Hyrax 2.1.0)
-        collection_type_id = params[:collection_type_id].presence || default_collection_type.id
-        @collection.collection_type_gid = CollectionType.find(collection_type_id).to_global_id
-        add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb t('.header', type_title: collection_type.title), request.path
-        @collection.try(:apply_depositor_metadata, current_user.user_key)
-        form
-      end
-
-      def show
-        # unused assignment to be removed in 4.0.0
-        @banner_file = presenter.banner_file if collection_type.brandable?
-
-        presenter
-        query_collection_members
-      end
-
-      def edit
-        form
-        collection_type
-        # Gets original filename of an uploaded thumbnail. See #update
-        return unless ::SolrDocument.find(@collection.id).thumbnail_path.include?("uploaded_collection_thumbnails" && uploaded_thumbnail?)
-        @thumbnail_filename = File.basename(uploaded_thumbnail_files.reject { |f| File.basename(f).include? @collection.id }.first)
-      end
-
-      def uploaded_thumbnail?
-        uploaded_thumbnail_files.any?
-      end
-
-      def uploaded_thumbnail_files
-        Dir["#{UploadedCollectionThumbnailPathService.upload_dir(@collection)}/*"]
-      end
-
-      def after_create
-        Deprecation.warn("Method `#after_create` will be removed in Hyrax 4.0.")
-        after_create_response # call private method for processing
-      end
-
-      def after_create_error
-        Deprecation.warn("Method `#after_create_error` will be removed in Hyrax 4.0.")
-        after_create_errors("") # call private method for processing
-      end
-
-      def create
-        # Manual load and authorize necessary because Cancan will pass in all
-        # form attributes. When `permissions_attributes` are present the
-        # collection is saved without a value for `has_model.`
-        @collection = Hyrax.config.collection_class.new
-        authorize! :create, @collection
-
-        case @collection
-        when ActiveFedora::Base
-          create_active_fedora_collection
-        else
-          create_valkyrie_collection
-        end
-      end
-
-      def after_update
-        Deprecation.warn("Method `#after_update` will be removed in Hyrax 4.0.")
-        after_update_response # call private method for processing
-      end
-
-      def after_update_error
-        Deprecation.warn("Method `#after_update_error` will be removed in Hyrax 4.0.")
-        after_update_errors(@collection.errors) # call private method for processing
-      end
-
-      def update
-        # OVERRIDE: ensure user is allowed to change visibility
-        authorize! :manage_discovery, @collection if collection_params[:visibility].present? && @collection.visibility != collection_params[:visibility]
-
-        case @collection
-        when ActiveFedora::Base
-          update_active_fedora_collection
-        else
-          update_valkyrie_collection
-        end
-      end
-
-      def process_branding
-        process_banner_input
-        process_logo_input
-        # TODO: does this still work?
-        process_uploaded_thumbnail(params[:collection][:thumbnail_upload]) if params[:collection][:thumbnail_upload]
-      end
-
-      # Deletes any previous thumbnails. The thumbnail indexer (see services/hyrax/indexes_thumbnails)
-      # checks if an uploaded thumbnail exists in the public folder before indexing the thumbnail path.
-      def delete_uploaded_thumbnail
-        FileUtils.rm_rf(uploaded_thumbnail_files)
-        @collection.update_index
-
-        respond_to do |format|
-          format.html
-          format.js # renders delete_uploaded_thumbnail.js.erb, which updates _current_thumbnail.html.erb
-        end
-      end
-
-      def after_destroy(_id)
-        # leaving id to avoid changing the method's parameters prior to release
-        respond_to do |format|
-          format.html do
-            redirect_to hyrax.my_collections_path,
-              notice: t('hyrax.dashboard.my.action.collection_delete_success')
-          end
-          format.json { head :no_content, location: hyrax.my_collections_path }
-        end
-      end
-
-      def after_destroy_error(id)
-        respond_to do |format|
-          format.html do
-            flash[:notice] = t('hyrax.dashboard.my.action.collection_delete_fail')
-            render :edit, status: :unprocessable_entity
-          end
-          format.json { render json: { id: }, status: :unprocessable_entity, location: dashboard_collection_path(@collection) }
-        end
-      end
-
-      def destroy
-        case @collection
-        when Valkyrie::Resource
-          valkyrie_destroy
-        else
-          if @collection.destroy
-            after_destroy(params[:id])
-          else
-            after_destroy_error(params[:id])
-          end
-        end
-      rescue StandardError => err
-        Rails.logger.error(err)
-        after_destroy_error(params[:id])
-      end
-
-      def collection
-        action_name == 'show' ? @presenter : @collection
-      end
-
-      # Renders a JSON response with a list of files in this collection
-      # This is used by the edit form to populate the thumbnail_id dropdown
-      # OVERRIDE: Hyrax 2.9 to use work titles for collection thumbnail select & to add an option to reset to the default thumbnail
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      def files
-        params[:q] = '' unless params[:q]
-        builder = Hyrax::CollectionMemberSearchBuilder.new(scope: self, collection:, search_includes_models: :works)
-        # get the default work image because we do not want to show any works in this
-        # dropdown that only have the default work image. this indicates that they have
-        # no files attached, and will throw an error if selected.
-        default_work_thumbnail_path = Site.instance.default_work_image&.url.presence || ActionController::Base.helpers.image_path('default.png')
-        work_with_no_files_thumbnail_path = ActionController::Base.helpers.image_path('work.png')
-        response = repository.search(builder.where(params[:q]).query)
-        # only return the works that have files, because these will be the only ones with a viable thumbnail
-        result = response.documents.reject do |document|
-                   document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) ||
-                     document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path)
-                   # rubocop:disable Style/MultilineBlockChain
-                 end.map do |document|
-          # rubocop:enable Style/MultilineBlockChain
-          { id: document["thumbnail_path_ss"].split('/').last.gsub(/\?.*/, ''), text: document["title_tesim"].first }
-        end
-        reset_thumbnail_option = {
-          id: '',
-          text: 'Default thumbnail'
-        }
-        result << reset_thumbnail_option
-        render json: result
-      end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
-
-      private
-
-      def create_active_fedora_collection
-        # Coming from the UI, a collection type gid should always be present.  Coming from the API, if a collection type gid is not specified,
-        # use the default collection type (provides backward compatibility with versions < Hyrax 2.1.0)
-        @collection.collection_type_gid = params[:collection_type_gid].presence || default_collection_type.to_global_id
-        @collection.attributes = collection_params.except(:members, :parent_id, :collection_type_gid)
-        @collection.apply_depositor_metadata(current_user.user_key)
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
-        if @collection.save
-          after_create_response
-        else
-          after_create_errors(@collection.errors)
-        end
-      end
-
-      def create_valkyrie_collection
-        return after_create_errors(form_err_msg(form)) unless form.validate(collection_params)
-
-        result =
-          transactions['change_set.create_collection']
-          .with_step_args(
-            'change_set.set_user_as_depositor' => { user: current_user },
-            'change_set.add_to_collections' => { collection_ids: Array(params[:parent_id]) },
-            'collection_resource.apply_collection_type_permissions' => { user: current_user }
-          )
-          .call(form)
-
-        @collection = result.value_or { return after_create_errors(result.failure.first) }
-        after_create_response
-      end
-
-      def update_active_fedora_collection
-        process_member_changes
-        process_branding
-
-        @collection.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE unless @collection.discoverable?
-        # we don't have to reindex the full graph when updating collection
-        @collection.try(:reindex_extent=, Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
-        if @collection.update(collection_params.except(:members))
-          after_update_response
-        else
-          after_update_errors(@collection.errors)
-        end
-      end
-
-      def update_valkyrie_collection
-        return after_update_errors(form_err_msg(form)) unless form.validate(collection_params)
-
-        result = transactions['change_set.update_collection']
-                 .with_step_args(
-            'collection_resource.save_collection_banner' => { update_banner_file_ids: params["banner_files"],
-                                                              banner_unchanged_indicator: params["banner_unchanged"] },
-            'collection_resource.save_collection_logo' => { update_logo_file_ids: params["logo_files"],
-                                                            alttext_values: params["alttext"],
-                                                            linkurl_values: params["linkurl"] }
-          )
-                 .call(form)
-        @collection = result.value_or { return after_update_errors(result.failure.first) }
-
-        process_member_changes
-        after_update_response
-      end
-
-      def valkyrie_destroy
-        if transactions['collection_resource.destroy'].call(@collection).successful?
-          after_destroy(params[:id])
-        else
-          after_destroy_error(params[:id])
-        end
-      end
-
-      def form_err_msg(form)
-        errmsg = []
-        form.errors.messages.each do |fld, err|
-          errmsg << "#{fld} #{err.to_sentence}"
-        end
-        errmsg.to_sentence
-      end
-
-      def default_collection_type
-        Hyrax::CollectionType.find_or_create_default_collection_type
-      end
-
-      def default_collection_type_gid
-        default_collection_type.to_global_id.to_s
-      end
-
-      def collection_type
-        @collection_type ||= CollectionType.find_by_gid!(collection.collection_type_gid)
-      end
-
-      def link_parent_collection(parent_id)
-        child = collection.respond_to?(:valkyrie_resource) ? collection.valkyrie_resource : collection
-        Hyrax::Collections::CollectionMemberService.add_member(collection_id: parent_id,
-                                                               new_member: child,
-                                                               user: current_user)
-      end
-
-      def uploaded_files(uploaded_file_ids)
-        return [] if uploaded_file_ids.empty?
-        UploadedFile.find(uploaded_file_ids)
-      end
-
-      def update_referer
-        return edit_dashboard_collection_path(@collection) + (params[:referer_anchor] || '') if params[:stay_on_edit]
-        dashboard_collection_path(@collection)
-      end
-
-      # branding specific methods
-      def process_banner_input
-        return update_existing_banner if params["banner_unchanged"] == "true"
-        remove_banner
-        uploaded_file_ids = params["banner_files"]
-        banner_text = params["banner_text"]&.first
-        add_new_banner(uploaded_file_ids, banner_text) if uploaded_file_ids
-      end
-
-      def update_existing_banner
-        banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
-        banner_info.first.alt_text = params["banner_text"].first
-        banner_info.first.save(banner_info.first.local_path, false)
-      end
-
-      def add_new_banner(uploaded_file_ids, banner_text)
-        f = uploaded_files(uploaded_file_ids).first
-        ## OVERRIDE Hyrax 3.4.0 - process locations
-        file_location = process_file_location(f)
-
-        banner_info = CollectionBrandingInfo.new(
-          collection_id: @collection.id,
-          filename: File.split(f.file_url).last,
-          role: "banner",
-          alt_txt: banner_text,
-          target_url: ""
-        )
-        ## OVERRIDE Hyrax 3.4.0 - process locations
-        banner_info.save file_location
-      end
-
-      def remove_banner
-        banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
-        banner_info&.delete_all
-      end
-
-      def update_logo_info(uploaded_file_id, alttext, linkurl)
-        logo_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo").where(local_path: uploaded_file_id.to_s)
-        logo_info.first.alt_text = alttext
-        logo_info.first.target_url = linkurl
-        logo_info.first.local_path = uploaded_file_id
-        logo_info.first.save(uploaded_file_id, false)
-      end
-
-      def create_logo_info(uploaded_file_id, alttext, linkurl)
-        file = uploaded_files(uploaded_file_id)
-        file_location = process_file_location(file) # OVERRIDE Hyrax 3.4.0 to clean file location
-
-        logo_info = CollectionBrandingInfo.new(
-          collection_id: @collection.id,
-          filename: File.split(file.file_url).last,
-          role: "logo",
-          alt_txt: alttext,
-          target_url: linkurl
-        )
-        logo_info.save file_location
-        logo_info
-      end
-
-      def remove_redundant_files(public_files)
-        # remove any public ones that were not included in the selection.
-        logos_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo")
-        logos_info.each do |logo_info|
-          logo_info.delete(logo_info.local_path) unless public_files.include? logo_info.local_path
-          logo_info.destroy unless public_files.include? logo_info.local_path
-        end
-      end
-
-      def process_logo_records(uploaded_file_ids)
-        public_files = []
-        uploaded_file_ids.each_with_index do |ufi, i|
-          # If the user has chosen a new logo, the ufi will be an integer
-          # If the logo was previously chosen, the ufi will be a path
-          # If it is a path, update the rec, else create a new rec
-          if !ufi.match(/\D/).nil?
-            update_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
-            public_files << ufi
-          else # brand new one, insert in the database
-            logo_info = create_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
-            public_files << logo_info.local_path
-          end
-        end
-        public_files
-      end
-
-      def process_logo_input
-        uploaded_file_ids = params["logo_files"]
-        public_files = []
-
-        if uploaded_file_ids.nil?
-          remove_redundant_files public_files
-          return
-        end
-
-        public_files = process_logo_records uploaded_file_ids
-        remove_redundant_files public_files
-      end
-
-      # run a solr query to get the collections the user has access to edit
-      # @return [Array] a list of the user's collections
-      def find_collections_for_form
-        Hyrax::CollectionsService.new(self).search_results(:edit)
-      end
-
-      def remove_select_something_first_flash
-        flash.delete(:notice) if flash.notice == 'Select something first'
-      end
-
-      def presenter
-        @presenter ||= presenter_class.new(curation_concern, current_ability)
-      end
-
-      def curation_concern
-        # Query Solr for the collection.
-        # run the solr query to find the collection members
-        response, _docs = single_item_search_service.search_results
-        curation_concern = response.documents.first
-        raise CanCan::AccessDenied unless curation_concern
-        curation_concern
-      end
-
-      def single_item_search_service
-        Hyrax::SearchService.new(config: blacklight_config, user_params: params.except(:q, :page), scope: self, search_builder_class: single_item_search_builder_class)
-      end
-
-      # Instantiates the search builder that builds a query for a single item
-      # this is useful in the show view.
-      def single_item_search_builder
-        search_service.search_builder
-      end
-      deprecation_deprecate :single_item_search_builder
-
-      def collection_params
-        if Hyrax.config.collection_class < ActiveFedora::Base
-          @participants = extract_old_style_permission_attributes(params[:collection])
-          form_class.model_attributes(params[:collection])
-        else
-          params.permit(collection: {})[:collection]
-                .merge(params.permit(:collection_type_gid)
-              .with_defaults(collection_type_gid: default_collection_type_gid))
-                .merge(member_of_collection_ids: Array(params[:parent_id]))
-        end
-      end
-
-      def extract_old_style_permission_attributes(attributes)
-        # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
-        permissions = attributes.delete("permissions_attributes")
-        return [] unless permissions
-        Deprecation.warn(self, "Passing in permissions_attributes parameter with a new collection is deprecated and support will be removed from Hyrax 3.0. " \
-          "Use Hyrax::PermissionTemplate instead to grant Manage, Deposit, or View access.")
-        participants = []
-        permissions.each do |p|
-          access = access(p)
-          participants << { agent_type: agent_type(p), agent_id: p["name"], access: } if access
-        end
-        participants
-      end
-
-      def agent_type(permission)
-        # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
-        return 'group' if permission["type"] == 'group'
-        'user'
-      end
-
-      def access(permission)
-        # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
-        return Hyrax::PermissionTemplateAccess::MANAGE if permission["access"] == 'edit'
-        return Hyrax::PermissionTemplateAccess::VIEW if permission["access"] == 'read'
-      end
-
-      def process_member_changes
-        case params[:collection][:members]
-        when 'add' then add_members_to_collection
-        when 'remove' then remove_members_from_collection
-        when 'move' then move_members_between_collections
-        end
-      end
-
-      def add_members_to_collection(collection = nil, collection_id: nil)
-        collection_id ||= (collection.try(:id) || @collection.id)
-
-        Hyrax::Collections::CollectionMemberService
-          .add_members_by_ids(collection_id:,
-                              new_member_ids: batch,
-                              user: current_user)
-      end
-
-      def remove_members_from_collection
-        Hyrax::Collections::CollectionMemberService
-          .remove_members_by_ids(collection_id: @collection.id,
-                                 member_ids: batch,
-                                 user: current_user)
-      end
-
-      def move_members_between_collections
-        remove_members_from_collection
-        add_members_to_collection(collection_id: params[:destination_collection_id])
-
-        destination_title =
-          Hyrax.query_service.find_by(id: params[:destination_collection_id]).title.first ||
-          params[:destination_collection_id]
-        flash[:notice] = "Successfully moved #{batch.count} files to #{destination_title} Collection."
-      rescue StandardError => err
-        Rails.logger.error(err)
-        destination_title =
-          Hyrax.query_service.find_by(id: params[:destination_collection_id]).title.first ||
-          destination_id
-        flash[:error] = "An error occured. Files were not moved to #{destination_title} Collection."
-      end
-
-      # Include 'catalog' and 'hyrax/base' in the search path for views, while prefering
-      # our local paths. Thus we are unable to just override `self.local_prefixes`
-      def _prefixes
-        @_prefixes ||= super + ['catalog', 'hyrax/base']
-      end
-
-      def ensure_admin!
-        # Even though the user can view this collection, they may not be able to view
-        # it on the admin page.
-        authorize! :read, :admin_dashboard
-      end
-
-      def search_action_url(*args)
-        hyrax.dashboard_collections_url(*args)
-      end
-
-      def form
-        @form ||=
-          case @collection
-          when Valkyrie::Resource
-            form = Hyrax::Forms::ResourceForm.for(@collection)
-            form.prepopulate!
-            form
-          else
-            form_class.new(@collection, current_ability, repository)
-          end
-      end
-
-      def set_default_permissions
-        additional_grants = @participants # Grants converted from older versions (< Hyrax 2.1.0) where share was edit or read access instead of managers, depositors, and viewers
-        Collections::PermissionsCreateService.create_default(collection: @collection, creating_user: current_user, grants: additional_grants)
-      end
-
-      def query_collection_members
-        member_works
-        member_subcollections if collection_type.nestable?
-        parent_collections if collection_type.nestable? && action_name == 'show'
-      end
-
-      # Instantiate the membership query service
-      def collection_member_service
-        @collection_member_service ||= membership_service_class.new(scope: self, collection:, params: params_for_query)
-      end
-
-      def member_works
-        @response = collection_member_service.available_member_works
-        @member_docs = @response.documents
-        @members_count = @response.total
-      end
-
-      def member_subcollections
-        results = collection_member_service.available_member_subcollections
-        @subcollection_solr_response = results
-        @subcollection_docs = results.documents
-        @subcollection_count = @presenter.nil? ? 0 : @subcollection_count = @presenter.subcollection_count = results.total
-      end
-
-      def parent_collections
-        page = params[:parent_collection_page].to_i
-        query = Hyrax::Collections::NestedCollectionQueryService
-        collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page:)
-      end
-
-      def collection_object
-        @collection
-      end
-
-      # You can override this method if you need to provide additional
-      # inputs to the search builder. For example:
-      #   search_field: 'all_fields'
-      # @return <Hash> the inputs required for the collection member search builder
-      def params_for_query
-        params.merge(q: params[:cq])
-      end
-
-      # Only accept HTTP|HTTPS urls;
-      # @return <String> the url
-      def verify_linkurl(linkurl)
-        url = Loofah.scrub_fragment(linkurl, :prune).to_s
-        url if valid_url?(url)
-      end
-
-      def valid_url?(url)
-        (url =~ URI.regexp(['http', 'https']))
-      end
-
-      def after_create_response
-        if @collection.is_a?(ActiveFedora::Base)
-          form
-          set_default_permissions
-          # if we are creating the new collection as a subcollection (via the nested collections controller),
-          # we pass the parent_id through a hidden field in the form and link the two after the create.
-          link_parent_collection(params[:parent_id]) unless params[:parent_id].nil?
-        end
-        respond_to do |format|
-          Hyrax::SolrService.commit
-          format.html { redirect_to edit_dashboard_collection_path(@collection), notice: t('hyrax.dashboard.my.action.collection_create_success') }
-          format.json { render json: @collection, status: :created, location: dashboard_collection_path(@collection) }
-        end
-        add_members_to_collection unless batch.empty?
-      end
-
-      def after_create_errors_for_active_fedora(errors)
-        form
-        respond_to do |format|
-          format.html do
-            flash[:error] = errors.to_s
-            render action: 'new'
-          end
-          format.json { render json: @collection.errors, status: :unprocessable_entity }
-        end
-      end
-
-      def after_create_errors(errors) # for valkyrie
-        return after_create_errors_for_active_fedora(errors) if @collection.is_a? ActiveFedora::Base
-        respond_to do |wants|
-          wants.html do
-            flash[:error] = errors.to_s
-            render 'new', status: :unprocessable_entity
-          end
-          wants.json do
-            render_json_response(response_type: :unprocessable_entity, options: { errors: })
-          end
-        end
-      end
-
-      def after_update_response
-        respond_to do |format|
-          format.html { redirect_to update_referer, notice: t('hyrax.dashboard.my.action.collection_update_success') }
-          format.json { render json: @collection, status: :updated, location: dashboard_collection_path(@collection) }
-        end
-      end
-
-      def after_update_errors_for_active_fedora(errors)
-        form
-        respond_to do |format|
-          format.html do
-            flash[:error] = errors.to_s
-            render action: 'edit'
-          end
-          format.json { render json: @collection.errors, status: :unprocessable_entity }
-        end
-      end
-
-      def after_update_errors(errors) # for valkyrie
-        return after_update_errors_for_active_fedora(errors) if @collection.is_a? ActiveFedora::Base
-        respond_to do |wants|
-          wants.html do
-            flash[:error] = errors.to_s
-            render 'edit', status: :unprocessable_entity
-          end
-          wants.json { render_json_response(response_type: :unprocessable_entity, options: { errors: }) }
-        end
-      end
-
-      # rubocop:disable Metrics/MethodLength
-      def process_uploaded_thumbnail(uploaded_file)
-        dir_name = UploadedCollectionThumbnailPathService.upload_dir(@collection)
-        saved_file = Rails.root.join(dir_name, uploaded_file.original_filename)
-        # Create directory if it doesn't already exist
-        if File.directory?(dir_name) # clear contents
-          delete_uploaded_thumbnail
-        else
-          FileUtils.mkdir_p(dir_name)
-        end
-        File.open(saved_file, 'wb') do |file|
-          file.write(uploaded_file.read)
-        end
-        image = MiniMagick::Image.open(saved_file)
-        # Save two versions of the image: one for homepage feature cards and one for regular thumbnail
-        image.resize('500x900').format("jpg").write("#{dir_name}/#{@collection.id}_card.jpg")
-        image.resize('150x300').format("jpg").write("#{dir_name}/#{@collection.id}_thumbnail.jpg")
-        File.chmod(0o664, "#{dir_name}/#{@collection.id}_thumbnail.jpg")
-        File.chmod(0o664, "#{dir_name}/#{@collection.id}_card.jpg")
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      ## OVERRIDE Hyrax 3.4.0 handle file locations
-      def process_file_location(f)
-        if /^http/.match?(f.file_url)
-          f.file.download!(f.file_url)
-          f.file_url
-        elsif %r{^\/}.match?(f.file_url)
-          f.file.path
-        else
-          f.file_url
-        end
-      end
-      ## END OVERRIDE
-    end
-  end
-end
diff --git a/app/controllers/hyrax/dashboard/collections_controller_decorator.rb b/app/controllers/hyrax/dashboard/collections_controller_decorator.rb
new file mode 100644
index 000000000..dcc1fb94b
--- /dev/null
+++ b/app/controllers/hyrax/dashboard/collections_controller_decorator.rb
@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax v5.0.0rc2
+# - Fix file upload in logo and banner
+# - Use work titles for collection thumbnail select & to add an option to reset to the default thumbnail
+module Hyrax
+  module Dashboard
+    ## Shows a list of all collections to the admins
+    # rubocop:disable Metrics/ModuleLength
+    module CollectionsControllerDecorator
+      def edit
+        form
+        collection_type
+        # Gets original filename of an uploaded thumbnail. See #update
+        return unless ::SolrDocument.find(@collection.id).thumbnail_path.include?("uploaded_collection_thumbnails") && uploaded_thumbnail?
+        @thumbnail_filename = File.basename(uploaded_thumbnail_files.reject { |f| File.basename(f).include? @collection.id }.first)
+      end
+
+      def uploaded_thumbnail?
+        uploaded_thumbnail_files.any?
+      end
+
+      def uploaded_thumbnail_files
+        Dir["#{UploadedCollectionThumbnailPathService.upload_dir(@collection)}/*"]
+      end
+
+      def update
+        # OVERRIDE: ensure user is allowed to change visibility
+        authorize! :manage_discovery, @collection if collection_params[:visibility].present? && @collection.visibility != collection_params[:visibility]
+
+        super
+      end
+
+      def process_branding
+        super
+
+        # TODO: does this still work?
+        process_uploaded_thumbnail(params[:collection][:thumbnail_upload]) if params[:collection][:thumbnail_upload]
+      end
+
+      # Deletes any previous thumbnails. The thumbnail indexer (see services/hyrax/indexes_thumbnails)
+      # checks if an uploaded thumbnail exists in the public folder before indexing the thumbnail path.
+      def delete_uploaded_thumbnail
+        FileUtils.rm_rf(uploaded_thumbnail_files)
+        @collection.update_index
+
+        respond_to do |format|
+          format.html
+          format.js # renders delete_uploaded_thumbnail.js.erb, which updates _current_thumbnail.html.erb
+        end
+      end
+
+      # Renders a JSON response with a list of files in this collection
+      # This is used by the edit form to populate the thumbnail_id dropdown
+      # OVERRIDE: Hyrax 2.9 to use work titles for collection thumbnail select & to add an option to reset to the default thumbnail
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def files
+        params[:q] = '' unless params[:q]
+        builder = Hyrax::CollectionMemberSearchBuilder.new(scope: self, collection:, search_includes_models: :works)
+        # get the default work image because we do not want to show any works in this
+        # dropdown that only have the default work image. this indicates that they have
+        # no files attached, and will throw an error if selected.
+        default_work_thumbnail_path = Site.instance.default_work_image&.url.presence || ActionController::Base.helpers.image_path('default.png')
+        work_with_no_files_thumbnail_path = ActionController::Base.helpers.image_path('work.png')
+        response = repository.search(builder.where(params[:q]).query)
+        # only return the works that have files, because these will be the only ones with a viable thumbnail
+        result = response.documents.reject do |document|
+                   document["thumbnail_path_ss"].blank? || document["thumbnail_path_ss"].include?(default_work_thumbnail_path) ||
+                     document["thumbnail_path_ss"].include?(work_with_no_files_thumbnail_path)
+                   # rubocop:disable Style/MultilineBlockChain
+                 end.map do |document|
+          # rubocop:enable Style/MultilineBlockChain
+          { id: document["thumbnail_path_ss"].split('/').last.gsub(/\?.*/, ''), text: document["title_tesim"].first }
+        end
+        reset_thumbnail_option = {
+          id: '',
+          text: 'Default thumbnail'
+        }
+        result << reset_thumbnail_option
+        render json: result
+      end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+      private
+
+      # branding specific methods
+      def process_banner_input
+        return update_existing_banner if params["banner_unchanged"] == "true"
+        remove_banner
+        uploaded_file_ids = params["banner_files"]
+        banner_text = params["banner_text"]&.first
+        add_new_banner(uploaded_file_ids, banner_text) if uploaded_file_ids
+      end
+
+      def update_existing_banner
+        banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
+        banner_info.first.alt_text = params["banner_text"].first
+        banner_info.first.save(banner_info.first.local_path, false)
+      end
+
+      def add_new_banner(uploaded_file_ids, banner_text)
+        f = uploaded_files(uploaded_file_ids).first
+        ## OVERRIDE Hyrax v5.0.0rc2 - process locations
+        file_location = process_file_location(f)
+
+        banner_info = CollectionBrandingInfo.new(
+          collection_id: @collection.id,
+          filename: File.split(f.file_url).last,
+          role: "banner",
+          alt_txt: banner_text,
+          target_url: ""
+        )
+        ## OVERRIDE Hyrax v5.0.0rc2 - process locations
+        banner_info.save file_location
+      end
+
+      def create_logo_info(uploaded_file_id, alttext, linkurl)
+        file = uploaded_files(uploaded_file_id)
+        file_location = process_file_location(file) # OVERRIDE Hyrax v5.0.0rc2 to clean file location
+
+        logo_info = CollectionBrandingInfo.new(
+          collection_id: @collection.id,
+          filename: File.split(file.file_url).last,
+          role: "logo",
+          alt_txt: alttext,
+          target_url: linkurl
+        )
+        logo_info.save file_location
+        logo_info
+      end
+
+      def collection_params
+        if Hyrax.config.collection_class < ActiveFedora::Base
+          @participants = extract_old_style_permission_attributes(params[:collection])
+          form_class.model_attributes(params[:collection])
+        else
+          params.permit(collection: {})[:collection]
+                .merge(params.permit(:collection_type_gid)
+              .with_defaults(collection_type_gid: default_collection_type_gid))
+                .merge(member_of_collection_ids: Array(params[:parent_id]))
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def process_uploaded_thumbnail(uploaded_file)
+        dir_name = UploadedCollectionThumbnailPathService.upload_dir(@collection)
+        saved_file = Rails.root.join(dir_name, uploaded_file.original_filename)
+        # Create directory if it doesn't already exist
+        if File.directory?(dir_name) # clear contents
+          delete_uploaded_thumbnail
+        else
+          FileUtils.mkdir_p(dir_name)
+        end
+        File.open(saved_file, 'wb') do |file|
+          file.write(uploaded_file.read)
+        end
+        image = MiniMagick::Image.open(saved_file)
+        # Save two versions of the image: one for homepage feature cards and one for regular thumbnail
+        image.resize('500x900').format("jpg").write("#{dir_name}/#{@collection.id}_card.jpg")
+        image.resize('150x300').format("jpg").write("#{dir_name}/#{@collection.id}_thumbnail.jpg")
+        File.chmod(0o664, "#{dir_name}/#{@collection.id}_thumbnail.jpg")
+        File.chmod(0o664, "#{dir_name}/#{@collection.id}_card.jpg")
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      ## OVERRIDE Hyrax v5.0.0rc2 handle file locations
+      def process_file_location(f)
+        if /^http/.match?(f.file_url)
+          f.file.download!(f.file_url)
+          f.file_url
+        elsif %r{^\/}.match?(f.file_url)
+          f.file.path
+        else
+          f.file_url
+        end
+      end
+      ## END OVERRIDE
+    end
+  end
+end
+
+Hyrax::Dashboard::CollectionsController.prepend(Hyrax::Dashboard::CollectionsControllerDecorator)
diff --git a/app/controllers/hyrax/generic_works_controller.rb b/app/controllers/hyrax/generic_works_controller.rb
index 243dfcbfd..9831ea89a 100644
--- a/app/controllers/hyrax/generic_works_controller.rb
+++ b/app/controllers/hyrax/generic_works_controller.rb
@@ -7,6 +7,7 @@ module Hyrax
   class GenericWorksController < ApplicationController
     # Adds Hyrax behaviors to the controller.
     include Hyrax::WorksControllerBehavior
+    include Hyku::WorksControllerBehavior
     include Hyrax::BreadcrumbsForWorks
     self.curation_concern_type = ::GenericWork
 
diff --git a/app/controllers/hyrax/images_controller.rb b/app/controllers/hyrax/images_controller.rb
index e37798964..ec45442aa 100644
--- a/app/controllers/hyrax/images_controller.rb
+++ b/app/controllers/hyrax/images_controller.rb
@@ -7,6 +7,7 @@ module Hyrax
   class ImagesController < ApplicationController
     # Adds Hyrax behaviors to the controller.
     include Hyrax::WorksControllerBehavior
+    include Hyku::WorksControllerBehavior
     include Hyrax::BreadcrumbsForWorks
     self.curation_concern_type = ::Image
 
diff --git a/app/controllers/hyrax/my/works_controller_decorator.rb b/app/controllers/hyrax/my/works_controller_decorator.rb
deleted file mode 100644
index df68ce1ca..000000000
--- a/app/controllers/hyrax/my/works_controller_decorator.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-##
-# OVERRIDE Hyrax 3.5.0; when Hyrax hits v4.0.0 we can remove this.
-# @see https://github.com/samvera/hyrax/pull/5972
-module Hyrax
-  module My
-    module WorksControllerDecorator
-      def collections_service
-        cloned = clone
-        cloned.params = {}
-        Hyrax::CollectionsService.new(cloned)
-      end
-    end
-  end
-end
-
-Hyrax::My::WorksController.prepend(Hyrax::My::WorksControllerDecorator)
diff --git a/app/controllers/hyrax/pages_controller.rb b/app/controllers/hyrax/pages_controller_decorator.rb
similarity index 56%
rename from app/controllers/hyrax/pages_controller.rb
rename to app/controllers/hyrax/pages_controller_decorator.rb
index ed12e044d..3f470a4db 100644
--- a/app/controllers/hyrax/pages_controller.rb
+++ b/app/controllers/hyrax/pages_controller_decorator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE: Hyrax v5.0.0
+# OVERRIDE: Hyrax v5.0.0rc2
 # - add inject_theme_views method for theming
 # - add homepage presenter for access to feature flippers
 # - add access to content blocks in the show method
@@ -8,17 +8,22 @@
 
 module Hyrax
   # Shows the about and help page
-  class PagesController < ApplicationController
-    load_and_authorize_resource class: ContentBlock, except: :show
-    layout :pages_layout
+  module PagesControllerDecorator
+    extend ActiveSupport::Concern
 
     # OVERRIDE: Add for theming
     # Adds Hydra behaviors into the application controller
     include Blacklight::SearchContext
     include Blacklight::AccessControls::Catalog
 
-    # OVERRIDE: Adding inject theme views method for theming
-    around_action :inject_theme_views
+    prepended do
+      # OVERRIDE: Adding inject theme views method for theming
+      around_action :inject_theme_views
+
+      # OVERRIDE: Hyrax v5.0.0rc2 Add for theming
+      class_attribute :presenter_class
+      self.presenter_class = Hyrax::HomepagePresenter
+    end
 
     # OVERRIDE: Add for theming
     # The search builder for finding recent documents
@@ -27,14 +32,8 @@ def search_builder_class
       Hyrax::HomepageSearchBuilder
     end
 
-    # OVERRIDE: Hyrax v3.4.0 Add for theming
-    class_attribute :presenter_class
-    self.presenter_class = Hyrax::HomepagePresenter
-
-    helper Hyrax::ContentBlockHelper
-
     def show
-      @page = ContentBlock.for(params[:key])
+      super
 
       # OVERRIDE: Additional for theming
       @presenter = presenter_class.new(current_ability, collections)
@@ -46,45 +45,8 @@ def show
       @announcement_text = ContentBlock.for(:announcement)
     end
 
-    def edit
-      add_breadcrumb t(:'hyrax.controls.home'), root_path
-      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb t(:'hyrax.admin.sidebar.configuration'), '#'
-      add_breadcrumb t(:'hyrax.admin.sidebar.pages'), hyrax.edit_pages_path
-    end
-
-    def update
-      respond_to do |format|
-        if @page.update(value: update_value_from_params)
-          redirect_path = "#{hyrax.edit_pages_path}##{params[:content_block].keys.first}"
-          format.html { redirect_to redirect_path, notice: t(:'hyrax.pages.updated') }
-        else
-          format.html { render :edit }
-        end
-      end
-    end
-
     private
 
-    def permitted_params
-      params.require(:content_block).permit(:about,
-                                            :agreement,
-                                            :help,
-                                            :terms)
-    end
-
-    # When a request comes to the controller, it will be for one and
-    # only one of the content blocks. Params always looks like:
-    #   {'about_page' => 'Here is an awesome about page!'}
-    # So reach into permitted params and pull out the first value.
-    def update_value_from_params
-      permitted_params.values.first
-    end
-
-    def pages_layout
-      action_name == 'show' ? 'homepage' : 'hyrax/dashboard'
-    end
-
     # OVERRIDE: return collections for theming
     # Return 6 collections, sorts by title
     def collections(rows: 6)
@@ -115,3 +77,5 @@ def inject_theme_views
     end
   end
 end
+
+Hyrax::PagesController.prepend(Hyrax::PagesControllerDecorator)
diff --git a/app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb b/app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb
new file mode 100644
index 000000000..10fc33a32
--- /dev/null
+++ b/app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax v5.0.0rc2 Expand to allow adding groups to workflow roles
+
+module Hyrax
+  module Forms
+    module WorkflowResponsibilityFormDecorator
+      module ClassMethods
+        # Determine which form it is, user or group
+        def new(params = {})
+          if params[:user_id].present?
+            super
+          else
+            Forms::WorkflowResponsibilityGroupForm.new(params)
+          end
+        end
+      end
+    end
+  end
+end
+
+Hyrax::Forms::WorkflowResponsibilityForm.singleton_class
+                                        .send(:prepend, Hyrax::Forms::WorkflowResponsibilityFormDecorator::ClassMethods)
diff --git a/spec/forms/hyrax/forms/workflow_responsibility_form_decorator_spec.rb b/spec/forms/hyrax/forms/workflow_responsibility_form_decorator_spec.rb
new file mode 100644
index 000000000..eb072adc2
--- /dev/null
+++ b/spec/forms/hyrax/forms/workflow_responsibility_form_decorator_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+RSpec.describe Hyrax::Forms::WorkflowResponsibilityForm, type: :decorator do
+  describe ".new" do
+    context "when user_id is present" do
+      let(:user) { create(:user) }
+
+      it "returns a WorkflowResponsibilityForm" do
+        expect(described_class.new(user_id: user.id)).to be_a described_class
+      end
+    end
+
+    context "when user_id is not present" do
+      let(:group) { create(:group) }
+
+      it "returns a WorkflowResponsibilityGroupForm" do
+        expect(described_class.new(group_id: group.id)).to be_a Hyrax::Forms::WorkflowResponsibilityGroupForm
+      end
+    end
+  end
+end

From 8272321315dc43ddc28fbd94d689729c6d5289cd Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 09:08:01 -0500
Subject: [PATCH 100/126] Update IIIF Print gem

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

diff --git a/Gemfile.lock b/Gemfile.lock
index be0d46300..01f9501af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,7 +111,7 @@ GIT
 
 GIT
   remote: https://github.com/scientist-softserv/iiif_print.git
-  revision: e476998ab453afabf1bcb8afa059b4416af9b705
+  revision: 2dfd14b0fc9805c362b5442fcb90d7eaa58ae630
   branch: main
   specs:
     iiif_print (1.0.0)

From 5b3089a11d48d37ce03a166aa438ee596e03e52c Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 09:24:25 -0500
Subject: [PATCH 101/126] =?UTF-8?q?=F0=9F=A4=96=20Specify=20Cache=20Root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, we were seeing the following failure:

> Failure/Error: Site.application\_name || super
>
> ActionView::Template::Error:
>  Permission denied @ dir\_s\_mkdir - /app

The `Account#setup_tenant_cache` sets the cache\_store to be
`ENV.fetch('HYKU_CACHE_ROOT', '/app/samvera/file_cache')`.  When I
locally chanced it to `/blorg/samvera/file_cache` I could repeat the
error.

With this commit, we're setting the cache value for the CircleCI run.

Why was it previously working?  Perhaps because
`Account#setup_tenant_cache` never got called due to other
configurations?  There is a guard clause around the method call.
---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 455c371b6..4c9c7618e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,6 +61,7 @@ jobs:
       BUNDLE_PATH: vendor/bundle
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
+      HYKU_CACHE_ROOT: /tmp/hyku-cache
       HYKU_RESTRICT_CREATE_AND_DESTROY_PERMISSIONS: 'true'
       SOLR_ADMIN_USER: admin
       SOLR_ADMIN_PASSWORD: admin

From ecbf83e31fdff1d711043d754822247fd891ea75 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 09:51:00 -0500
Subject: [PATCH 102/126] =?UTF-8?q?=F0=9F=A7=B9=20Update=20spec=20to=20ref?=
 =?UTF-8?q?lect=20AdminSet=20default=20behavior?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the following commit, we removed the deprecated
`AdminSet.find_or_create_default_admin_set_id`:

- https://github.com/samvera/hyrax/commit/863c4bc177702b3aa00ad01f93e7a3d214bb2d73

This commit follows the advice of the deprecation warning and now favors
the `Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id`
method call.

Related to:

- https://github.com/samvera/hyrax/pull/6203
---
 spec/services/create_account_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/services/create_account_spec.rb b/spec/services/create_account_spec.rb
index d1825a433..262a68503 100644
--- a/spec/services/create_account_spec.rb
+++ b/spec/services/create_account_spec.rb
@@ -4,6 +4,7 @@
   subject { described_class.new(account) }
 
   let(:account) { FactoryBot.build(:sign_up_account) }
+  let(:stubbed_admin_set) { double(AdminSet, id: "admin_set/id") }
 
   describe '#create_tenant' do
     it 'creates a new apartment tenant' do
@@ -15,7 +16,7 @@
       expect(Apartment::Tenant).to receive(:create).with(any_args) do |&block|
         block.call
       end
-      expect(AdminSet).to receive(:find_or_create_default_admin_set_id)
+      expect(Hyrax::AdminSetCreateService).to receive(:find_or_create_default_admin_set).and_return(stubbed_admin_set)
       subject.save
       expect(Site.reload.account).to eq account
     end
@@ -59,7 +60,7 @@
       expect(RolesService).to receive(:create_default_hyrax_groups_with_roles!)
       expect(Hyrax::CollectionType).to receive(:find_or_create_default_collection_type)
       expect(Hyrax::CollectionType).to receive(:find_or_create_admin_set_type)
-      expect(AdminSet).to receive(:find_or_create_default_admin_set_id)
+      expect(Hyrax::AdminSetCreateService).to receive(:find_or_create_default_admin_set).and_return(stubbed_admin_set)
 
       account.create_defaults
     end

From f50b3f5242e0416dcb040d78c758c5a88c857e50 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Wed, 20 Dec 2023 10:34:30 -0500
Subject: [PATCH 103/126] Remove obsolete site roles and routes (#2080)

The site/roles route is obsolete. This is an attempt to remove as much
of the obsolete logic as possible, as it has been replaced by the groups
with roles feature.
---
 app/controllers/roles_controller.rb       | 34 -----------
 app/views/roles/index.html.erb            | 36 ------------
 config/routes.rb                          |  1 -
 spec/controllers/roles_controller_spec.rb | 69 -----------------------
 spec/features/roles_spec.rb               | 31 ----------
 spec/routing/roles_routing_spec.rb        | 16 ------
 6 files changed, 187 deletions(-)
 delete mode 100644 app/controllers/roles_controller.rb
 delete mode 100644 app/views/roles/index.html.erb
 delete mode 100644 spec/controllers/roles_controller_spec.rb
 delete mode 100644 spec/features/roles_spec.rb
 delete mode 100644 spec/routing/roles_routing_spec.rb

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
deleted file mode 100644
index 473a7e95d..000000000
--- a/app/controllers/roles_controller.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-##
-# CRUD actions for assigning exhibit roles to
-# existing users
-class RolesController < ApplicationController
-  load_and_authorize_resource :user, parent: false
-  layout 'hyrax/dashboard'
-
-  before_action do
-    authorize! :manage, Role
-  end
-
-  def index
-    @users = User.all
-    add_breadcrumb t(:'hyrax.controls.home'), root_path
-    add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-    add_breadcrumb t(:'hyrax.admin.sidebar.roles_and_permissions'), site_roles_path
-  end
-
-  def update
-    if @user.update(user_params)
-      redirect_to site_roles_path, notice: notice
-    else
-      render action: 'index'
-    end
-  end
-
-  protected
-
-  def user_params
-    params.require(:user).permit(site_roles: [])
-  end
-end
diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
deleted file mode 100644
index 1f40a34d8..000000000
--- a/app/views/roles/index.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<% content_for :page_header do %>
-  <h1><span class="fa fa-user"></span> <%= t(:'hyrax.admin.sidebar.roles_and_permissions') %></h1>
-<% end %>
-
-<div class="row">
-  <div class="col-md-12">
-    <div class="card">
-      <div class="card-body">
-        <table class="table table-striped datatable">
-          <thead>
-            <tr>
-              <th>Email</th>
-              <th>Roles</th>
-            </tr>
-          </thead>
-          <tbody>
-            <% @users.each do |u| %>
-              <tr>
-                <td><%= u.email %></td>
-                <td>
-                  <%= simple_form_for u, wrapper: :horizontal_form, url: site_role_path(u.id) do |f| %>
-                    <div class="form-group">
-                      <label class="sr-only">Roles</label>
-                      <%= f.collection_select :site_roles, Role.site, :name, :name, { selected: u.site_roles.pluck(:name) }, { multiple: true, class: 'form-control' } %>
-                    </div>
-                    <%= f.submit 'Update', class: 'btn btn-primary' %>
-                  <% end %>
-                </td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/config/routes.rb b/config/routes.rb
index 1de3009e6..48cbdb522 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,7 +43,6 @@
 
   mount BrowseEverything::Engine => '/browse'
   resource :site, only: [:update] do
-    resources :roles, only: %i[index update]
     resource :labels, only: %i[edit update]
   end
 
diff --git a/spec/controllers/roles_controller_spec.rb b/spec/controllers/roles_controller_spec.rb
deleted file mode 100644
index f16b90374..000000000
--- a/spec/controllers/roles_controller_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe RolesController, type: :controller do
-  before do
-    sign_in user
-  end
-
-  let(:valid_attributes) do
-    { site_roles: ['admin'] }
-  end
-
-  context 'with an unprivileged user' do
-    let(:user) { create(:user) }
-
-    describe "GET #edit" do
-      it "denies the request" do
-        get :index
-        expect(response).not_to have_http_status(:ok)
-      end
-    end
-
-    describe "PUT #update" do
-      it "denies the request" do
-        put :update, params: { id: user.id }
-        expect(response).not_to have_http_status(:created)
-      end
-    end
-  end
-
-  context 'with an administrator' do
-    let(:user) { FactoryBot.create(:admin) }
-
-    describe "GET #index" do
-      before do
-        # it should not return guest users
-        create(:guest_user)
-      end
-
-      it "assigns the users as @users" do
-        get :index
-        expect(assigns(:users)).to match_array [user]
-      end
-    end
-
-    describe "PUT #update" do
-      context "with valid params" do
-        let(:new_attributes) do
-          { site_roles: ['admin', 'superadmin'] }
-        end
-
-        it "updates the requested role" do
-          put :update, params: { id: user.id, user: new_attributes }
-          user.reload
-          expect(user.site_roles.pluck(:name)).to match_array ['admin', 'superadmin']
-        end
-
-        it "assigns the requested user as @user" do
-          put :update, params: { id: user.id, user: valid_attributes }
-          expect(assigns(:user)).to eq(user)
-        end
-
-        it "redirects to the site roles" do
-          put :update, params: { id: user.id, user: valid_attributes }
-          expect(response).to redirect_to(site_roles_path)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/features/roles_spec.rb b/spec/features/roles_spec.rb
deleted file mode 100644
index 4ec8aa3b7..000000000
--- a/spec/features/roles_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-# NOTE: If want to run spec in browser, you have to set "js: true"
-RSpec.describe 'Site Roles', type: :feature, clean: true do
-  context 'as an administrator' do
-    let!(:user) { FactoryBot.create(:admin) }
-    let!(:another_user) { FactoryBot.create(:user) }
-
-    before do
-      login_as(user, scope: :user)
-    end
-
-    it 'lists user roles' do
-      visit site_roles_path
-
-      expect(page).to have_css 'td', text: user.email
-      expect(page).to have_css 'td', text: another_user.email
-    end
-
-    it 'updates user roles' do
-      visit site_roles_path
-
-      within "#edit_user_#{another_user.id}" do
-        select 'admin', from: 'Roles'
-        click_on 'Save'
-      end
-
-      expect(another_user.reload).to have_role :admin, Site.instance
-    end
-  end
-end
diff --git a/spec/routing/roles_routing_spec.rb b/spec/routing/roles_routing_spec.rb
deleted file mode 100644
index 495b804f8..000000000
--- a/spec/routing/roles_routing_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe RolesController, type: :routing do
-  describe "routing" do
-    it "routes to #edit" do
-      expect(get: "/site/roles").to route_to("roles#index")
-    end
-    it "routes to #update via PUT" do
-      expect(put: "/site/roles/1").to route_to("roles#update", id: "1")
-    end
-
-    it "routes to #update via PATCH" do
-      expect(patch: "/site/roles/1").to route_to("roles#update", id: "1")
-    end
-  end
-end

From c78d7ad4428b2279e543d8321c86e763767a0050 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Wed, 20 Dec 2023 10:35:06 -0500
Subject: [PATCH 104/126] Remove stanford importer

Importer was deprecated in prior release version.
---
 .dockerignore                                 |   1 -
 README.md                                     |   2 +-
 app/jobs/import_work_from_purl_job.rb         |  97 ------
 bin/extract_mods_to_spreadsheet               |  73 ----
 bin/import_from_csv                           |  50 ---
 bin/import_from_purl                          |  65 ----
 bin/import_mods_files                         |  59 ----
 lib/importer.rb                               |  11 -
 lib/importer/csv_importer.rb                  |  53 ---
 lib/importer/csv_parser.rb                    | 154 ---------
 lib/importer/factory.rb                       |  21 --
 lib/importer/factory/collection_factory.rb    |  25 --
 lib/importer/factory/etd_factory.rb           |  18 -
 lib/importer/factory/image_factory.rb         |  18 -
 lib/importer/factory/object_factory.rb        | 159 ---------
 .../factory/string_literal_processor.rb       |  26 --
 .../factory/with_associated_collection.rb     |  29 --
 lib/importer/log_subscriber.rb                |  39 ---
 lib/importer/mods_importer.rb                 |  46 ---
 lib/importer/mods_parser.rb                   | 313 ------------------
 lib/stanford.rb                               |   6 -
 lib/stanford/importer.rb                      |  10 -
 lib/stanford/importer/mods_parser.rb          |  43 ---
 lib/stanford/importer/purl_parser.rb          | 176 ----------
 lib/stanford/importer/purl_retriever.rb       |  32 --
 .../fixtures/mods/shpc/druid_xv169dn4538.mods |  46 ---
 spec/fixtures/mods/shpc/kx532cb7981.mods      |  94 ------
 spec/fixtures/purl/bc390xk2647.xml            |  62 ----
 spec/jobs/import_work_from_purl_job_spec.rb   | 153 ---------
 spec/lib/importer/csv_importer_spec.rb        |  46 ---
 spec/lib/importer/csv_parser_spec.rb          |  85 -----
 spec/lib/importer/factory/etd_factory_spec.rb |  36 --
 .../importer/factory/image_factory_spec.rb    |  36 --
 .../factory/string_literal_processor_spec.rb  |  38 ---
 spec/lib/importer/mods_importer_spec.rb       |  79 -----
 spec/lib/importer/mods_parser_spec.rb         | 238 -------------
 .../lib/stanford/importer/mods_parser_spec.rb |  29 --
 .../lib/stanford/importer/purl_parser_spec.rb |  22 --
 .../shared_examples_for_csv_importer.rb       |  67 ----
 39 files changed, 1 insertion(+), 2556 deletions(-)
 delete mode 100644 app/jobs/import_work_from_purl_job.rb
 delete mode 100755 bin/extract_mods_to_spreadsheet
 delete mode 100755 bin/import_from_csv
 delete mode 100755 bin/import_from_purl
 delete mode 100755 bin/import_mods_files
 delete mode 100644 lib/importer.rb
 delete mode 100644 lib/importer/csv_importer.rb
 delete mode 100644 lib/importer/csv_parser.rb
 delete mode 100644 lib/importer/factory.rb
 delete mode 100644 lib/importer/factory/collection_factory.rb
 delete mode 100644 lib/importer/factory/etd_factory.rb
 delete mode 100644 lib/importer/factory/image_factory.rb
 delete mode 100644 lib/importer/factory/object_factory.rb
 delete mode 100644 lib/importer/factory/string_literal_processor.rb
 delete mode 100644 lib/importer/factory/with_associated_collection.rb
 delete mode 100644 lib/importer/log_subscriber.rb
 delete mode 100644 lib/importer/mods_importer.rb
 delete mode 100644 lib/importer/mods_parser.rb
 delete mode 100644 lib/stanford.rb
 delete mode 100644 lib/stanford/importer.rb
 delete mode 100644 lib/stanford/importer/mods_parser.rb
 delete mode 100644 lib/stanford/importer/purl_parser.rb
 delete mode 100644 lib/stanford/importer/purl_retriever.rb
 delete mode 100644 spec/fixtures/mods/shpc/druid_xv169dn4538.mods
 delete mode 100644 spec/fixtures/mods/shpc/kx532cb7981.mods
 delete mode 100644 spec/fixtures/purl/bc390xk2647.xml
 delete mode 100644 spec/jobs/import_work_from_purl_job_spec.rb
 delete mode 100644 spec/lib/importer/csv_importer_spec.rb
 delete mode 100644 spec/lib/importer/csv_parser_spec.rb
 delete mode 100644 spec/lib/importer/factory/etd_factory_spec.rb
 delete mode 100644 spec/lib/importer/factory/image_factory_spec.rb
 delete mode 100644 spec/lib/importer/factory/string_literal_processor_spec.rb
 delete mode 100644 spec/lib/importer/mods_importer_spec.rb
 delete mode 100644 spec/lib/importer/mods_parser_spec.rb
 delete mode 100644 spec/lib/stanford/importer/mods_parser_spec.rb
 delete mode 100644 spec/lib/stanford/importer/purl_parser_spec.rb
 delete mode 100644 spec/support/shared_examples_for_csv_importer.rb

diff --git a/.dockerignore b/.dockerignore
index 45c1f98e1..e07a10c04 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,7 +4,6 @@
 ./coverage
 ./docker
 ./fcrepo
-./importer
 ./log
 ./pg
 ./public/assets
diff --git a/README.md b/README.md
index 1be23b504..d666a9f05 100644
--- a/README.md
+++ b/README.md
@@ -340,7 +340,7 @@ More info about configuring and using bulkrax can be found [here](https://github
 
 ### Commandline Importers
 
-Importing from CSV and PURL directly can be done via Bulkrax and the built in code in Hyku is slated for deletion in the next release.
+Importing from CSV and PURL directly can be done via Bulkrax.
 
 ## Compatibility
 
diff --git a/app/jobs/import_work_from_purl_job.rb b/app/jobs/import_work_from_purl_job.rb
deleted file mode 100644
index efc5dc0e2..000000000
--- a/app/jobs/import_work_from_purl_job.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-require 'stanford'
-# Import works from Purl/stacks services at Stanford
-#
-# Example usage:
-#       log = Hyrax::Operation.create!(user: current_user,
-#                                      operation_type: "Import Purl Metadata")
-#       ImportWorkFromPurlJob.perform_later(current_user,
-#                                           'abcd1234xxxx',
-#                                           log)
-class ImportWorkFromPurlJob < ApplicationJob
-  queue_as :ingest
-
-  before_enqueue do |job|
-    log = job.arguments.last
-    log.pending_job(self)
-  end
-
-  # This copies metadata from the passed in attribute to all of the works that
-  # are members of the given upload set
-  # @param [User] user
-  # @param [String] druid
-  # @param [Hyrax::Operation] log
-  def perform(user, druid, log)
-    xml = Stanford::Importer::PurlRetriever.get(druid)
-    parser = Stanford::Importer::PurlParser.new(xml)
-    attributes = process_attributes(parser.attributes)
-    model = model_to_create(attributes)
-
-    CreateWorkJob.perform_later(user, model, attributes, log)
-  rescue Faraday::ResourceNotFound
-    Rails.logger.error "Unable to fetch #{druid} from purl."
-  end
-
-  private
-
-  def process_attributes(attributes)
-    # We're pruning off :form_of_work, :record_origin, :created_attributes, :identifiers
-    attributes = attributes.slice(*attributes_to_keep)
-    # rename :location to :based_near
-    attributes[:based_near] = attributes.delete(:location)
-
-    # rename :rights to :license
-    attributes[:license] = attributes.delete(:rights)
-
-    attributes[:collection][:collection_type] ||= Hyrax::CollectionType.find_or_create_default_collection_type
-
-    process_collection(attributes)
-    filenames = attributes.delete(:files)
-    attributes[:remote_files] = filenames.map do |name|
-      { url: "https://stacks.stanford.edu/file/druid:#{attributes[:id]}/#{name}",
-        file_name: name }
-    end
-
-    attributes
-  end
-
-  class_attribute :attributes_to_keep
-  self.attributes_to_keep = %i[title
-                               description
-                               subject
-                               language
-                               resource_type
-                               location
-                               rights
-                               visibility
-                               id
-                               collection
-                               files
-                               collection_type]
-
-  def process_collection(attributes)
-    # rename :collection to :member_of_collection_attributes
-    collection = attributes.delete(:collection)
-
-    # Workaround for ActiveFedora #1186
-    id = collection[:id]
-    begin
-      retries ||= 0
-      Collection.create!(collection) unless Collection.exists?(id)
-    rescue Ldp::Conflict => e
-      ## Another process has likely beat us to the punch. Wait a bit and try again.
-      sleep(3)
-      retry if (retries += 1) < 3
-      raise e
-    end
-    attributes[:member_of_collection_attributes] = [{ id: }]
-  end
-
-  # Override this method if you have a different rubric for choosing the model
-  # @param [Hash] attributes
-  # @return String the model to create
-  def model_to_create(_attributes)
-    GenericWork.model_name.name
-  end
-end
diff --git a/bin/extract_mods_to_spreadsheet b/bin/extract_mods_to_spreadsheet
deleted file mode 100755
index 7998f57e8..000000000
--- a/bin/extract_mods_to_spreadsheet
+++ /dev/null
@@ -1,73 +0,0 @@
-# frozen_string_literal: true
-
-#!/usr/bin/env ruby
-
-# this script is intented to produce a sample spreadsheet from
-# Stanford provided bagit bags that happen to contain MODS files.
-# The directory should contain the druid in the form:
-#   'base_path/druid_wg827ks1643/**/descMetadata.xml'
-#
-# Usage example:
-#   ./bin/extract_mods_to_spreadsheet ../hyku-bags/ out.csv
-
-base_path = ARGV[0]
-output_path = ARGV[1]
-unless base_path
-  $stderr.puts "Provide a base_path"
-  exit(1)
-end
-
-unless output_path
-  $stderr.puts "Provide an output file name"
-  exit(1)
-end
-
-puts 'Loading environment...'
-require File.expand_path('../../config/environment', __FILE__)
-require 'importer'
-puts 'Starting import...'
-
-# Assumption: filename will contain the druid.  Example:
-#   hyku-metadata/GSE/druid_wg827ks1643/data/metadata/descMetadata.xml
-data = Dir.glob("#{base_path}/**/descMetadata.xml").map do |filename|
-  id = filename.gsub(%r{.*/druid_(\w+)/.*}, '\1')
-  { id: [id], type: ['ETD'] }.merge(Importer::ModsParser.new(filename).attributes)
-end
-
-# Process the contributor into a flat field and drop 'notes_attributes' and 'collection'
-data.each do |record|
-  record[:contributor] = record[:contributor].flat_map { |c| c[:name] }
-  record[:date_created] = record.delete(:created_attributes).flat_map { |c| c[:start] }
-  record[:file] = [nil]
-  record.delete(:notes_attributes)
-  record.delete(:citation)
-  record.delete(:record_origin)
-  record.delete(:institution)
-  record.delete(:collection) # our data doesn't have collection in it.
-end
-
-headers = data.map do |record|
-  record.each_with_object({}) { |(k, v), o| o[k] = v.count }
-end
-
-uniq_headers = headers.map(&:keys).flatten.uniq
-
-# How many columns does each field take up. Look for the widest one.
-cols_for_attribute = uniq_headers.index_with do |k|
-  headers.map { |header| header[k] }.max
-end
-
-# Discard fields that aren't used.
-used_fields = cols_for_attribute.select { |k, width| width > 0 || k == :file }.keys
-
-CSV.open(output_path, "wb") do |csv|
-  csv << used_fields.map { |k| Array.new(cols_for_attribute[k]) { k } }.flatten.map(&:to_s)
-  data.each do |record|
-    derp = used_fields.flat_map do |k|
-      record[k] + Array.new(cols_for_attribute[k] - record[k].length) { nil }
-    end
-    csv << derp
-  end
-end
-
-puts 'import complete.'
diff --git a/bin/import_from_csv b/bin/import_from_csv
deleted file mode 100755
index fb4faf3a0..000000000
--- a/bin/import_from_csv
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def validate_hostname!(hostname)
-  return if hostname
-  usage
-  $stderr.puts 'Please provide the hostname to import to.'
-  exit(1)
-end
-
-def validate_csv_file!(csv_file)
-  return if csv_file && File.exist?(csv_file)
-  usage
-  $stderr.puts 'Please provide a metadata file to import.'
-  exit(1)
-end
-
-def validate_files_directory!(files_directory)
-  return if files_directory
-  $stderr.puts 'Files directory was left blank. No files will be ingested'
-end
-
-def load_rails
-  puts 'Loading environment...'
-  require File.expand_path('../../config/environment', __FILE__)
-  require 'importer'
-  puts 'Starting import...'
-end
-
-def main(hostname, csv_file, files_directory)
-  validate_hostname!(hostname)
-  validate_csv_file!(csv_file)
-  validate_files_directory!(files_directory)
-  load_rails
-
-  AccountElevator.switch!(hostname)
-  size = Importer::CSVImporter.new(csv_file, files_directory).import_all
-
-  puts "Imported #{size} records."
-end
-
-def logger
-  Rails.logger
-end
-
-def usage
-  $stderr.puts "Usage: #{$PROGRAM_NAME} <hostname> <csv file> <files directory>"
-end
-
-main(ARGV[0], ARGV[1], ARGV[2])
diff --git a/bin/import_from_purl b/bin/import_from_purl
deleted file mode 100755
index 4e0c00463..000000000
--- a/bin/import_from_purl
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def validate_hostname!(hostname)
-  return if hostname
-  usage
-  $stderr.puts 'Please provide the hostname to import to.'
-  exit(1)
-end
-
-def validate_druid_file!(druid_file)
-  return if druid_file && File.exist?(druid_file)
-  usage
-  $stderr.puts 'Please provide a file of druids you want to import.'
-  exit(1)
-end
-
-def validate_username!(username)
-  user = User.find_by_user_key(username)
-  return user if user
-  usage
-  $stderr.puts 'username was left blank.'
-  exit(1)
-end
-
-def load_rails(hostname)
-  puts 'Loading environment...'
-  require File.expand_path('../../config/environment', __FILE__)
-  require 'stanford'
-  AccountElevator.switch!(hostname)
-end
-
-def main(hostname, username, druid_file)
-  validate_hostname!(hostname)
-  validate_druid_file!(druid_file)
-  load_rails(hostname)
-  user = validate_username!(username)
-
-  count = druids(druid_file) do |druid|
-    log = Hyrax::Operation.create!(user: user, operation_type: "Import Purl Metadata")
-    ImportWorkFromPurlJob.perform_later(user, druid, log)
-  end
-
-  puts "Enqueued #{count} import jobs."
-end
-
-def druids(druid_file)
-  count = 0
-  File.foreach(druid_file) do |line|
-    # Split in two parts on the first comma
-    (element,) = line.split(/,/, 2)
-    # remove any namespacing
-    if md = /(druid:)?(.*)/.match(element)
-      yield(md[2])
-      count += 1
-    end
-  end
-  count
-end
-
-def usage
-  $stderr.puts "Usage: #{$PROGRAM_NAME} <hostname> <username> <file of druids>"
-end
-
-main(ARGV[0], ARGV[1], ARGV[2])
diff --git a/bin/import_mods_files b/bin/import_mods_files
deleted file mode 100755
index dd8cacdfa..000000000
--- a/bin/import_mods_files
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-def validate_hostname!(hostname)
-  return if hostname
-  usage
-  $stderr.puts 'Please provide the hostname to import to.'
-  exit(1)
-end
-
-def validate_mods_directory!(mods_directory)
-  if mods_directory
-    unless File.exist?(mods_directory)
-      $stderr.puts "Directory doesn't exist #{mods_directory}"
-      exit(1)
-    end
-
-    unless File.directory?(mods_directory)
-      $stderr.puts "#{mods_directory} is not a directory"
-      exit(1)
-    end
-  else
-    usage
-    $stderr.puts 'Please provide the a file path you want to import.'
-    exit(1)
-  end
-end
-
-def validate_imagepath!(imagepath)
-  return if imagepath
-  usage
-  $stderr.puts 'Image directory was left blank. No images will be ingested'
-  exit(1)
-end
-
-def load_rails
-  puts 'Loading environment...'
-  require File.expand_path('../../config/environment', __FILE__)
-  require 'importer'
-  puts 'Starting import...'
-end
-
-def main(hostname, mods_directory, imagepath)
-  validate_hostname!(hostname)
-  validate_mods_directory!(mods_directory)
-  validate_imagepath!(imagepath)
-  load_rails
-
-  AccountElevator.switch!(hostname)
-  size = Importer::ModsImporter.new(imagepath, mods_directory).import_all
-
-  puts "Imported #{size} records."
-end
-
-def usage
-  $stderr.puts "Usage: #{$PROGRAM_NAME} <hostname> <mods_directory> <image directory>"
-end
-
-main(ARGV[0], ARGV[1], ARGV[2])
diff --git a/lib/importer.rb b/lib/importer.rb
deleted file mode 100644
index ec136154c..000000000
--- a/lib/importer.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  extend ActiveSupport::Autoload
-  autoload :AttachFiles
-  autoload :CSVImporter
-  autoload :CSVParser
-  autoload :ModsImporter
-  autoload :ModsParser
-  autoload :Factory
-end
diff --git a/lib/importer/csv_importer.rb b/lib/importer/csv_importer.rb
deleted file mode 100644
index 97ae96aae..000000000
--- a/lib/importer/csv_importer.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  # Import a csv file with one work per row. The first row of the csv should be a
-  # header row. The model for each row can either be specified in a column called
-  # 'type' or globally by passing the model attribute
-  class CSVImporter
-    # @param [String] metadata_file path to CSV file
-    # @param [String] files_directory path, passed to factory constructor
-    # @param [#to_s, Class] model if Class, the factory class to be invoked per row.
-    # Otherwise, the stringable first (Xxx) portion of an "XxxFactory" constant.
-    def initialize(metadata_file, files_directory, model = nil)
-      @metadata_file = metadata_file
-      @files_directory = files_directory
-      @model = model
-    end
-
-    # @return [Integer] count of objects created
-    def import_all
-      count = 0
-      parser.each do |attributes|
-        create_fedora_objects(attributes)
-        count += 1
-      end
-      count
-    end
-
-    private
-
-    def parser
-      CSVParser.new(@metadata_file)
-    end
-
-    # @return [Class] the model class to be used
-    def factory_class(model)
-      return model if model.is_a?(Class)
-      if model.empty?
-        warn 'ERROR: No model was specified'
-        exit(1) # rubocop:disable Rails/Exit
-      end
-      return Factory.for(model.to_s) if model.respond_to?(:to_s)
-      raise "Unrecognized model type: #{model.class}"
-    end
-
-    # Build a factory to create the objects in fedora.
-    # @param [Hash<Symbol => String>] attributes
-    # @option attributes [String] :type overrides model for a single object
-    # @note remaining attributes are passed to factory constructor
-    def create_fedora_objects(attributes)
-      factory_class(attributes.delete(:type) || @model).new(attributes, @files_directory).run
-    end
-  end
-end
diff --git a/lib/importer/csv_parser.rb b/lib/importer/csv_parser.rb
deleted file mode 100644
index b992d3ab5..000000000
--- a/lib/importer/csv_parser.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  # rubocop:disable Metrics/ClassLength
-  class CSVParser
-    include Enumerable
-
-    def initialize(file_name)
-      @file_name = file_name
-    end
-
-    # @yieldparam attributes [Hash] the attributes from one row of the file
-    def each(&_block)
-      headers = nil
-      CSV.foreach(@file_name) do |row|
-        if headers
-          # we already have headers, so this is not the first row.
-          yield attributes(headers, row)
-        else
-          # Grab headers from first row
-          headers = validate_headers(row)
-        end
-      end
-    end
-
-    private
-
-    # Match headers like "lc_subject_type"
-    def type_header_pattern
-      /\A.*_type\Z/
-    end
-
-    def validate_headers(row)
-      row.compact!
-      difference = (row - valid_headers)
-
-      # Allow headers with the pattern *_type to specify the
-      # record type for a local authority.
-      # e.g. For an author, author_type might be 'Person'.
-      difference.delete_if { |h| h.match(type_header_pattern) }
-
-      raise "Invalid headers: #{difference.join(', ')}" if difference.present?
-
-      validate_header_pairs(row)
-      row
-    end
-
-    # If you have a header like lc_subject_type, the next
-    # header must be the corresponding field (e.g. lc_subject)
-    def validate_header_pairs(row)
-      errors = []
-      row.each_with_index do |header, i|
-        next if header == 'resource_type'
-        next unless header.match(type_header_pattern)
-        next_header = row[i + 1]
-        field_name = header.gsub('_type', '')
-        errors << "Invalid headers: '#{header}' column must be immediately followed by '#{field_name}' column." if next_header != field_name
-      end
-      raise errors.join(', ') if errors.present?
-    end
-
-    def valid_headers
-      GenericWork.attribute_names + %w[id type file] + collection_headers
-    end
-
-    def collection_headers
-      %w[collection_id collection_title collection_accession_number]
-    end
-
-    def attributes(headers, row)
-      {}.tap do |processed|
-        headers.each_with_index do |header, index|
-          extract_field(header, row[index], processed)
-        end
-      end
-    end
-
-    # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
-    def extract_field(header, val, processed)
-      return unless val
-      case header
-      when 'type', 'id'
-        # type and id are singular
-        processed[header.to_sym] = val
-      when /^(created|issued|date_copyrighted|date_valid)_(.*)$/
-        key = "#{Regexp.last_match(1)}_attributes".to_sym
-        # TODO: this only handles one date of each type
-        processed[key] ||= [{}]
-        update_date(processed[key].first, Regexp.last_match(2), val)
-      when 'resource_type'
-        extract_multi_value_field(header, val, processed)
-      when type_header_pattern
-        update_typed_field(header, val, processed)
-      when /^contributor$/
-        update_contributor(header, val, processed)
-      when /^collection_(.*)$/
-        processed[:collection] ||= {}
-        update_collection(processed[:collection], Regexp.last_match(1), val)
-      else
-        last_entry = Array(processed[header.to_sym]).last
-        if last_entry.is_a?(Hash) && !last_entry[:name]
-          update_typed_field(header, val, processed)
-        else
-          extract_multi_value_field(header, val, processed)
-        end
-      end
-    end
-    # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity
-
-    # Faking a typed field for now.
-    # TODO: support other types of contributors
-    def update_contributor(header, val, processed)
-      key = header.to_sym
-      processed[key] ||= []
-      processed[key] << { name: [val.strip] }
-    end
-
-    def extract_multi_value_field(header, val, processed, key = nil)
-      key ||= header.to_sym
-      processed[key] ||= []
-      val = val.strip
-      # Workaround for https://jira.duraspace.org/browse/FCREPO-2038
-      val.delete!("\r")
-      processed[key] << (looks_like_uri?(val) ? RDF::URI(val) : val)
-    end
-
-    def looks_like_uri?(str)
-      str =~ %r{^https?://}
-    end
-
-    # Fields that have an associated *_type column
-    def update_typed_field(header, val, processed)
-      if header.match(type_header_pattern)
-        stripped_header = header.gsub('_type', '')
-        processed[stripped_header.to_sym] ||= []
-        processed[stripped_header.to_sym] << { type: val }
-      else
-        fields = Array(processed[header.to_sym])
-        fields.last[:name] = val
-      end
-    end
-
-    def update_collection(collection, field, val)
-      val = [val] unless %w[admin_policy_id id].include? field
-      collection[field.to_sym] = val
-    end
-
-    def update_date(date, field, val)
-      date[field.to_sym] ||= []
-      date[field.to_sym] << val
-    end
-  end
-  # rubocop:enable Metrics/ClassLength
-end
diff --git a/lib/importer/factory.rb b/lib/importer/factory.rb
deleted file mode 100644
index 43444c0fc..000000000
--- a/lib/importer/factory.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  module Factory
-    extend ActiveSupport::Autoload
-
-    eager_autoload do
-      autoload :CollectionFactory
-      autoload :ETDFactory
-      autoload :ImageFactory
-      autoload :ObjectFactory
-      autoload :StringLiteralProcessor
-      autoload :WithAssociatedCollection
-    end
-
-    # @param [#to_s] First (Xxx) portion of an "XxxFactory" constant
-    def self.for(model_name)
-      const_get "#{model_name}Factory"
-    end
-  end
-end
diff --git a/lib/importer/factory/collection_factory.rb b/lib/importer/factory/collection_factory.rb
deleted file mode 100644
index d3c8ebf33..000000000
--- a/lib/importer/factory/collection_factory.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  module Factory
-    class CollectionFactory < ObjectFactory
-      self.klass = Collection
-      self.system_identifier_field = :identifier
-
-      def find_or_create
-        collection = find
-        return collection if collection
-        run(&:save!)
-      end
-
-      def update
-        raise "Collection doesn't exist" unless object
-        object.attributes = update
-        run_callbacks(:save) do
-          object.save!
-        end
-        log_updated(object)
-      end
-    end
-  end
-end
diff --git a/lib/importer/factory/etd_factory.rb b/lib/importer/factory/etd_factory.rb
deleted file mode 100644
index bd06eb235..000000000
--- a/lib/importer/factory/etd_factory.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  module Factory
-    class ETDFactory < ObjectFactory
-      include WithAssociatedCollection
-
-      self.klass = GenericWork
-      # A way to identify objects that are not Hydra minted identifiers
-      self.system_identifier_field = :identifier
-
-      # TODO: add resource type?
-      # def create_attributes
-      #   #super.merge(resource_type: 'ETD')
-      # end
-    end
-  end
-end
diff --git a/lib/importer/factory/image_factory.rb b/lib/importer/factory/image_factory.rb
deleted file mode 100644
index e03a73d61..000000000
--- a/lib/importer/factory/image_factory.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  module Factory
-    class ImageFactory < ObjectFactory
-      include WithAssociatedCollection
-
-      self.klass = Image
-      # A way to identify objects that are not Hydra minted identifiers
-      self.system_identifier_field = :identifier
-
-      # TODO: add resource type?
-      # def create_attributes
-      #   #super.merge(resource_type: 'Image')
-      # end
-    end
-  end
-end
diff --git a/lib/importer/factory/object_factory.rb b/lib/importer/factory/object_factory.rb
deleted file mode 100644
index aae8c1b3f..000000000
--- a/lib/importer/factory/object_factory.rb
+++ /dev/null
@@ -1,159 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer/log_subscriber'
-module Importer
-  module Factory
-    # rubocop:disable Metrics/ClassLength
-    class ObjectFactory
-      extend ActiveModel::Callbacks
-      define_model_callbacks :save, :create
-      class_attribute :klass, :system_identifier_field
-      attr_reader :attributes, :files_directory, :object, :files
-
-      def initialize(attributes, files_dir = nil, files = [])
-        @attributes = attributes
-        @files_directory = files_dir
-        @files = files
-      end
-
-      def run
-        arg_hash = { id: attributes[:id], name: 'UPDATE', klass: }
-        @object = find
-        if @object
-          ActiveSupport::Notifications.instrument('import.importer', arg_hash) { update }
-        else
-          ActiveSupport::Notifications.instrument('import.importer', arg_hash.merge(name: 'CREATE')) { create }
-        end
-        yield(object) if block_given?
-        object
-      end
-
-      def update
-        raise "Object doesn't exist" unless object
-        run_callbacks(:save) do
-          work_actor.update(environment(update))
-        end
-        log_updated(object)
-      end
-
-      def create_attributes
-        if klass == Collection
-          { collection_type: }.merge(transform_attributes)
-        else
-          transform_attributes
-        end
-      end
-
-      def update_attributes
-        transform_attributes.except(:id)
-      end
-
-      def find
-        return find_by_id if attributes[:id]
-        return search_by_identifier if attributes[system_identifier_field].present?
-        raise "Missing identifier: Unable to search for existing object without " \
-          "either fedora ID or #{system_identifier_field}"
-      end
-
-      def find_by_id
-        klass.find(attributes[:id]) if klass.exists?(attributes[:id])
-      end
-
-      def search_by_identifier
-        query = { "#{system_identifier_field}_ssim" =>
-                    attributes[system_identifier_field] }
-        klass.where(query).first
-      end
-
-      def collection_type
-        @collection_type ||= Hyrax::CollectionType.find_or_create_default_collection_type
-      end
-
-      # An ActiveFedora bug when there are many habtm <-> has_many associations means they won't all get saved.
-      # https://github.com/projecthydra/active_fedora/issues/874
-      # 2+ years later, still open!
-      def create
-        attrs = create_attributes
-        @object = klass.new
-        run_callbacks :save do
-          run_callbacks :create do
-            klass == Collection ? create_collection(attrs) : work_actor.create(environment(attrs))
-          end
-        end
-        log_created(object)
-      end
-
-      def log_created(obj)
-        msg = "Created #{klass.model_name.human} #{obj.id}"
-        Rails.logger.info("#{msg} (#{Array(attributes[system_identifier_field]).first})")
-      end
-
-      def log_updated(obj)
-        msg = "Updated #{klass.model_name.human} #{obj.id}"
-        Rails.logger.info("#{msg} (#{Array(attributes[system_identifier_field]).first})")
-      end
-
-      private
-
-      # @param [Hash] attrs the attributes to put in the environment
-      # @return [Hyrax::Actors::Environment]
-      def environment(attrs)
-        Hyrax::Actors::Environment.new(@object, Ability.new(User.batch_user), attrs)
-      end
-
-      def work_actor
-        Hyrax::CurationConcern.actor
-      end
-
-      def create_collection(attrs)
-        @object.attributes = attrs
-        @object.apply_depositor_metadata(User.batch_user)
-        @object.save!
-      end
-
-      # Override if we need to map the attributes from the parser in
-      # a way that is compatible with how the factory needs them.
-      def transform_attributes
-        StringLiteralProcessor.process(attributes.slice(*permitted_attributes))
-                              .merge(file_attributes)
-      end
-
-      # Find existing file or upload new file. This assumes a Work will have unique file titles;
-      # could filter by URIs instead (slower).
-      # When an uploaded_file already exists we do not want to pass its id in `file_attributes`
-      # otherwise it gets reuploaded by `work_actor`.
-      def upload_ids
-        work_files_titles = object.file_sets.map(&:title) if object.present? && object.file_sets.present?
-        work_files_titles&.include?(attributes[:file]) ? [] : [import_file(file_paths.first)]
-      end
-
-      def file_attributes
-        hash = {}
-        hash[:uploaded_files] = upload_ids if files_directory.present? && attributes[:file].present?
-        hash[:remote_files] = attributes[:remote_files] if attributes[:remote_files].present?
-        hash
-      end
-
-      def file_paths
-        attributes[:file]&.map { |file_name| File.join(files_directory, file_name) }
-      end
-
-      def import_file(path)
-        u = Hyrax::UploadedFile.new
-        u.user_id = User.find_by_user_key(User.batch_user_key).id if User.find_by_user_key(User.batch_user_key)
-        u.file = CarrierWave::SanitizedFile.new(path)
-        u.save
-        u.id
-      end
-
-      ## TO DO: handle invalid file in CSV
-      ## currently the importer stops if no file corresponding to a given file_name is found
-
-      # Regardless of what the MODS Parser gives us, these are the properties we are prepared to accept.
-      def permitted_attributes
-        klass.properties.keys.map(&:to_sym) + %i[id edit_users edit_groups read_groups visibility]
-      end
-    end
-    # rubocop:enable Metrics/ClassLength
-  end
-end
diff --git a/lib/importer/factory/string_literal_processor.rb b/lib/importer/factory/string_literal_processor.rb
deleted file mode 100644
index 27b49d4e0..000000000
--- a/lib/importer/factory/string_literal_processor.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  module Factory
-    # Transform the attributes from the parser into basic string literals.
-    # An alternative processor may choose to find or create linked entities
-    class StringLiteralProcessor
-      # @param [Hash] attributes the input from the parser
-      # @return [Hash] a duplicate with the structured data converted to literals
-      # @example:
-      #   process(contributor: [{ name: ["Muybridge"], type: "corporate" }])
-      #   # => { contributor: ["Muybridge"] }
-      def self.process(attributes)
-        attributes.merge(contributors(attributes))
-      end
-
-      # @param [Hash] attributes input data
-      # @return [Hash] transformed contributor data
-      def self.contributors(attributes)
-        value = attributes[:contributor]
-        return {} unless value
-        { contributor: value.map { |c| c[:name].join(' — ') } }
-      end
-    end
-  end
-end
diff --git a/lib/importer/factory/with_associated_collection.rb b/lib/importer/factory/with_associated_collection.rb
deleted file mode 100644
index fe9c1f4c5..000000000
--- a/lib/importer/factory/with_associated_collection.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  module Factory
-    module WithAssociatedCollection
-      extend ActiveSupport::Concern
-
-      # Strip out the :collection key, and add the member_of_collection_ids,
-      # which is used by Hyrax::Actors::AddAsMemberOfCollectionsActor
-      def create_attributes
-        return super if attributes[:collection].nil?
-        super.except(:collection).merge(member_of_collection_attributes: [id: collection.id])
-      end
-
-      # Strip out the :collection key, and add the member_of_collection_ids,
-      # which is used by Hyrax::Actors::AddAsMemberOfCollectionsActor
-      def update_attributes
-        return super if attributes[:collection].nil?
-        super.except(:collection).merge(member_of_collection_attributes: [id: collection.id])
-      end
-
-      private
-
-      def collection
-        CollectionFactory.new(attributes.fetch(:collection)).find_or_create
-      end
-    end
-  end
-end
diff --git a/lib/importer/log_subscriber.rb b/lib/importer/log_subscriber.rb
deleted file mode 100644
index 215fe1889..000000000
--- a/lib/importer/log_subscriber.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  class LogSubscriber < ActiveSupport::LogSubscriber
-    def initialize
-      super
-      @odd = false
-    end
-
-    def import(event)
-      return unless logger.debug?
-
-      payload = event.payload
-
-      name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
-      id    = payload[:id] || '[no id]'
-      klass = payload[:klass]
-
-      if odd?
-        name = color(name, CYAN, true)
-        id = color(id, nil, true)
-      else
-        name = color(name, MAGENTA, true)
-      end
-
-      debug "  #{name} #{klass} #{id}"
-    end
-
-    def odd?
-      @odd = !@odd
-    end
-
-    def logger
-      ActiveFedora::Base.logger
-    end
-  end
-end
-
-Importer::LogSubscriber.attach_to :importer
diff --git a/lib/importer/mods_importer.rb b/lib/importer/mods_importer.rb
deleted file mode 100644
index 1e61b010b..000000000
--- a/lib/importer/mods_importer.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'stanford'
-module Importer
-  class ModsImporter
-    class_attribute :parser_class
-    self.parser_class = Stanford::Importer::ModsParser
-
-    def initialize(files_directory, metadata_directory = nil)
-      @files_directory = files_directory
-      @metadata_directory = metadata_directory
-    end
-
-    # @return [Fixnum] the count of imports
-    def import_all
-      count = 0
-      Dir.glob("#{@metadata_directory}/**/*").each do |filename|
-        next if File.directory?(filename)
-        import(filename)
-        count += 1
-      end
-      count
-    end
-
-    def import(file)
-      Rails.logger.info "Importing: #{file}"
-      parser = parser_class.new(file)
-      create_fedora_objects(parser.model, parser.attributes)
-    end
-
-    # Select a factory to create the objects in fedora.
-    # For example, if we are importing a MODS record for an
-    # image, the ModsParser will return an Image model, so
-    # we'll select the ImageFactory to create the fedora
-    # objects.
-    def create_fedora_objects(model, attributes)
-      Factory.for(model.to_s).new(attributes, @files_directory, files(attributes)).run
-    end
-
-    # @param [Hash] attributes the attribuutes from the parser
-    # @return [Array] a list of file names to import
-    def files(attributes)
-      attributes[:files]
-    end
-  end
-end
diff --git a/lib/importer/mods_parser.rb b/lib/importer/mods_parser.rb
deleted file mode 100644
index a3013d6ce..000000000
--- a/lib/importer/mods_parser.rb
+++ /dev/null
@@ -1,313 +0,0 @@
-# frozen_string_literal: true
-
-module Importer
-  # rubocop:disable Metrics/ClassLength
-  class ModsParser
-    NAMESPACES = { 'mods' => Mods::MODS_NS }.freeze
-
-    attr_reader :filename
-
-    def initialize(filename)
-      @filename = filename
-    end
-
-    def model
-      @model ||= if collection?
-                   Collection
-                 elsif image?
-                   'Image'
-                 else
-                   'ETD'
-                 end
-    end
-
-    def origin_text
-      'Converted from MODS 3.4 to local RDF profile by Hyku'
-    end
-
-    def mods
-      @mods ||= Mods::Record.new.from_file(filename)
-    end
-
-    def collection?
-      type_keys = mods.typeOfResource.attributes.map(&:keys).flatten
-      return false unless type_keys.include?('collection')
-      mods.typeOfResource.attributes.any? { |hash| hash.fetch('collection').value == 'yes' }
-    end
-
-    # For now the only things we import are collections and
-    # images, so if it's not a collection, assume it's an image.
-    # TODO:  Identify images or other record types based on
-    #        the data in <mods:typeOfResource>.
-    def image?
-      !collection?
-    end
-
-    def attributes
-      if model == Collection
-        collection_attributes
-      else
-        record_attributes
-      end
-    end
-
-    def record_attributes
-      common_attributes.merge(collection:, series_name:)
-                       .merge(files)
-    end
-
-    # @return [Hash] hash with a key :files, if there are any files.
-    def files
-      {}
-    end
-
-    def series_name
-      mods.xpath("//mods:relatedItem[@type='series']", NAMESPACES)
-          .titleInfo.title.map(&:text)
-    end
-
-    def collection_attributes
-      common_attributes
-    end
-
-    def common_attributes
-      description
-        .merge(dates)
-        .merge(locations)
-        .merge(rights)
-        .merge(identifiers)
-        .merge(relations)
-    end
-
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-    def description
-      {
-        title: untyped_title,
-        alternative: alt_title,
-        description: mods_description,
-        subject:,
-        extent: mods.physical_description.extent.map { |node| strip_whitespace(node.text) },
-        language:,
-        digital_origin: mods.physical_description.digitalOrigin.map(&:text),
-        publisher: mods.origin_info.publisher.map(&:text),
-        form_of_work: mods.genre.valueURI.map { |uri| RDF::URI.new(uri) },
-        resource_type:,
-        citation:,
-        notes_attributes: notes,
-        record_origin:,
-        description_standard: mods.record_info.descriptionStandard.map(&:text)
-      }
-    end
-    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
-
-    def language
-      mods.language.languageTerm.map do |term|
-        uris = term.valueURI.map { |uri| RDF::URI.new(uri) }
-        uris.presence || term.text
-      end
-    end
-
-    def resource_type
-      uris = mods.xpath('//mods:mods/mods:typeOfResource/@valueURI', NAMESPACES).map { |uri| RDF::URI.new(uri.value) }
-      return uris if uris.present?
-      Array.wrap(mods.typeOfResource.text)
-    end
-
-    def rights
-      query = '/mods:mods/mods:accessCondition[@type="use and reproduction"]'
-      {
-        restrictions: mods.xpath(query, NAMESPACES).map { |node| strip_whitespace(node.text) }
-      }
-    end
-
-    def locations
-      {
-        location: mods.subject.geographic.valueURI.map { |uri| RDF::URI.new(uri) },
-        sub_location:,
-        institution: institutional_location,
-        place_of_publication: mods.origin_info.place.placeTerm.map(&:text)
-      }.merge(coordinates)
-    end
-
-    def sub_location
-      query = './mods:copyInformation/mods:subLocation'
-      mods.location.holdingSimple.xpath(query, NAMESPACES).map(&:text)
-    end
-
-    def institutional_location
-      uris = mods.location.physicalLocation.valueURI.map { |uri| RDF::URI.new(uri) }
-      return uris if uris.present?
-      Array.wrap(mods.location.physicalLocation.text)
-    end
-
-    def dates
-      {
-        issued_attributes: build_date(mods.origin_info.dateIssued),
-        created_attributes: build_date(mods.origin_info.dateCreated),
-        date_other_attributes: build_date(mods.origin_info.dateOther),
-        date_copyrighted_attributes: build_date(mods.origin_info.copyrightDate),
-        date_valid_attributes: build_date(mods.origin_info.dateValid)
-      }
-    end
-
-    def identifiers
-      { accession_number: mods.identifier.map(&:text) }
-    end
-
-    def record_origin
-      ro = mods.record_info.recordOrigin.map { |node| prepend_timestamp(strip_whitespace(node.text)) }
-      ro << prepend_timestamp(origin_text)
-    end
-
-    # returns a hash with :latitude and :longitude
-    def coordinates
-      coords = mods.subject.cartographics.coordinates.map(&:text)
-      # a hash where any value defaults to an empty array
-      result = Hash.new { |h, k| h[k] = [] }
-      coords.each_with_object(result) do |coord, h|
-        (latitude, longitude) = coord.split(/,\s*/)
-        h[:latitude] << latitude
-        h[:longitude] << longitude
-      end
-    end
-
-    def mods_description
-      mods.abstract.map { |e| strip_whitespace(e.text) }
-    end
-
-    def relations
-      name_nodes = mods.xpath('//mods:mods/mods:name', NAMESPACES)
-      # TODO: do we want all sorts of relators?
-      # property_name_for_uri = Metadata::MARCREL.invert
-      name_nodes.each_with_object({}) do |node, relations|
-        # property = if value_uri = node.role.roleTerm.valueURI.first
-        #              property_name_for_uri[RDF::URI(value_uri)]
-        #            else
-        #              $stderr.puts "no role was specified for name #{node.namePart.text}"
-        #              :contributor
-        # end
-        property = :contributor
-        relations[property] ||= []
-        relations[property] << build_relation(node)
-      end
-    end
-
-    def build_relation(node)
-      uri = node.attributes['valueURI']
-      if uri.blank?
-        { name: node.namePart.map(&:text),
-          type: node.attributes['type'].value }
-      else
-        RDF::URI.new(uri)
-      end
-    end
-
-    def collection
-      {
-        identifier: collection_id,
-        title: collection_name
-      }
-    end
-
-    def collection_name
-      node_set = mods.at_xpath("//mods:relatedItem[@type='host']", NAMESPACES)
-      return unless node_set
-      [node_set.titleInfo.title.text.strip]
-    end
-
-    def collection_id
-      query = "//mods:relatedItem[@type='host']/mods:identifier[@type='uri']"
-      node_set = mods.at_xpath(query, NAMESPACES)
-      return [] unless node_set
-      Array.wrap(node_set.text)
-    end
-
-    # Remove multiple whitespace
-    def citation
-      mods.xpath('//mods:note[@type="preferred citation"]', NAMESPACES).map do |node|
-        node.text.gsub(/\n\s+/, "\n")
-      end
-    end
-
-    def notes
-      preferred_citation = 'preferred citation'
-      type = 'type'
-      mods.note.each_with_object([]) do |node, list|
-        next if node.attributes.key?(type) && node.attributes[type].value == preferred_citation
-        hash = { value: node.text.gsub(/\n\s+/, "\n") }
-        type_attr = node.attributes[type].try(:text)
-        hash[:note_type] = type_attr if type_attr
-        list << hash
-      end
-    end
-
-    private
-
-    def build_date(node)
-      finish = finish_point(node)
-      start = start_point(node)
-      dates = [{ start: start.map(&:text), finish: finish.map(&:text), label: date_label(node),
-                 start_qualifier: qualifier(start), finish_qualifier: qualifier(finish) }]
-      dates.delete_if { |date| date.values.all?(&:blank?) }
-      dates
-    end
-
-    def qualifier(nodes)
-      nodes.map { |node| node.attributes['qualifier'].try(:value) }.compact
-    end
-
-    def finish_point(node)
-      node.css('[point="end"]')
-    end
-
-    def start_point(node)
-      node.css("[encoding]:not([point='end'])")
-    end
-
-    def date_label(node)
-      node.css(':not([encoding])').map(&:text)
-    end
-
-    def untyped_title
-      mods.xpath('/mods:mods/mods:titleInfo[not(@type)]/mods:title', NAMESPACES).map(&:text)
-    end
-
-    def alt_title
-      Array(mods.xpath('//mods:titleInfo[@type]', NAMESPACES)).flat_map do |node|
-        type = node.attributes['type'].text
-        alternative = 'alternative'
-
-        node.title.map do |title|
-          value = title.text
-          warn_title_transform(type, value) unless type == alternative
-          value
-        end
-      end
-    end
-
-    def warn_title_tranform(type, value)
-      Rails.logger.warn "Transformtion: \"#{type} title\" will be stored as \"alternative title\": #{value}"
-    end
-
-    def prepend_timestamp(text)
-      "#{Time.now.utc.to_s(:iso8601)} #{text}"
-    end
-
-    def strip_whitespace(text)
-      text.tr("\n", ' ').delete("\t")
-    end
-
-    def subject
-      query = '//mods:subject/mods:name/@valueURI|//mods:subject/mods:topic/@valueURI'
-      uris = mods.xpath(query, NAMESPACES).map { |uri| RDF::URI.new(uri) }
-      return uris unless uris.empty?
-      mods.subject.map do |sub|
-        text = sub.css('name namePart').text
-        secondary = sub.css('topic,genre').text
-        text += " -- #{secondary}" if secondary.present?
-        text
-      end
-    end
-  end
-  # rubocop:enable Metrics/ClassLength
-end
diff --git a/lib/stanford.rb b/lib/stanford.rb
deleted file mode 100644
index aa6496000..000000000
--- a/lib/stanford.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Stanford
-  extend ActiveSupport::Autoload
-  autoload :Importer
-end
diff --git a/lib/stanford/importer.rb b/lib/stanford/importer.rb
deleted file mode 100644
index 7b0f55377..000000000
--- a/lib/stanford/importer.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Stanford
-  module Importer
-    extend ActiveSupport::Autoload
-    autoload :ModsParser
-    autoload :PurlParser
-    autoload :PurlRetriever
-  end
-end
diff --git a/lib/stanford/importer/mods_parser.rb b/lib/stanford/importer/mods_parser.rb
deleted file mode 100644
index d8ccff486..000000000
--- a/lib/stanford/importer/mods_parser.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Stanford
-  module Importer
-    # Encapsulate Stanford specific logic here.
-    # Specifically:
-    #  - MODS don't have encoded identifiers. Extract one from the filename.
-    class ModsParser < ::Importer::ModsParser
-      def collection_attributes
-        super.merge(identifier).merge(open_access)
-      end
-
-      def record_attributes
-        super.merge(identifier).merge(open_access)
-      end
-
-      # This gets the properties about a collection from a work.
-      # these are used to create a collection if one isn't found.
-      # Add the id column to the collection identifiers because
-      # we aren't using any external identifiers (the :identifier field)
-      def collection
-        col_attrs = super
-        col_attrs.merge(id: col_attrs[:identifier].first).merge(open_access)
-      end
-
-      # The collection_id is a purl.stanford.edu uri. We'll just take the path segment as the id.
-      def collection_id
-        super.map { |url| URI(url).path.sub('/', '') }
-      end
-
-      private
-
-      def identifier
-        id = File.basename(filename, '.mods').sub(/\Adruid_/, '')
-        { identifier: Array.wrap(id), id: }
-      end
-
-      def open_access
-        { visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
-      end
-    end
-  end
-end
diff --git a/lib/stanford/importer/purl_parser.rb b/lib/stanford/importer/purl_parser.rb
deleted file mode 100644
index b3e42511a..000000000
--- a/lib/stanford/importer/purl_parser.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-# frozen_string_literal: true
-
-module Stanford
-  module Importer
-    # rubocop:disable Metrics/ClassLength
-    class PurlParser
-      DC_NS = { 'dc' => 'http://purl.org/dc/elements/1.1/' }.freeze
-
-      attr_reader :xml
-
-      def initialize(xml_file)
-        @xml = Nokogiri::XML(xml_file)
-      end
-
-      def oai
-        @oai ||= xml.xpath('//oai_dc:dc', 'oai_dc' => "http://www.openarchives.org/OAI/2.0/oai_dc/")
-      end
-
-      def model
-        @model ||= if collection?
-                     Collection
-                   elsif image?
-                     'Image'
-                   else
-                     'ETD'
-                   end
-      end
-
-      def origin_text
-        'Imported from PURL to local RDF profile by Hyku'
-      end
-
-      def collection?
-        xml.xpath('//identityMetadata/objectType').any? { |c| c.text == 'collection' }
-      end
-
-      # For now the only things we import are collections and
-      # images, so if it's not a collection, assume it's an image.
-      def image?
-        !collection?
-      end
-
-      def attributes
-        if model == Collection
-          collection_attributes
-        else
-          record_attributes
-        end
-      end
-
-      def record_attributes
-        common_attributes.merge(collection:)
-                         .merge(files)
-      end
-
-      # @return [Hash] hash with a key :files, if there are any files.
-      def files
-        { files: xml.xpath('//contentMetadata/resource/file/@id').map(&:value) }
-      end
-
-      def collection_attributes
-        common_attributes
-      end
-
-      def common_attributes
-        description
-          .merge(dates)
-          .merge(locations)
-          .merge(rights)
-          .merge(visibility:)
-          .merge(identifiers)
-          .merge(relations)
-      end
-
-      def description
-        {
-          title: untyped_title,
-          description: dc_description,
-          subject:,
-          language:,
-          form_of_work: oai.xpath('./dc:format', DC_NS).map(&:text),
-          resource_type:,
-          record_origin:
-        }
-      end
-
-      def language
-        oai.xpath('./dc:language', DC_NS).map(&:text)
-      end
-
-      def resource_type
-        oai.xpath('./dc:type', DC_NS).map(&:text)
-      end
-
-      def rights
-        { rights: oai.xpath('./dc:rights', DC_NS).map(&:text) }
-      end
-
-      def visibility
-        return 'open' if xml.xpath('//rightsMetadata/access[@type="read"]/machine/world').present?
-        'restricted'
-      end
-
-      def depositor
-        xml.xpath('//identityMetadata/objectCreator').text
-      end
-
-      def locations
-        {
-          location:
-            oai.xpath('./dc:relation[@type="repository"]', DC_NS).map(&:text)
-        }
-      end
-
-      def dates
-        {
-          created_attributes: oai.xpath('./dc:format', DC_NS).map(&:text)
-        }
-      end
-
-      def identifiers
-        { identifiers: oai.xpath('./dc:identifier', DC_NS).map(&:text),
-          id: xml.xpath('//identityMetadata/objectId').text.sub('druid:', '') }
-      end
-
-      def record_origin
-        [prepend_timestamp(origin_text)]
-      end
-
-      def dc_description
-        oai.xpath('./dc:rights', DC_NS).map(&:text)
-      end
-
-      def relations
-        contributors = oai.xpath('./dc:contributor', DC_NS).map(&:text)
-        contributors.each_with_object({}) do |node, relations|
-          relations[:contributor] ||= []
-          relations[:contributor] << { name: [node] }
-        end
-      end
-
-      def collection
-        {
-          id: collection_id,
-          title: collection_name
-        }
-      end
-
-      def collection_name
-        oai.xpath('./dc:relation[@type="collection"]', DC_NS).map(&:text)
-      end
-
-      def collection_id
-        ns = { 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-               'fedora' => 'info:fedora/fedora-system:def/relations-external#' }
-        node_set = xml.xpath('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection/@rdf:resource', ns)
-        node_set.map { |n| n.value.sub('info:fedora/druid:', '') }.first
-      end
-
-      private
-
-      def untyped_title
-        oai.xpath('./dc:title', DC_NS).map(&:text)
-      end
-
-      def prepend_timestamp(text)
-        "#{Time.now.utc.to_s(:iso8601)} #{text}"
-      end
-
-      def subject
-        oai.xpath('./dc:subject', DC_NS).map(&:text)
-      end
-    end
-    # rubocop:enable Metrics/ClassLength
-  end
-end
diff --git a/lib/stanford/importer/purl_retriever.rb b/lib/stanford/importer/purl_retriever.rb
deleted file mode 100644
index 1ddf32b50..000000000
--- a/lib/stanford/importer/purl_retriever.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Stanford
-  module Importer
-    class PurlRetriever
-      def self.get(druid)
-        new(druid).get
-      end
-
-      def initialize(druid)
-        @druid = druid
-      end
-
-      def get
-        conn.get(path).body
-      end
-
-      private
-
-      def path
-        "/#{@druid}.xml"
-      end
-
-      def conn
-        @conn ||= Faraday.new(url: 'https://purl.stanford.edu') do |faraday|
-          faraday.adapter Faraday.default_adapter
-          faraday.use Faraday::Response::RaiseError # raise exceptions on 40x, 50x responses
-        end
-      end
-    end
-  end
-end
diff --git a/spec/fixtures/mods/shpc/druid_xv169dn4538.mods b/spec/fixtures/mods/shpc/druid_xv169dn4538.mods
deleted file mode 100644
index 230f2926a..000000000
--- a/spec/fixtures/mods/shpc/druid_xv169dn4538.mods
+++ /dev/null
@@ -1,46 +0,0 @@
-<mods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3" version="3.4" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd">
-  <titleInfo>
-    <title>Stanford residences -- Sacramento -- Muybridge</title>
-  </titleInfo>
-  <name type="corporate" authority="naf" authorityURI="http://id.loc.gov/authorities/names/no98095678">
-    <namePart>Muybridge</namePart>
-    <role>
-      <roleTerm type="text">photographer</roleTerm>
-    </role>
-  </name> 
-  <physicalDescription>
-    <form>black and white photographic print</form>
-    <internetMediaType>image/tiff</internetMediaType>
-    <note displayLabel="Dimensions">5 in. x 6 in.</note>
-  </physicalDescription>
-  <typeOfResource>still image</typeOfResource>
-  <language>
-    <languageTerm type="code" authority="iso639-2b">en</languageTerm>
-  </language>
-  <genre authority="ftamc">Photoprints.</genre>
-  <subject>
-    <topic>Stanford residences -- Sacramento -- Muybridge --</topic>
-    <topic>Lathrop, Anna Maria</topic>
-    <topic>Lathrop, Jane Shields</topic>
-    <topic>Stanford, Elizabeth Phillips</topic>
-    <topic>Stanford, Jane Lathrop</topic>
-    <topic>Stanford, Leland Jr.</topic>
-  </subject>
-  <location>
-    <physicalLocation type="repository">Stanford University. Libraries. Dept. of Special Collections &amp; University Archives.</physicalLocation> 
-  </location>
-  <relatedItem type="host">
-    <titleInfo>
-      <title>Stanford historical photograph collection, 1887-circa 1996</title>
-    </titleInfo>
-    <identifier type="uri">http://purl.stanford.edu/kx532cb7981</identifier> <!-- Grabed this from purl -->
-    <typeOfResource collection="yes"/>
-    <location>
-      <physicalLocation type="location">Series Stanford Family Photographs | Box 4 | Folder Stanford residences -- Sacramento -- Muybridge -- #4</physicalLocation>
-    </location>
-  </relatedItem>
-  <identifier type="local" displayLabel="University Archives Photo ID">8735.2</identifier>
-  <identifier type="local" displayLabel="Luna Object ID">15097</identifier>
-  <note>"Left to right: Anna Maria Lathrop, Mrs. Stanford's sister; Jane Shields Lathrop, Mrs. Stanford's mother; Elizabeth Phillips Stanford, Senator Stanford's mother; Jane Lathrop Stanford; Leland Stanford, Jr." and "from Muybridge glass negative, #17158 (13583), PC 6, Box 2" written on back.</note>
-  <accessCondition type="useAndReproduction">Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Special Collections Public Services Librarian at speccollref@stanford.edu</accessCondition>
-</mods>
diff --git a/spec/fixtures/mods/shpc/kx532cb7981.mods b/spec/fixtures/mods/shpc/kx532cb7981.mods
deleted file mode 100644
index 11fdc8f25..000000000
--- a/spec/fixtures/mods/shpc/kx532cb7981.mods
+++ /dev/null
@@ -1,94 +0,0 @@
-<mods xmlns="http://www.loc.gov/mods/v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.4" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-4.xsd">
-  <titleInfo>
-    <title>Stanford historical photograph collection, 1887-circa 1996 (inclusive)</title>
-  </titleInfo>
-  <name type="corporate">
-    <namePart>Stanford University</namePart>
-    <namePart>Archives.</namePart>
-  </name>
-  <typeOfResource collection="yes">still image</typeOfResource>
-  <genre authority="marcgt">graphic</genre>
-  <genre authority="ftamc">Photoprints.</genre>
-  <originInfo>
-    <place>
-      <placeTerm authority="marccountry" type="code">cau</placeTerm>
-    </place>
-    <dateIssued encoding="marc" point="start">1887</dateIssued>
-    <dateIssued encoding="marc" point="end">1996</dateIssued>
-    <issuance>monographic</issuance>
-  </originInfo>
-  <language>
-    <languageTerm authority="iso639-2b" type="code">eng</languageTerm>
-  </language>
-  <physicalDescription>
-    <form authority="marccategory">electronic resource</form>
-    <form authority="marcsmd">remote</form>
-    <extent>40 linear feet</extent>
-    <note type="arrangement">The photographs are arranged in five series: Series 1, General Photographs; Series 2, Stanford Family; Series 3, Biographical; Series 4, Oversize; and Series 5, Copy Negatives.</note>
-  </physicalDescription>
-  <abstract>The Stanford historical photograph collection, containing over 16,000 images. Series 1, General Photographs, documents the campus and campus life; subjects include athletics, original construction of the campus, individual buildings, students and student life activities, commencement activities, academic departments, and damage from the 1906 earthquake. Series 2, Stanford Family, contains photographs of family members and friends, Stanford residences, the Palo Alto Stock Farm, and the Central Pacific Railroad. Series 3, Biographical Photographs, contains images of faculty and administrative staff. Series 4 contains oversized images and Series 5 contains copy negatives. The majority of photographs are black and white gelatin prints but nineteenth-century albumen prints mounted on boards are also represented. The collection spans the late 1880s through the 1990s.</abstract>
-  <note altRepGroup="00" type="statement of responsibility"/>
-  <subject authority="lcsh">
-    <name type="corporate">
-      <namePart>Central Pacific Railroad Company.</namePart>
-    </name>
-  </subject>
-  <subject authority="lcsh">
-    <name type="corporate">
-      <namePart>Palo Alto Stock Farm.</namePart>
-    </name>
-  </subject>
-  <subject authority="lcsh">
-    <name type="corporate">
-      <namePart>Stanford University</namePart>
-    </name>
-    <topic>Sports</topic>
-  </subject>
-  <subject authority="lcsh">
-    <name type="corporate">
-      <namePart>Stanford University</namePart>
-    </name>
-    <topic>Buildings</topic>
-  </subject>
-  <subject authority="lcsh">
-    <name type="corporate">
-      <namePart>Stanford University</namePart>
-    </name>
-    <topic>Faculty</topic>
-  </subject>
-  <subject authority="lcsh">
-    <name type="corporate">
-      <namePart>Stanford University</namePart>
-    </name>
-    <genre>Photographs</genre>
-  </subject>
-  <subject authority="lcsh">
-    <name type="corporate">
-      <namePart>Stanford University</namePart>
-    </name>
-    <topic>Students</topic>
-  </subject>
-  <location>
-    <physicalLocation>Dept. of Special Collections &amp; University Archives Stanford Univeristy Libraries</physicalLocation>
-  </location>
-  <location>
-    <url displayLabel="electronic resource" note="Finding aid">http://www.oac.cdlib.org/findaid/ark:/13030/kt5c60381q</url>
-  </location>
-  <location>
-    <url displayLabel="electronic resource" usage="primary display">http://insight.stanford.edu/luna/servlet/Stanford~4~1</url>
-  </location>
-  <relatedItem>
-    <location>
-      <url note="Finding aid">http://www.oac.cdlib.org/findaid/ark:/13030/kt5c60381q</url>
-    </location>
-  </relatedItem>
-  <recordInfo>
-    <descriptionStandard>aacr</descriptionStandard>
-    <descriptionStandard>appm</descriptionStandard>
-    <recordContentSource authority="marcorg">CSt</recordContentSource>
-    <recordCreationDate encoding="marc">020412</recordCreationDate>
-    <recordChangeDate encoding="iso8601">20120609015725.0</recordChangeDate>
-    <recordIdentifier source="SIRSI">a4769498</recordIdentifier>
-    <recordOrigin>Converted from MARCXML to MODS version 3.4 using MARC21slim2MODS3-4_SDR.xsl (Version 1.2.5 2013/08/11)</recordOrigin>
-  </recordInfo>
-</mods>
diff --git a/spec/fixtures/purl/bc390xk2647.xml b/spec/fixtures/purl/bc390xk2647.xml
deleted file mode 100644
index c6fae3c56..000000000
--- a/spec/fixtures/purl/bc390xk2647.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<publicObject id="druid:bc390xk2647" published="2014-07-21T12:04:14-07:00">
-  <identityMetadata>
-    <sourceId source="Stanford Historical Photograph Collection">12415</sourceId>
-    <objectId>druid:bc390xk2647</objectId>
-    <objectCreator>DOR</objectCreator>
-    <objectLabel>Lake Lagunita</objectLabel>
-    <objectType>item</objectType>
-    <adminPolicy>druid:kz949yf0754</adminPolicy>
-    <otherId name="uuid">29164b40-9b88-11e2-bae9-0050569b52d5</otherId>
-    <tag>Project : Stanford Historical Photograph Collection</tag>
-    <tag>Remediated By : 3.23.0</tag>
-  </identityMetadata>
-  <contentMetadata type="image" objectId="bc390xk2647">
-    <resource type="image" sequence="1" id="bc390xk2647_1">
-      <label>Image 1</label>
-      <file id="00007845_005.jp2" mimetype="image/jp2" size="4487344">
-        <imageData width="4916" height="6209"/>
-      </file>
-    </resource>
-    <resource type="image" sequence="2" id="bc390xk2647_2">
-      <label>Image 2</label>
-      <file id="00007845_MASTER_005.jp2" mimetype="image/jp2" size="5356683">
-        <imageData width="5082" height="7015"/>
-      </file>
-    </resource>
-  </contentMetadata>
-  <rightsMetadata objectId="druid:kz949yf0754">
-    <access type="discover">
-      <machine>
-        <world/>
-      </machine>
-    </access>
-    <access type="read">
-      <machine>
-        <world/>
-      </machine>
-    </access>
-    <use>
-      <human type="useAndReproduction">Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Special Collections Public Services Librarian at speccollref@stanford.edu.</human>
-    </use>
-  </rightsMetadata>
-  <rdf:RDF xmlns:fedora="info:fedora/fedora-system:def/relations-external#" xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:hydra="http://projecthydra.org/ns/relations#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-    <rdf:Description rdf:about="info:fedora/druid:bc390xk2647">
-      <fedora:isMemberOf rdf:resource="info:fedora/druid:kx532cb7981"/>
-      <fedora:isMemberOfCollection rdf:resource="info:fedora/druid:kx532cb7981"/>
-    </rdf:Description>
-  </rdf:RDF>
-  <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:srw_dc="info:srw/schema/1/dc-schema" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-    <dc:title>Lake Lagunita</dc:title>
-    <dc:format>black and white photographic print</dc:format>
-    <dc:format>image/tiff</dc:format>
-    <dc:type>StillImage</dc:type>
-    <dc:language>en</dc:language>
-    <dc:type>Photoprints.</dc:type>
-    <dc:subject>Lake Lagunita</dc:subject>
-    <dc:relation type="repository">Stanford University. Libraries. Dept. of Special Collections &amp; University Archives.</dc:relation>
-    <dc:identifier>9650</dc:identifier>
-    <dc:identifier>12415</dc:identifier>
-    <dc:rights>Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Special Collections Public Services Librarian at speccollref@stanford.edu</dc:rights>
-    <dc:relation type="collection">Stanford historical photograph collection, 1887-circa 1996</dc:relation>
-  </oai_dc:dc>
-</publicObject>
diff --git a/spec/jobs/import_work_from_purl_job_spec.rb b/spec/jobs/import_work_from_purl_job_spec.rb
deleted file mode 100644
index 50b555185..000000000
--- a/spec/jobs/import_work_from_purl_job_spec.rb
+++ /dev/null
@@ -1,153 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ImportWorkFromPurlJob do
-  let(:user) { create(:user) }
-  let(:log) { Hyrax::Operation.create!(user:, operation_type: "Import Purl Metadata") }
-  let(:druid) { 'bc390xk2647' }
-  before do
-    stub_request(:get, "https://purl.stanford.edu/bc390xk2647.xml")
-      .to_return(status: 200, body: purl_xml)
-    ActiveFedora::Base.find(druid).destroy(eradicate: true) if ActiveFedora::Base.exists? druid
-    Hyrax::PermissionTemplate.create!(source_id: AdminSet::DEFAULT_ID)
-    # Don't call load_workflows until the PermissionTemplate has been created
-    Hyrax::Workflow::WorkflowImporter.load_workflows
-  end
-
-  let(:purl_xml) do
-    <<~EOF
-      <?xml version="1.0" encoding="UTF-8"?>
-      <publicObject id="druid:bc390xk2647" published="2016-11-16T20:44:34Z" publishVersion="dor-services/5.11.0">
-        <identityMetadata>
-          <sourceId source="Stanford Historical Photograph Collection">12415</sourceId>
-          <objectId>druid:bc390xk2647</objectId>
-          <objectCreator>DOR</objectCreator>
-          <objectLabel>Lake Lagunita</objectLabel>
-          <objectType>item</objectType>
-          <adminPolicy>druid:kz949yf0754</adminPolicy>
-          <otherId name="uuid">29164b40-9b88-11e2-bae9-0050569b52d5</otherId>
-          <tag>Project : Stanford Historical Photograph Collection</tag>
-          <tag>Remediated By : 5.10.1</tag>
-        </identityMetadata>
-        <contentMetadata type="image" objectId="bc390xk2647">
-          <resource type="image" sequence="1" id="bc390xk2647_1">
-            <label>Image 1</label>
-            <file id="00007845_005.jp2" mimetype="image/jp2" size="4487344">
-              <imageData width="4916" height="6209"/>
-            </file>
-          </resource>
-          <resource type="image" sequence="2" id="bc390xk2647_2">
-            <label>Image 2</label>
-            <file id="00007845_MASTER_005.jp2" mimetype="image/jp2" size="5356683">
-              <imageData width="5082" height="7015"/>
-            </file>
-          </resource>
-        </contentMetadata>
-        <rightsMetadata objectId="druid:kz949yf0754">
-          <access type="discover">
-            <machine>
-              <world/>
-            </machine>
-          </access>
-          <access type="read">
-            <machine>
-              <world/>
-            </machine>
-          </access>
-          <use>
-            <human type="useAndReproduction">Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Special Collections Public Services Librarian at speccollref@stanford.edu.</human>
-          </use>
-        </rightsMetadata>
-        <rdf:RDF xmlns:fedora="info:fedora/fedora-system:def/relations-external#" xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:hydra="http://projecthydra.org/ns/relations#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-          <rdf:Description rdf:about="info:fedora/druid:bc390xk2647">
-            <fedora:isMemberOf rdf:resource="info:fedora/druid:kx532cb7981"/>
-            <fedora:isMemberOfCollection rdf:resource="info:fedora/druid:kx532cb7981"/>
-          </rdf:Description>
-        </rdf:RDF>
-        <oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:srw_dc="info:srw/schema/1/dc-schema" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-          <dc:type>StillImage</dc:type>
-          <dc:title>Lake Lagunita</dc:title>
-          <dc:type>photographic prints</dc:type>
-          <dc:date>1887-1996</dc:date>
-          <dc:format>1 photograph; 4 in. x 6 in.</dc:format>
-          <dc:format>black and white photographic print</dc:format>
-          <dc:format>image/jpeg</dc:format>
-          <dc:language>eng</dc:language>
-          <dc:description>Digitized by Stanford University Libraries.</dc:description>
-          <dc:subject>Lakes</dc:subject>
-          <dc:subject>Lake Lagunita (Calif.)</dc:subject>
-          <dc:subject>College campuses</dc:subject>
-          <dc:identifier>9650</dc:identifier>
-          <dc:relation type="repository">Stanford University. Libraries. Department of Special Collections and University Archives Series: General Photographs, Box: 25, Folder: Lake Lagunita -- #3 SC1071</dc:relation>
-          <dc:relation type="collection">Stanford historical photograph collection, 1887-circa 1996 (inclusive)</dc:relation>
-        </oai_dc:dc>
-        <mods xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.5" xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-5.xsd">
-          <typeOfResource>still image</typeOfResource>
-          <titleInfo>
-            <title>Lake Lagunita</title>
-          </titleInfo>
-          <genre authority="aat" valueURI="http://vocab.getty.edu/aat/300127104">photographic prints</genre>
-          <originInfo>
-            <dateCreated keyDate="yes" encoding="w3cdtf" qualifier="approximate" point="start">1887</dateCreated>
-            <dateCreated encoding="w3cdtf" qualifier="approximate" point="end">1996</dateCreated>
-          </originInfo>
-          <physicalDescription>
-            <form>black and white photographic print</form>
-            <extent>1 photograph; 4 in. x 6 in.</extent>
-            <internetMediaType>image/jpeg</internetMediaType>
-            <digitalOrigin>reformatted digital</digitalOrigin>
-          </physicalDescription>
-          <language>
-            <languageTerm type="code" authority="iso639-2b">eng</languageTerm>
-          </language>
-          <note>Digitized by Stanford University Libraries.</note>
-          <subject authority="lcsh" authorityURI="http://id.loc.gov/authorities/subjects" valueURI="http://id.loc.gov/authorities/subjects/sh85074030">
-            <topic>Lakes</topic>
-          </subject>
-          <subject authority="local">
-            <topic>Lake Lagunita (Calif.)</topic>
-          </subject>
-          <subject authority="lcsh" authorityURI="http://id.loc.gov/authorities/subjects" valueURI="http://id.loc.gov/authorities/subjects/sh2006002824">
-            <topic>College campuses</topic>
-          </subject>
-          <identifier type="local" displayLabel="SHPC Photo ID">9650</identifier>
-          <location>
-            <physicalLocation type="repository" authority="naf" authorityURI="http://id.loc.gov/authorities/names" valueURI="http://id.loc.gov/authorities/names/no2014019980">Stanford University. Libraries. Department of Special Collections and University Archives</physicalLocation>
-            <physicalLocation type="location">Series: General Photographs, Box: 25, Folder: Lake Lagunita -- #3</physicalLocation>
-            <shelfLocator>SC1071</shelfLocator>
-          </location>
-          <relatedItem type="host" displayLabel="Series">
-            <titleInfo>
-              <title>General Photographs</title>
-            </titleInfo>
-          </relatedItem>
-          <recordInfo>
-            <recordContentSource authority="marcorg">CSt</recordContentSource>
-            <recordOrigin>Transformed from legacy Luna Insight data, Luna Object ID 12415</recordOrigin>
-            <languageOfCataloging>
-              <languageTerm authority="iso639-2b">eng</languageTerm>
-            </languageOfCataloging>
-          </recordInfo>
-          <relatedItem type="host">
-            <titleInfo>
-              <title>Stanford historical photograph collection, 1887-circa 1996 (inclusive)</title>
-            </titleInfo>
-            <location>
-              <url>https://purl.stanford.edu/kx532cb7981</url>
-            </location>
-            <typeOfResource collection="yes"/>
-          </relatedItem>
-          <accessCondition type="useAndReproduction">Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Special Collections Public Services Librarian at speccollref@stanford.edu.</accessCondition>
-        </mods>
-        <releaseData>
-          <release to="Searchworks">true</release>
-        </releaseData>
-        <thumb>bc390xk2647/00007845_005.jp2</thumb>
-      </publicObject>
-    EOF
-  end
-
-  it "works" do
-    expect(CreateWorkJob).to receive(:perform_later)
-    described_class.perform_now(user, druid, log)
-  end
-end
diff --git a/spec/lib/importer/csv_importer_spec.rb b/spec/lib/importer/csv_importer_spec.rb
deleted file mode 100644
index 5a7f699d3..000000000
--- a/spec/lib/importer/csv_importer_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-
-RSpec.describe Importer::CSVImporter do
-  let(:image_directory) { 'spec/fixtures/images' }
-
-  context 'when the model is passed' do
-    let(:csv_file) { "#{fixture_path}/csv/gse_metadata.csv" }
-    let(:importer) { described_class.new(csv_file, image_directory, fallback_class) }
-    let(:fallback_class) { Class.new { def initialize(_argx, _argy); end } }
-    let(:factory) { double(run: true) }
-
-    # NOTE: 2 rows do not specify type, 17 do
-    it 'creates new works' do
-      expect(fallback_class).to receive(:new)
-        .with(any_args).and_return(factory).twice
-      expect(Importer::Factory::ETDFactory).to receive(:new)
-        .with(any_args).and_return(factory).exactly(17).times
-      importer.import_all
-    end
-  end
-
-  context 'when the model specified on the row' do
-    let(:csv_file) { "#{fixture_path}/csv/sample.csv" }
-    let(:importer) { described_class.new(csv_file, image_directory) }
-    let(:collection_factory) { double }
-    let(:image_factory) { double }
-
-    it 'creates new images and collections' do
-      expect(Importer::Factory::CollectionFactory).to receive(:new)
-        .with(hash_excluding(:type), image_directory)
-        .and_return(collection_factory)
-      expect(collection_factory).to receive(:run)
-      expect(Importer::Factory::ImageFactory).to receive(:new)
-        .with(hash_excluding(:type), image_directory)
-        .and_return(collection_factory)
-      expect(collection_factory).to receive(:run)
-      expect(Importer::Factory::ETDFactory).to receive(:new)
-        .with(hash_excluding(:type), image_directory)
-        .and_return(image_factory)
-      expect(image_factory).to receive(:run)
-      importer.import_all
-    end
-  end
-end
diff --git a/spec/lib/importer/csv_parser_spec.rb b/spec/lib/importer/csv_parser_spec.rb
deleted file mode 100644
index ced604c87..000000000
--- a/spec/lib/importer/csv_parser_spec.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-
-RSpec.describe Importer::CSVParser do
-  let(:parser) { described_class.new(file) }
-  let(:attributes) { parser.attributes }
-  let(:file) { "#{fixture_path}/csv/gse_metadata.csv" }
-  let(:first_record) { parser.first }
-
-  context 'Importing just images' do
-    it 'parses a record' do
-      # Title must be singular
-      expect(first_record[:title]).to eq ['Work in Progress - A Framework for Building Interactive Learning Modules']
-
-      expect(first_record[:file]).to eq ['DalmonEtAl2011_Framework_Final.pdf']
-
-      expect(first_record[:date_created]).to eq ['2011']
-
-      expect(first_record[:contributor]).to eq [{ name: ["Dalmon, Danilo"] },
-                                                { name: ["Brandao, Leonidas"] },
-                                                { name: ["Brandao, Anarosa"] },
-                                                { name: ["Isotani, Seiji"] }]
-      expect(first_record.keys).to match_array %i[id type title description
-                                                  subject resource_type contributor
-                                                  date_created file]
-    end
-  end
-
-  describe 'validating CSV headers' do
-    subject { parser.send(:validate_headers, headers) }
-
-    context 'with valid headers' do
-      let(:headers) { %w[id title] }
-
-      it { is_expected.to eq headers }
-    end
-
-    context 'with invalid headers' do
-      let(:headers) { ['something bad', 'title'] }
-
-      it 'raises an error' do
-        expect { subject }.to raise_error 'Invalid headers: something bad'
-      end
-    end
-
-    context 'with nil headers' do
-      let(:headers) { ['title', nil] }
-
-      it { is_expected.to eq headers }
-    end
-
-    # It doesn't expect a matching column for "resource_type"
-    context 'with resource_type column' do
-      let(:headers) { %w[resource_type title] }
-
-      it { is_expected.to eq headers }
-    end
-  end
-
-  describe "validate_header_pairs" do
-    subject { parser.send(:validate_header_pairs, headers) }
-
-    context 'with "*_type" columns' do
-      let(:headers) { %w[rights_holder rights_holder_type rights_holder title note_type note] }
-
-      it { is_expected.to be_nil }
-    end
-
-    # The CSV parser assumes that the *_type column comes just
-    # before the column that contains the value for that local
-    # authority.  If the columns aren't in the correct order,
-    # raise an error.
-    context 'with columns in the wrong order' do
-      let(:headers) { %w[note note_type rights_holder_type rights_holder_type rights_holder title] }
-
-      it 'raises an error' do
-        expect { subject }.to raise_error "Invalid headers: 'note_type' column " \
-          "must be immediately followed by 'note' column., Invalid headers: " \
-          "'rights_holder_type' column must be immediately followed by " \
-          "'rights_holder' column."
-      end
-    end
-  end
-end
diff --git a/spec/lib/importer/factory/etd_factory_spec.rb b/spec/lib/importer/factory/etd_factory_spec.rb
deleted file mode 100644
index 2910697af..000000000
--- a/spec/lib/importer/factory/etd_factory_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-
-RSpec.describe Importer::Factory::ETDFactory, :clean do
-  let(:factory) { described_class.new(attributes) }
-  let(:files) { [] }
-  let(:work) { GenericWork }
-
-  context 'when a collection already exists' do
-    let!(:coll) { create(:collection) }
-    let(:attributes) do
-      {
-        collection: { id: coll.id },
-        files:,
-        identifier: ['123'],
-        title: ['Test image'],
-        read_groups: ['public'],
-        depositor: 'bob',
-        edit_users: ['bob']
-      }
-    end
-    let(:actor) { Hyrax::CurationConcern.actor }
-
-    it 'does not create a new collection' do
-      expect(actor).to receive(:create).with(Hyrax::Actors::Environment) do |k|
-        expect(k.attributes).to include(member_of_collection_attributes: [id: coll.id])
-      end
-      expect do
-        factory.run
-      end.to change(Collection, :count).by(0)
-    end
-  end
-
-  include_examples("csv_importer")
-end
diff --git a/spec/lib/importer/factory/image_factory_spec.rb b/spec/lib/importer/factory/image_factory_spec.rb
deleted file mode 100644
index 464776554..000000000
--- a/spec/lib/importer/factory/image_factory_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-
-RSpec.describe Importer::Factory::ImageFactory, :clean do
-  let(:factory) { described_class.new(attributes) }
-  let(:files) { [] }
-  let(:work) { Image }
-
-  context 'when a collection already exists' do
-    let!(:coll) { create(:collection) }
-    let(:attributes) do
-      {
-        collection: { id: coll.id },
-        files:,
-        identifier: ['123'],
-        title: ['Test image'],
-        read_groups: ['public'],
-        depositor: 'bob',
-        edit_users: ['bob']
-      }
-    end
-    let(:actor) { Hyrax::CurationConcern.actor }
-
-    it 'does not create a new collection' do
-      expect(actor).to receive(:create).with(Hyrax::Actors::Environment) do |k|
-        expect(k.attributes).to include(member_of_collection_attributes: [id: coll.id])
-      end
-      expect do
-        factory.run
-      end.to change(Collection, :count).by(0)
-    end
-  end
-
-  include_examples("csv_importer")
-end
diff --git a/spec/lib/importer/factory/string_literal_processor_spec.rb b/spec/lib/importer/factory/string_literal_processor_spec.rb
deleted file mode 100644
index 5bec71bbb..000000000
--- a/spec/lib/importer/factory/string_literal_processor_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-
-RSpec.describe Importer::Factory::StringLiteralProcessor do
-  subject { described_class.process(input) }
-
-  let(:input) do
-    { title: ["Stanford residences"],
-      contributor: [{ name:, type: "corporate" }] }
-  end
-
-  context "with a single name" do
-    let(:name) { ["Muybridge"] }
-
-    it do
-      expect(subject).to eq(title: ["Stanford residences"],
-                            contributor: ['Muybridge'])
-    end
-  end
-
-  context "with multiple name parts" do
-    let(:name) { ["Stanford University", "Archives."] }
-
-    it do
-      expect(subject).to eq(title: ["Stanford residences"],
-                            contributor: ['Stanford University — Archives.'])
-    end
-  end
-
-  context "without a contributor" do
-    let(:input) do
-      { title: ["Stanford residences"] }
-    end
-
-    it { expect(subject).to eq(title: ["Stanford residences"]) }
-  end
-end
diff --git a/spec/lib/importer/mods_importer_spec.rb b/spec/lib/importer/mods_importer_spec.rb
deleted file mode 100644
index adb3937d6..000000000
--- a/spec/lib/importer/mods_importer_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-require 'importer/mods_parser'
-
-RSpec.describe Importer::ModsImporter, :clean do
-  let(:image_directory) { File.join(fixture_path, 'images') }
-  let(:importer) { described_class.new(image_directory) }
-  let(:actor) { double }
-
-  before do
-    allow(Hyrax::CurationConcern).to receive(:actor).and_return(actor)
-  end
-
-  describe '#import an image' do
-    let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-    it 'creates a new image and a collection' do
-      expect(actor).to receive(:create).with(Hyrax::Actors::Environment) do |k|
-        expect(k.attributes).to include(member_of_collection_attributes: [{ id: 'kx532cb7981' }],
-                                        identifier: ['xv169dn4538'],
-                                        visibility: 'open')
-      end
-      expect do
-        importer.import(file)
-      end.to change(Collection, :count).by(1)
-
-      coll = Collection.last
-      expect(coll.identifier).to eq ['kx532cb7981']
-      expect(coll.title).to eq ['Stanford historical photograph collection, 1887-circa 1996']
-      expect(coll.visibility).to eq 'open'
-    end
-
-    context 'when the collection already exists' do
-      let!(:coll) { create(:collection, id: 'kx532cb7981', title: ['Test Collection']) }
-
-      it 'adds image to existing collection' do
-        expect(actor).to receive(:create).with(Hyrax::Actors::Environment) do |k|
-          expect(k.attributes).to include(member_of_collection_attributes: [{ id: coll.id }])
-        end
-        expect do
-          importer.import(file)
-        end.to change(Collection, :count).by(0)
-      end
-    end
-  end
-
-  describe '#import a Collection' do
-    let(:file) { File.join(fixture_path, 'mods', 'shpc', 'kx532cb7981.mods') }
-
-    it 'creates a collection' do
-      coll = nil
-      expect do
-        coll = importer.import(file)
-      end.to change(Collection, :count).by(1)
-
-      expect(coll.identifier).to eq ['kx532cb7981']
-      expect(coll.title).to eq ['Stanford historical photograph collection, 1887-circa 1996 (inclusive)']
-      expect(coll.read_groups).to eq ['public']
-
-      expect(coll.contributor).to eq ['Stanford University — Archives.']
-    end
-
-    context 'when the collection already exists' do
-      let!(:existing) { FactoryBot.create(:collection, id: 'kx532cb7981', title: ['Test Collection']) }
-
-      it 'adds metadata to existing collection', skip: 'importer.import(file) throws an error in ObjectFactory' do
-        coll = nil
-        expect do
-          coll = importer.import(file)
-        end.to change(Collection, :count).by(0)
-
-        expect(coll.id).to eq existing.id
-        expect(coll.identifier).to eq ['kx532cb7981']
-        expect(coll.title).to eq ["Stanford historical photograph collection, 1887-circa 1996 (inclusive)"]
-      end
-    end
-  end
-end
diff --git a/spec/lib/importer/mods_parser_spec.rb b/spec/lib/importer/mods_parser_spec.rb
deleted file mode 100644
index 46073ed49..000000000
--- a/spec/lib/importer/mods_parser_spec.rb
+++ /dev/null
@@ -1,238 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-
-RSpec.describe Importer::ModsParser do
-  let(:parser) { described_class.new(file) }
-  let(:attributes) { parser.attributes }
-
-  describe 'Determine which kind of record it is:' do
-    describe 'for a collection:' do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'kx532cb7981.mods') }
-
-      it 'knows it is a Collection' do
-        expect(parser.collection?).to eq true
-        expect(parser.image?).to eq false
-        expect(parser.model).to eq Collection
-      end
-    end
-
-    describe 'for an image:' do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'knows it is an Image' do
-        expect(parser.image?).to eq true
-        expect(parser.collection?).to eq false
-        expect(parser.model).to eq "Image"
-      end
-    end
-  end
-
-  describe '#attributes for an Image record' do
-    let(:ns_decl) { "xmlns='#{Mods::MODS_NS}'" }
-    let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-    it 'finds metadata for the image' do
-      expect(attributes[:description]).to eq []
-      expect(attributes[:location]).to eq []
-      expect(attributes[:form_of_work]).to eq []
-      expect(attributes[:extent]).to eq []
-      expect(attributes[:accession_number]).to eq ["8735.2", "15097"]
-      expect(attributes[:sub_location]).to eq []
-      expect(attributes[:citation]).to eq []
-      acquisition_note = attributes[:notes_attributes].first
-      expect(acquisition_note[:note_type]).to be nil
-      expect(acquisition_note[:value]).to start_with '"Left to right'
-      expect(attributes[:description_standard]).to eq []
-      expect(attributes[:series_name]).to eq []
-      expect(attributes[:restrictions]).to eq []
-      expect(attributes[:institution]).to eq [
-        "Stanford University. Libraries. Dept. of Special Collections & University Archives."
-      ]
-    end
-
-    context 'with a file that has a general (untyped) note' do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'imports notes' do
-        expect(attributes[:notes_attributes].first[:value]).to start_with(
-          "\"Left to right: Anna Maria Lathrop"
-        )
-      end
-    end
-
-    context 'with a file that has a publisher', skip: "need a record with originInfo" do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'imports publisher' do
-        expect(attributes[:publisher]).to eq ['[Cross & Dimmit Pictures]']
-      end
-    end
-
-    context 'with a file that has a photographer', skip: "we're not doing relators beyond contributor" do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'imports photographer' do
-        expect(attributes[:photographer]).to eq ['http://id.loc.gov/authorities/names/n97003180']
-      end
-    end
-
-    it 'imports contributor' do
-      expect(attributes[:contributor]).to eq [{ name: ["Muybridge"], type: "corporate" }]
-    end
-
-    it 'imports language' do
-      # I think this record should be:
-      # expect(attributes[:language]).to eq ['http://id.loc.gov/vocabulary/iso639-2/zxx']
-      expect(attributes[:language]).to eq ['en']
-    end
-
-    it 'imports resource_type' do
-      expect(attributes[:resource_type]).to eq ['still image']
-    end
-
-    it 'imports digital origin', skip: "Need a record with digital origin" do
-      expect(attributes[:digital_origin]).to eq ['digitized other analog']
-    end
-
-    context 'with a file that has coordinates', skip: 'Need metadata with geo data' do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'imports coordinates' do
-        expect(attributes[:latitude]).to eq ['34.442982']
-        expect(attributes[:longitude]).to eq ['-119.657362']
-      end
-    end
-
-    it 'finds metadata for the collection' do
-      # This only worked because I downloaded the mods from purl
-      expect(attributes[:collection][:identifier]).to eq ['http://purl.stanford.edu/kx532cb7981']
-      expect(attributes[:collection][:title]).to eq ['Stanford historical photograph collection, 1887-circa 1996']
-    end
-
-    context 'with a range of dateCreated', skip: "no dates on this record" do
-      it 'imports created' do
-        expect(attributes[:created_attributes]).to eq [
-          { start: ['1910'],
-            finish: ['1919'],
-            label: ['circa 1910s'],
-            start_qualifier: ['approximate'],
-            finish_qualifier: ['approximate'] }
-        ]
-      end
-    end
-
-    context 'without date_created' do
-      let(:parser) { described_class.new(nil) }
-      let(:xml) do
-        "<mods #{ns_decl}><originInfo><dateValid encoding=\"w3cdtf\">1989-12-01</dateValid></originInfo></mods>"
-      end
-
-      before { allow(parser).to receive(:mods).and_return(Mods::Record.new.from_str(xml)) }
-
-      it "doesn't return a set of empty date attributes (which would cause an empty TimeSpan to be created)" do
-        expect(attributes[:created_attributes]).to eq []
-      end
-    end
-
-    context 'with a file that has a range of dateIssued', skip: "no dates on this record" do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'imports issued' do
-        expect(attributes[:issued_attributes]).to eq [
-          { start: ['1900'],
-            finish: ['1959'],
-            label: ['circa 1900s-1950s'],
-            start_qualifier: ['approximate'],
-            finish_qualifier: ['approximate'] }
-        ]
-      end
-    end
-
-    context 'with a file that has a single dateIssued', skip: "no dates on this record" do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'imports issued' do
-        expect(attributes[:issued_attributes]).to eq [
-          { start: ['1925'],
-            finish: [],
-            label: [],
-            start_qualifier: [],
-            finish_qualifier: [] }
-        ]
-      end
-    end
-
-    context 'with date_copyrighted', skip: "no dates on this record" do
-      let(:parser) { described_class.new(nil) }
-      let(:xml) do
-        "<mods #{ns_decl}><originInfo><copyrightDate encoding=\"w3cdtf\">1985-12-01</copyrightDate></originInfo></mods>"
-      end
-
-      before { allow(parser).to receive(:mods).and_return(Mods::Record.new.from_str(xml)) }
-
-      it 'imports date_copyrighted' do
-        expect(attributes[:date_copyrighted_attributes]).to eq [
-          { start: ['1985-12-01'],
-            finish: [],
-            label: [],
-            start_qualifier: [],
-            finish_qualifier: [] }
-        ]
-      end
-    end
-
-    context 'with dateValid' do
-      let(:parser) { described_class.new(nil) }
-      let(:xml) do
-        "<mods #{ns_decl}><originInfo><dateValid encoding=\"w3cdtf\">1989-12-01</dateValid></originInfo></mods>"
-      end
-
-      before { allow(parser).to receive(:mods).and_return(Mods::Record.new.from_str(xml)) }
-
-      it 'imports date_valid' do
-        expect(attributes[:date_valid_attributes]).to eq [
-          { start: ['1989-12-01'],
-            finish: [],
-            label: [],
-            start_qualifier: [],
-            finish_qualifier: [] }
-        ]
-      end
-    end
-
-    context 'with a file that has an alternative title', skip: "Need a record with alt title" do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'distinguishes between title and alternative title' do
-        expect(attributes[:title]).to eq ['Stanford residences -- Sacramento -- Muybridge']
-        expect(attributes[:alternative]).to eq ['An alternative']
-      end
-    end
-
-    context 'with a file that has placeTerm', skip: 'file has no originInfo' do
-      let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-      it 'reads the place' do
-        expect(attributes[:place_of_publication]). to eq ['Santa Barbara, California']
-      end
-    end
-  end
-
-  describe '#attributes for a Collection record' do
-    let(:file) { File.join(fixture_path, 'mods', 'shpc', 'kx532cb7981.mods') }
-
-    it 'finds the metadata' do
-      expect(attributes[:title]).to eq ['Stanford historical photograph collection, 1887-circa 1996 (inclusive)']
-      expect(attributes[:creator]).to be_nil
-      expect(attributes[:contributor]).to eq [{ name: ['Stanford University', 'Archives.'], type: 'corporate' }]
-      expect(attributes[:description].first).to start_with 'The Stanford historical photograph collection'
-      expect(attributes[:extent]).to eq ['40 linear feet']
-      expect(attributes[:language]).to eq ['eng']
-      expect(attributes[:resource_type]).to eq ['still image']
-      expect(attributes[:institution]).to eq [
-        'Dept. of Special Collections & University Archives Stanford Univeristy Libraries'
-      ]
-    end
-  end
-end
diff --git a/spec/lib/stanford/importer/mods_parser_spec.rb b/spec/lib/stanford/importer/mods_parser_spec.rb
deleted file mode 100644
index c58e34231..000000000
--- a/spec/lib/stanford/importer/mods_parser_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'importer'
-require 'stanford'
-
-RSpec.describe Stanford::Importer::ModsParser do
-  let(:parser) { described_class.new(file) }
-  let(:attributes) { parser.attributes }
-
-  describe '#collection_attributes' do
-    subject { parser.collection_attributes }
-
-    let(:file) { File.join(fixture_path, 'mods', 'shpc', 'kx532cb7981.mods') }
-
-    it "has visibility" do
-      expect(subject[:visibility]).to eq 'open'
-    end
-  end
-
-  describe '#record_attributes' do
-    subject { parser.record_attributes }
-
-    let(:file) { File.join(fixture_path, 'mods', 'shpc', 'druid_xv169dn4538.mods') }
-
-    it "has visibility" do
-      expect(subject[:visibility]).to eq 'open'
-    end
-  end
-end
diff --git a/spec/lib/stanford/importer/purl_parser_spec.rb b/spec/lib/stanford/importer/purl_parser_spec.rb
deleted file mode 100644
index 42e51c61e..000000000
--- a/spec/lib/stanford/importer/purl_parser_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'stanford'
-
-RSpec.describe Stanford::Importer::PurlParser do
-  let(:xml) { fixture_file_upload('purl/bc390xk2647.xml').read }
-  let(:parser) { described_class.new(xml) }
-
-  describe "attributes" do
-    subject { parser.attributes }
-
-    it "has required attributes" do
-      expect(subject[:title]).to eq ['Lake Lagunita']
-      expect(subject[:subject]).to eq ['Lake Lagunita']
-      expect(subject[:language]).to eq ['en']
-      expect(subject[:collection]).to eq(id: 'kx532cb7981',
-                                         title: ['Stanford historical photograph collection, 1887-circa 1996'])
-      expect(subject[:visibility]).to eq 'open'
-      expect(subject[:id]).to eq 'bc390xk2647'
-    end
-  end
-end
diff --git a/spec/support/shared_examples_for_csv_importer.rb b/spec/support/shared_examples_for_csv_importer.rb
deleted file mode 100644
index c192d5dac..000000000
--- a/spec/support/shared_examples_for_csv_importer.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.shared_examples "csv_importer" do
-  let!(:admin_group) { FactoryBot.create(:group, name: "admin") }
-  let!(:registered_group) { FactoryBot.create(:group, name: "registered") }
-  let!(:work_editor_group) { FactoryBot.create(:group, name: "work_editor") }
-  let!(:work_depositor_group) { FactoryBot.create(:group, name: "work_depositor") }
-
-  context "with a file" do
-    let(:attributes) do
-      {
-        id: "123",
-        title: ["Gluten-free umami"],
-        file: ["world.png"]
-      }
-    end
-
-    let(:factory) { described_class.new(attributes, File.join(fixture_path, 'images')) }
-
-    before do
-      factory.run
-    end
-
-    describe "#run" do
-      it "uploads the content of the file" do
-        expect(Hyrax::UploadedFile.last[:file]).to eq("world.png")
-      end
-    end
-
-    describe "when a work with the same id already exists" do
-      let(:new_attr) do
-        {
-          id: "123",
-          title: ["Squid tofu banjo"],
-          file: ["nypl-hydra-of-lerna.jpg"]
-        }
-      end
-
-      it "updates metadata" do
-        new_factory = described_class.new(new_attr, File.join(fixture_path, 'images'))
-        new_factory.run
-        expect(work.last.title).to eq(["Squid tofu banjo"])
-      end
-    end
-  end
-
-  context "without a file" do
-    ## the csv_importer still creates a Work when no file is provided.
-    ## TO DO: handle invalid file in CSV; current behavior:
-    ## the importer stops if no file corresponding to a given file_name is found
-    let(:attributes) { { id: "345", title: ["Artisan succulents"] } }
-    let(:factory) { described_class.new(attributes) }
-
-    before { factory.run }
-
-    it "creates a Work with supplied metadata" do
-      expect(work.find("345").title).to eq(["Artisan succulents"])
-    end
-
-    it "updates a Work with supplied metadata" do
-      new_attr = { id: "345", title: ["Retro humblebrag"] }
-      new_factory = described_class.new(new_attr)
-      new_factory.run
-      expect(work.find("345").title).to eq(["Retro humblebrag"])
-    end
-  end
-end

From aa9a6d73b9f056ee9f0e99e3b8b525d068b756fd Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 11:02:45 -0500
Subject: [PATCH 105/126] =?UTF-8?q?=F0=9F=A4=96=20Fix=20spec/features/coll?=
 =?UTF-8?q?ection=5Ftype=5Fspec.rb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are three major changes:

1. Favor setting `collection_type` attribute instead of
   `collection_type_gid`
2. Change `#collections?` to `#collections#any?`
3. Change CSS selector based on Bootstrap upgrade

The above changes are related to work done in:

- https://github.com/samvera/hyrax/pull/5730
- https://github.com/samvera/hyrax/pull/5742
- https://github.com/samvera/hyrax/pull/4701

See:
- https://github.com/samvera/hyrax/commit/eb6e04e312b039a65ef58b1781fa112fd93f2c0c
- https://github.com/samvera/hyrax/commit/237c0c63297df05b9d483a15b212900c2323a455
- https://github.com/samvera/hyrax/commit/280664bd6b0e59c2e10795151f0afcec91b9c15b
---
 spec/features/collection_type_spec.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/spec/features/collection_type_spec.rb b/spec/features/collection_type_spec.rb
index db8c624a4..8011a7005 100644
--- a/spec/features/collection_type_spec.rb
+++ b/spec/features/collection_type_spec.rb
@@ -376,11 +376,7 @@
 
     context 'when collections exist of this type' do
       before do
-        create(
-          :public_collection_lw,
-          user: build(:user),
-          collection_type_gid: exhibit_collection_type.gid
-        )
+        FactoryBot.create(:public_collection_lw, user: build(:user), collection_type: exhibit_collection_type)
 
         exhibit_collection_type
         login_as admin_user
@@ -388,7 +384,7 @@
       end
 
       it 'all settings are disabled', :js do
-        expect(exhibit_collection_type.collections?).to be true
+        expect(exhibit_collection_type.collections.any?).to be true
 
         click_link('Settings', href: '#settings')
 
@@ -446,7 +442,7 @@
         create(
           :public_collection_lw,
           user: admin_user,
-          collection_type_gid: not_empty_collection_type.gid
+          collection_type: not_empty_collection_type
         )
       end
       # OVERRIDE: split deny_delete_modal_text into two variables since the test was failing over the newline character
@@ -474,7 +470,7 @@
         end
 
         # forwards to Dashboard -> Collections -> All Collections
-        within('li.active') do
+        within('.nav-tabs li.nav-item') do
           expect(page).to have_link('All Collections')
         end
 
@@ -492,7 +488,6 @@
   end
 
   # OVERRIDE: new (non-hyrax) test cases below
-
   describe 'default collection type participants', ci: 'skip' do
     let(:title) { 'Title Test' }
 

From 73359b6b244ede5a73ba13b102644f09476ff8e8 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 11:47:37 -0500
Subject: [PATCH 106/126] =?UTF-8?q?=F0=9F=A4=96=20Fix=20stub=20methods=20t?=
 =?UTF-8?q?o=20pass=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These tests weren't verifying that we could reach Redis; they were
testing the interface of the `RedisEndpoint#ping` by mocking the
instance.

This commit changes the mocking by avoiding a call to
`Hyrax::RedisEventStore.instance` which was raising a Redis connection
error.

Again, this test is not is redis connecting but "assume we are trying to
connect to redis now demonstrate ping."
---
 spec/models/redis_endpoint_spec.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/models/redis_endpoint_spec.rb b/spec/models/redis_endpoint_spec.rb
index 6c6a3ad60..def3074c9 100644
--- a/spec/models/redis_endpoint_spec.rb
+++ b/spec/models/redis_endpoint_spec.rb
@@ -4,7 +4,7 @@
   let(:namespace) { 'foobar' }
 
   describe '.options' do
-    subject { described_class.new namespace: }
+    subject { described_class.new(namespace:) }
 
     it 'uses the configured application settings' do
       expect(subject.options[:namespace]).to eq namespace
@@ -12,13 +12,15 @@
   end
 
   describe '#ping' do
+    let(:faux_redis_instance) { double(Hyrax::RedisEventStore, ping: 'PONG') }
     it 'checks if the service is up' do
-      allow(Hyrax::RedisEventStore.instance).to receive(:ping).and_return('PONG')
+      allow(subject).to receive(:redis_instance).and_return(faux_redis_instance)
       expect(subject.ping).to be_truthy
     end
 
     it 'is false if the service is down' do
-      allow(Hyrax::RedisEventStore.instance).to receive(:ping).and_raise(RuntimeError)
+      allow(faux_redis_instance).to receive(:ping).and_raise(RuntimeError)
+      allow(subject).to receive(:redis_instance).and_return(faux_redis_instance)
       expect(subject.ping).to eq false
     end
   end

From bee1f4f603e11da347a06466830c884e53a90645 Mon Sep 17 00:00:00 2001
From: LaRita Robinson <laritakr@users.noreply.github.com>
Date: Wed, 20 Dec 2023 12:09:42 -0500
Subject: [PATCH 107/126] Lock chromedriver version (#2086)

Refs
https://github.com/CircleCI-Public/browser-tools-orb/pull/96
https://github.com/CircleCI-Public/browser-tools-orb/issues/75#issuecomment-169811589
---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4c9c7618e..21ed03a19 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,7 +80,9 @@ jobs:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
       - samvera/rubocop
-      - browser-tools/install-chrome
+      - browser-tools/install-chrome:
+          chrome-version: 114.0.5735.90 # see https://github.com/CircleCI-Public/browser-tools-orb/pull/96
+          replace-existing: true
       - browser-tools/install-chromedriver
       - run:
           name: Check Chrome install

From 05d283865a8fb4b0afccac9b537741805506adb5 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 20 Dec 2023 09:27:04 -0800
Subject: [PATCH 108/126] =?UTF-8?q?=F0=9F=A7=B9=20Clean=20up=20model=20ove?=
 =?UTF-8?q?rrides?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Most of what's in this commit is just updating the Hyrax version in the
override comments.  There was also an opportunity to switch the
`ContactForm` model to a decorator.
---
 app/models/ability.rb                         |  2 +-
 .../hyrax/ability/collection_ability.rb       |  2 +-
 .../hyrax/ability/solr_document_ability.rb    |  2 +-
 app/models/content_block.rb                   |  5 ++-
 .../access_controls/embargo_decorator.rb      |  2 +-
 .../hydra/access_controls/lease_decorator.rb  |  2 +-
 .../collection_type_participant_decorator.rb  |  2 +-
 app/models/hyrax/contact_form.rb              | 40 -------------------
 app/models/hyrax/contact_form_decorator.rb    | 25 ++++++++++++
 app/models/hyrax/group.rb                     |  2 +-
 .../permission_template_access_decorator.rb   |  2 +-
 11 files changed, 36 insertions(+), 50 deletions(-)
 delete mode 100644 app/models/hyrax/contact_form.rb
 create mode 100644 app/models/hyrax/contact_form_decorator.rb

diff --git a/app/models/ability.rb b/app/models/ability.rb
index c433ad198..80708e606 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -25,7 +25,7 @@ class Ability
     self.ability_logic += %i[everyone_can_create_curation_concerns]
   end
 
-  # OVERRIDE METHOD from blacklight-access_controls v0.6.2
+  # OVERRIDE METHOD from blacklight-access_controls v6.0.1
   #
   # NOTE: DO NOT RENAME THIS METHOD - it is required for permissions to function properly.
   #
diff --git a/app/models/concerns/hyrax/ability/collection_ability.rb b/app/models/concerns/hyrax/ability/collection_ability.rb
index 4f208b412..612e1070a 100644
--- a/app/models/concerns/hyrax/ability/collection_ability.rb
+++ b/app/models/concerns/hyrax/ability/collection_ability.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.2 Alter abilities for Groups with Roles feature
+# OVERRIDE Hyrax v5.0.0rc2 Alter abilities for Groups with Roles feature
 module Hyrax
   module Ability
     # rubocop:disable Metrics/ModuleLength
diff --git a/app/models/concerns/hyrax/ability/solr_document_ability.rb b/app/models/concerns/hyrax/ability/solr_document_ability.rb
index b3e5616e4..1248eefbc 100644
--- a/app/models/concerns/hyrax/ability/solr_document_ability.rb
+++ b/app/models/concerns/hyrax/ability/solr_document_ability.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.2 Alter abilities for Groups with Roles feature
+# OVERRIDE Hyrax v5.0.0rc2 Alter abilities for Groups with Roles feature
 module Hyrax
   module Ability
     module SolrDocumentAbility
diff --git a/app/models/content_block.rb b/app/models/content_block.rb
index 7fcab340c..b4f291f43 100644
--- a/app/models/content_block.rb
+++ b/app/models/content_block.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.0 to add home_text to registry
-# and getter/setter methods - Adding themes
+# OVERRIDE Hyrax v5.0.0rc to add home_text to registry and getter/setter methods - Adding themes
+# NOTE: This class inherits from ApplicationRecord while Hyrax's version inherits from ActiveRecord::Base
+#       so we cannot use the decorator pattern to override the methods.
 # rubocop:disable Metrics/ClassLength
 class ContentBlock < ApplicationRecord
   # The keys in this registry are "public" names for collaborator
diff --git a/app/models/hydra/access_controls/embargo_decorator.rb b/app/models/hydra/access_controls/embargo_decorator.rb
index 6d1bed4ed..9daf716e3 100644
--- a/app/models/hydra/access_controls/embargo_decorator.rb
+++ b/app/models/hydra/access_controls/embargo_decorator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hydra-access-controls 12.0.1
+# OVERRIDE Hydra-access-controls v12.1.0
 # Fix releasing embargos on the day they are expired - this solves a 1 second bug around how
 # midnights are calculated, which causes day of embargos to incorrectly set the permissions to private
 module Hydra
diff --git a/app/models/hydra/access_controls/lease_decorator.rb b/app/models/hydra/access_controls/lease_decorator.rb
index 971f7f58b..37ab3b856 100644
--- a/app/models/hydra/access_controls/lease_decorator.rb
+++ b/app/models/hydra/access_controls/lease_decorator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hydra-access-controls 12.0.1
+# OVERRIDE Hydra-access-controls 12.1.0
 # Fix releasing leases on the day they are expired - this solves a 1 second bug around how
 # midnights are calculated, which causes day of leases to incorrectly set the permissions to private
 module Hydra
diff --git a/app/models/hyrax/collection_type_participant_decorator.rb b/app/models/hyrax/collection_type_participant_decorator.rb
index c64b667d2..164f101a1 100644
--- a/app/models/hyrax/collection_type_participant_decorator.rb
+++ b/app/models/hyrax/collection_type_participant_decorator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.2 Expand functionality for Groups with Roles feature
+# OVERRIDE Hyrax v5.0.0rc2 Expand functionality for Groups with Roles feature
 module Hyrax
   module CollectionTypeParticipantDecorator
     # OVERRIDE: #titleize agent_id for groups since we are displaying their humanized names in the dropdown
diff --git a/app/models/hyrax/contact_form.rb b/app/models/hyrax/contact_form.rb
deleted file mode 100644
index fc03c74ee..000000000
--- a/app/models/hyrax/contact_form.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# OVERRIDE Hyrax 3.4.0 to override the mail to
-module Hyrax
-  class ContactForm
-    include ActiveModel::Model
-    attr_accessor :contact_method, :category, :name, :email, :subject, :message
-    validates :email, :category, :name, :subject, :message, presence: true
-    validates :email, format: /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i, allow_blank: true
-
-    # - can't use this without ActiveRecord::Base
-    # validates_inclusion_of :category, in: self.class.issue_types_for_locale
-
-    # They should not have filled out the `contact_method' field. That's there to prevent spam.
-    def spam?
-      contact_method.present?
-    end
-
-    # Declare the e-mail headers. It accepts anything the mail method
-    # in ActionMailer accepts.
-    ###### OVERRODE the to: field to add the Tenant's email, first
-    def contact_email
-      Site.account.contact_email_to
-    end
-
-    def headers
-      ## OVERRIDE Hyrax 3.4.0 send the mail 'from' the submitter, which doesn't work on most smtp transports
-      {
-        subject: "#{Site.account.email_subject_prefix} #{email} #{subject}",
-        to: contact_email,
-        from: Site.account.contact_email,
-        reply_to: email
-      }
-    end
-
-    def self.issue_types_for_locale
-      I18n.t('hyrax.contact_form.issue_types').values.select(&:present?)
-    end
-  end
-end
diff --git a/app/models/hyrax/contact_form_decorator.rb b/app/models/hyrax/contact_form_decorator.rb
new file mode 100644
index 000000000..27cbf3fb0
--- /dev/null
+++ b/app/models/hyrax/contact_form_decorator.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# OVERRIDE Hyrax v5.0.0rc2 to override the mail to
+module Hyrax
+  module ContactFormDecorator
+    # Declare the e-mail headers. It accepts anything the mail method
+    # in ActionMailer accepts.
+    ###### OVERRIDE the to: field to add the Tenant's email, first
+    def contact_email
+      Site.account.contact_email_to
+    end
+
+    def headers
+      ## OVERRIDE Hyrax 3.4.0 send the mail 'from' the submitter, which doesn't work on most smtp transports
+      {
+        subject: "#{Site.account.email_subject_prefix} #{email} #{subject}",
+        to: contact_email,
+        from: Site.account.contact_email,
+        reply_to: email
+      }
+    end
+  end
+end
+
+Hyrax::ContactForm.prepend(Hyrax::ContactFormDecorator)
diff --git a/app/models/hyrax/group.rb b/app/models/hyrax/group.rb
index 27a6a327a..640498f77 100644
--- a/app/models/hyrax/group.rb
+++ b/app/models/hyrax/group.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.2 Expand functionality for Groups with Roles Feature
+# OVERRIDE Hyrax v5.0.0rc2 Expand functionality for Groups with Roles Feature
 # @see https://github.com/samvera/hyku/wiki/Groups-with-Roles-Feature
 module Hyrax
   class Group < ApplicationRecord
diff --git a/app/models/hyrax/permission_template_access_decorator.rb b/app/models/hyrax/permission_template_access_decorator.rb
index 7ca6bb32b..f6f6fa479 100644
--- a/app/models/hyrax/permission_template_access_decorator.rb
+++ b/app/models/hyrax/permission_template_access_decorator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax v3.4.2 #titleize agent_id for groups since we are displaying their humanized names in the dropdown
+# OVERRIDE Hyrax v5.0.0rc2 #titleize agent_id for groups since we are displaying their humanized names in the dropdown
 module Hyrax
   module PermissionTemplateAccessDecorator
     def label

From 408d518c94d6677800fb7bbc09fc956067ec39de Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 13:23:47 -0500
Subject: [PATCH 109/126] =?UTF-8?q?=F0=9F=A4=96=20Favor=20general=20spec?=
 =?UTF-8?q?=20over=20specific?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the CircleCI alternate place for the file_store cache, we need to
fallback to a more general test assertion.
---
 spec/models/account_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 4509ac097..c5499ef65 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -130,7 +130,7 @@
       it "reverts to using file store when cache is off" do
         account.settings[:cache_api] = false
         account.switch!
-        expect(Rails.application.config.cache_store).to eq([:file_store, "/app/samvera/file_cache"])
+        expect(Rails.application.config.cache_store).to eq([:file_store, kind_of(String)])
       end
     end
 
@@ -140,7 +140,7 @@
       it "uses the file store" do
         expect(Rails.application.config.action_controller.perform_caching).to be_falsey
         expect(ActionController::Base.perform_caching).to be_falsey
-        expect(Rails.application.config.cache_store).to eq([:file_store, "/app/samvera/file_cache"])
+        expect(Rails.application.config.cache_store).to eq([:file_store, kind_of(String)])
       end
     end
 

From 4319562bc015e8898114431f182d0ac437ffc2e6 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 13:40:52 -0500
Subject: [PATCH 110/126] =?UTF-8?q?=F0=9F=A4=96=20Bring=20over=20Hyrax=20s?=
 =?UTF-8?q?pec=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collections/_form_share_table.html.erb_spec.rb        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb b/spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb
index 7ac61018b..a5cc18839 100644
--- a/spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb
+++ b/spec/views/hyrax/dashboard/collections/_form_share_table.html.erb_spec.rb
@@ -4,7 +4,8 @@
   let(:template) { stub_model(Hyrax::PermissionTemplate) }
   let(:user) { create(:user) }
   let(:access_grant) { nil }
-  let(:collection) { stub_model(Collection, share_applies_to_new_works?: false) }
+  let(:collection) { stub_model(Collection) }
+  let(:collection_type) { stub_model(Hyrax::CollectionType, share_applies_to_new_works?: false) }
   let(:pt_form) do
     instance_double(Hyrax::Forms::PermissionTemplateForm,
                     model_name: template.model_name,
@@ -14,14 +15,13 @@
 
   before do
     assign(:collection, collection)
+    assign(:collection_type, collection_type)
     @form = instance_double(Hyrax::Forms::CollectionForm,
                             to_model: stub_model(Collection),
                             permission_template: pt_form,
                             filter_access_grants_by_access: [access_grant])
     # Ignore the delete button link
-    # allow(view).to receive(
-    #   :admin_permission_template_access_path
-    # ).and_return("/admin/permission_template_accesses/123")
+    allow(view.hyrax).to receive(:admin_permission_template_access_path).and_return("/admin/permission_template_accesses/123")
   end
 
   describe "Manager shares table" do

From 13775d6c2e1c5d80c135316e4760abc994668f8e Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 13:53:04 -0500
Subject: [PATCH 111/126] =?UTF-8?q?=F0=9F=A4=96=20Extract=20constant=20to?=
 =?UTF-8?q?=20ease=20testing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We're not concerned with where the cached file is for testing purposes;
so instead of hard-coding a value that can change in the ENV, let's
compare the constant that we use in the code.

tl;dr - Don't rely on magic strings
---
 app/models/account.rb       | 4 +++-
 spec/models/account_spec.rb | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index eef2a9571..9dcfc3e9b 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -111,6 +111,8 @@ def switch_host!(cname)
     Hyrax::Engine.routes.default_url_options[:host] = cname
   end
 
+  DEFAULT_FILE_CACHE_STORE = ENV.fetch('HYKU_CACHE_ROOT', '/app/samvera/file_cache')
+
   def setup_tenant_cache(is_enabled)
     Rails.application.config.action_controller.perform_caching = is_enabled
     ActionController::Base.perform_caching = is_enabled
@@ -118,7 +120,7 @@ def setup_tenant_cache(is_enabled)
     if is_enabled
       Rails.application.config.cache_store = :redis_cache_store, { url: Redis.current.id }
     else
-      Rails.application.config.cache_store = :file_store, ENV.fetch('HYKU_CACHE_ROOT', '/app/samvera/file_cache')
+      Rails.application.config.cache_store = :file_store, DEFAULT_FILE_CACHE_STORE
     end
     # rubocop:enable Style/ConditionalAssignment
     Rails.cache = ActiveSupport::Cache.lookup_store(Rails.application.config.cache_store)
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index c5499ef65..18375619a 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -130,7 +130,7 @@
       it "reverts to using file store when cache is off" do
         account.settings[:cache_api] = false
         account.switch!
-        expect(Rails.application.config.cache_store).to eq([:file_store, kind_of(String)])
+        expect(Rails.application.config.cache_store).to eq([:file_store, described_class::DEFAULT_FILE_CACHE_STORE])
       end
     end
 
@@ -140,7 +140,7 @@
       it "uses the file store" do
         expect(Rails.application.config.action_controller.perform_caching).to be_falsey
         expect(ActionController::Base.perform_caching).to be_falsey
-        expect(Rails.application.config.cache_store).to eq([:file_store, kind_of(String)])
+        expect(Rails.application.config.cache_store).to eq([:file_store, described_class::DEFAULT_FILE_CACHE_STORE])
       end
     end
 

From 0dbddad8acb132e40b8c72405c69ef74bed0bb8e Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 14:40:45 -0500
Subject: [PATCH 112/126] =?UTF-8?q?=F0=9F=A4=96=20Re-arrange=20CleanupAcco?=
 =?UTF-8?q?untJob=20specs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `CleanupAccountJob` was stubbing very nosily; needing to know too
much about implementation details of the end-points.  Instead this
preserves the over-view spec (e.g. what all the cleanup spec actually
cleans up) while moving that nosy logic to the constituent endpoint.

Most of these specs are testing that the method chains work; which is
perhaps adequate as the other option is far more expensive tests (e.g.
make a new Fedora node only to then immediately destroy it)

I'm also leveraging the new `Redis::Namespace#clear` method.

Related to:

- https://github.com/resque/redis-namespace/pull/202
---
 Gemfile                               |  1 +
 Gemfile.lock                          |  1 +
 app/models/fcrepo_endpoint.rb         |  2 +-
 app/models/redis_endpoint.rb          | 10 ++--------
 app/models/solr_endpoint.rb           |  3 +++
 spec/jobs/cleanup_account_job_spec.rb | 22 ++++++----------------
 spec/models/fcrepo_endpoint_spec.rb   | 21 +++++++++++++++++++--
 spec/models/redis_endpoint_spec.rb    | 20 +++++++++++++++-----
 spec/models/solr_endpoint_spec.rb     |  9 +++++++++
 9 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index f3c4dda27..02a857b32 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,6 +71,7 @@ gem 'rack-test', '0.7.0', group: %i[test] # rack-test >= 0.71 does not work with
 gem 'rails-controller-testing', group: %i[test]
 gem 'rdf', '~> 3.2'
 gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
+gem 'redis-namespace', '~> 1.10' # Hyrax v5 relies on 1.5; but we'd like to have the #clear method so we need 1.10 or greater.
 gem 'riiif', '~> 2.0'
 gem 'rolify'
 gem 'rsolr', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 01f9501af..9e330d35d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1437,6 +1437,7 @@ DEPENDENCIES
   rails (~> 6.0)
   rails-controller-testing
   rdf (~> 3.2)
+  redis-namespace (~> 1.10)
   redlock (>= 0.1.2, < 2.0)
   riiif (~> 2.0)
   rolify
diff --git a/app/models/fcrepo_endpoint.rb b/app/models/fcrepo_endpoint.rb
index 7b02ff281..cd5a6e88b 100644
--- a/app/models/fcrepo_endpoint.rb
+++ b/app/models/fcrepo_endpoint.rb
@@ -27,7 +27,7 @@ def ping
   def remove!
     switch!
     # Preceding slash must be removed from base_path when calling delete()
-    path = base_path.sub!(%r{^/}, '')
+    path = base_path.sub(%r{^/}, '')
     ActiveFedora.fedora.connection.delete(path)
     destroy
   end
diff --git a/app/models/redis_endpoint.rb b/app/models/redis_endpoint.rb
index 8003b9e6c..3cd68f707 100644
--- a/app/models/redis_endpoint.rb
+++ b/app/models/redis_endpoint.rb
@@ -21,14 +21,8 @@ def ping
   # Remove all the keys in Redis in this namespace, then destroy the record
   def remove!
     switch!
-    # Redis::Namespace currently doesn't support flushall or flushdb.
-    # See https://github.com/resque/redis-namespace/issues/56
-    # So, instead we select all keys in current namespace and delete
-    keys = redis_instance.keys '*'
-    return if keys.empty?
-    # Delete in slices to avoid "stack level too deep" errors for large numbers of keys
-    # See https://github.com/redis/redis-rb/issues/122
-    keys.each_slice(1000) { |key_slice| redis_instance.del(*key_slice) }
+    # redis-namespace v1.10.0 introduced clear https://github.com/resque/redis-namespace/pull/202
+    redis_instance.clear
     destroy
   end
 
diff --git a/app/models/solr_endpoint.rb b/app/models/solr_endpoint.rb
index be217ab81..3e90a6812 100644
--- a/app/models/solr_endpoint.rb
+++ b/app/models/solr_endpoint.rb
@@ -29,6 +29,9 @@ def switch!
 
   # Remove the solr collection then destroy this record
   def remove!
+    # NOTE: Other end points first call switch!; is that an oversight?  Perhaps not as we're relying
+    # on a scheduled job to do the destructive work.
+
     # Spin off as a job, so that it can fail and be retried separately from the other logic.
     if account.search_only?
       RemoveSolrCollectionJob.perform_later(collection, connection_options, 'cross_search_tenant')
diff --git a/spec/jobs/cleanup_account_job_spec.rb b/spec/jobs/cleanup_account_job_spec.rb
index 77e4a76f9..3823ccc4b 100644
--- a/spec/jobs/cleanup_account_job_spec.rb
+++ b/spec/jobs/cleanup_account_job_spec.rb
@@ -10,39 +10,29 @@
   end
 
   before do
-    allow(RemoveSolrCollectionJob).to receive(:perform_later)
-    allow(account.fcrepo_endpoint).to receive(:switch!)
-    allow(ActiveFedora.fedora.connection).to receive(:delete)
+    allow(account.solr_endpoint).to receive(:remove!)
+    allow(account.fcrepo_endpoint).to receive(:remove!)
+    allow(account.redis_endpoint).to receive(:remove!)
     allow(Apartment::Tenant).to receive(:drop).with(account.tenant)
   end
 
   it 'destroys the solr collection' do
-    expect(RemoveSolrCollectionJob).to receive(:perform_later).with('x', hash_including('url'))
-    expect(account.solr_endpoint).to receive(:destroy)
+    expect(account.solr_endpoint).to receive(:remove!)
     described_class.perform_now(account)
   end
 
   it 'destroys the fcrepo collection' do
-    expect(ActiveFedora.fedora.connection).to receive(:delete).with('x')
-    expect(account.fcrepo_endpoint).to receive(:destroy)
+    expect(account.fcrepo_endpoint).to receive(:remove!)
     described_class.perform_now(account)
   end
 
   it 'deletes all entries in the redis namespace' do
-    allow(Redis.current).to receive(:keys).and_return(["x:events:x1", "x:events:x2"])
-    allow(Hyrax::RedisEventStore).to receive(:instance).and_return(
-      Redis::Namespace.new(account.redis_endpoint.namespace, redis: Redis.current)
-    )
-    expect(Hyrax::RedisEventStore.instance.namespace).to eq('x')
-    expect(Hyrax::RedisEventStore.instance.keys).to eq(["events:x1", "events:x2"])
-    expect(Hyrax::RedisEventStore.instance).to receive(:del).with('events:x1', 'events:x2')
-    expect(account.redis_endpoint).to receive(:destroy)
+    expect(account.redis_endpoint).to receive(:remove!)
     described_class.perform_now(account)
   end
 
   it 'destroys the tenant database' do
     expect(Apartment::Tenant).to receive(:drop).with(account.tenant)
-
     described_class.perform_now(account)
   end
 
diff --git a/spec/models/fcrepo_endpoint_spec.rb b/spec/models/fcrepo_endpoint_spec.rb
index 90ca23032..bce230d69 100644
--- a/spec/models/fcrepo_endpoint_spec.rb
+++ b/spec/models/fcrepo_endpoint_spec.rb
@@ -2,10 +2,9 @@
 
 RSpec.describe FcrepoEndpoint do
   let(:base_path) { 'foobar' }
+  subject { described_class.new base_path: }
 
   describe '.options' do
-    subject { described_class.new base_path: }
-
     it 'uses the configured application settings' do
       expect(subject.options[:base_path]).to eq base_path
     end
@@ -28,4 +27,22 @@
       expect(subject.ping).to be_falsey
     end
   end
+
+  describe '#remove!' do
+    it 'removes the base node in fedora and deletes this endpoint' do
+      subject.save!
+      # All of this stubbing doesn't tell us much; except that the method chain is valid.  Which is perhaps better than the two options:
+      #
+      # 1. Creating the Fedora node then tearing it down.
+      # 2. Not testing this at all.
+      #
+      # What I found is that I could not stub the last receiver in the chain; as it would still
+      # attempt a HEAD request.  So here is the "test".
+      connection = double(ActiveFedora::CachingConnection, delete: true)
+      fedora = double(ActiveFedora::Fedora, connection: connection)
+      expect(ActiveFedora).to receive(:fedora).and_return(fedora)
+      expect(connection).to receive(:delete).with(base_path)
+      expect { subject.remove! }.to change(described_class, :count).by(-1)
+    end
+  end
 end
diff --git a/spec/models/redis_endpoint_spec.rb b/spec/models/redis_endpoint_spec.rb
index def3074c9..bb45aaa5f 100644
--- a/spec/models/redis_endpoint_spec.rb
+++ b/spec/models/redis_endpoint_spec.rb
@@ -2,26 +2,36 @@
 
 RSpec.describe RedisEndpoint do
   let(:namespace) { 'foobar' }
+  let(:faux_redis_instance) { double(Hyrax::RedisEventStore, ping: 'PONG', clear: true) }
+  before { allow(subject).to receive(:redis_instance).and_return(faux_redis_instance) }
+  subject { described_class.new(namespace:) }
 
   describe '.options' do
-    subject { described_class.new(namespace:) }
-
     it 'uses the configured application settings' do
       expect(subject.options[:namespace]).to eq namespace
     end
   end
 
   describe '#ping' do
-    let(:faux_redis_instance) { double(Hyrax::RedisEventStore, ping: 'PONG') }
     it 'checks if the service is up' do
-      allow(subject).to receive(:redis_instance).and_return(faux_redis_instance)
+      allow(faux_redis_instance).to receive(:ping).and_return("PONG")
       expect(subject.ping).to be_truthy
     end
 
     it 'is false if the service is down' do
       allow(faux_redis_instance).to receive(:ping).and_raise(RuntimeError)
-      allow(subject).to receive(:redis_instance).and_return(faux_redis_instance)
       expect(subject.ping).to eq false
     end
   end
+
+  describe '#remove!' do
+    subject { described_class.create! }
+
+    it 'clears the namespace and deletes itself' do
+      expect(faux_redis_instance).to receive(:clear)
+      expect do
+        subject.remove!
+      end.to change(described_class, :count).by(-1)
+    end
+  end
 end
diff --git a/spec/models/solr_endpoint_spec.rb b/spec/models/solr_endpoint_spec.rb
index e93d6e8c9..7a6f00c68 100644
--- a/spec/models/solr_endpoint_spec.rb
+++ b/spec/models/solr_endpoint_spec.rb
@@ -61,4 +61,13 @@
       expect(subject.ping).to eq false
     end
   end
+
+  describe '#remove!' do
+    it 'schedules the removal and deletes the end point' do
+      instance = described_class.create!
+      allow(instance).to receive(:account).and_return(double(Account, search_only?: true))
+      expect(RemoveSolrCollectionJob).to receive(:perform_later)
+      expect { instance.remove! }.to change(described_class, :count).by(-1)
+    end
+  end
 end

From deb76d7542fb0723ae21d60552e6f99b32c15af7 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 14:59:03 -0500
Subject: [PATCH 113/126] =?UTF-8?q?=F0=9F=A7=B9=20Restore=20btn-sign-up=20?=
 =?UTF-8?q?on=20splash=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change was part of the bulk upgrade of Bootstrap 3 to 4.
---
 app/assets/stylesheets/hyku.scss | 1 +
 app/views/splash/index.html.erb  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/hyku.scss b/app/assets/stylesheets/hyku.scss
index 118e799ac..3a2366f0d 100644
--- a/app/assets/stylesheets/hyku.scss
+++ b/app/assets/stylesheets/hyku.scss
@@ -61,6 +61,7 @@
     margin-bottom: 20px;
   }
 
+  // TODO: Do we need this style or could we fallback on btn-primary
   .btn-sign-up {
     @include button-variant(
       $classic-white,
diff --git a/app/views/splash/index.html.erb b/app/views/splash/index.html.erb
index 1fae1dea6..16e7f7a0b 100644
--- a/app/views/splash/index.html.erb
+++ b/app/views/splash/index.html.erb
@@ -6,9 +6,9 @@
     <p><%= t('application.tagline') %></p>
     <p>
       <% if !admin_only_tenant_creation? || can?(:manage, Account) %>
-        <%= link_to t('hyku.splash.account_signup'), account_sign_up_path, class: 'btn btn-lg btn-primary' %>
+        <%= link_to t('hyku.splash.account_signup'), account_sign_up_path, class: 'btn btn-lg btn-sign-up' %>
       <% elsif !user_signed_in? %>
-        <%= link_to t('hyku.splash.account_login'), main_app.new_user_session_path, class: 'btn btn-lg btn-primary' %>
+        <%= link_to t('hyku.splash.account_login'), main_app.new_user_session_path, class: 'btn btn-lg btn-sign-up' %>
       <% else %>
         <%= t('hyku.splash.account_denied') %>
       <% end %>

From 338aa717d22c6068e0c2b602df3b86d0d0fac4c1 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 15:37:29 -0500
Subject: [PATCH 114/126] =?UTF-8?q?=F0=9F=A7=B9=20Fix=20`./spec/requests/a?=
 =?UTF-8?q?dmin=5Fdashboard=5Fspec.rb`=20spec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, the specs failed because of the introduction of
the WorkflowResponsibilityFormDecorator.  The decorator extracted prior
logic from Hyrax::Admin::WorkflowRolesController.

In copying that logic we introduced a subtle bug.  Namely, we favored
the original `.new` behavior if and only if you provided a `:user_id`.
This broke places where we instantiated the form in a
view (e.g. `./app/views/hyrax/admin/workflow_roles/index.html.erb`).

With this change, we make the behavior of `.new` fail towards its
"normal" implementation and instead rely on the presence of an attribute
to switch to a different form instantatior.

See Commit:

- https://github.com/samvera/hyku/commit/095edca9a50e647eb1b3ee31a34711c32151912e

Related to:

- https://github.com/samvera/hyku/pull/2079

Co-authored-by: LaRita Robinson <larita@scientist.com>
Co-authored-by: Kirk Wang <kirk.wang@scientist.com>
---
 .../workflow_responsibility_form_decorator.rb    | 16 ++++++++++++----
 .../forms/workflow_responsibility_group_form.rb  |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb b/app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb
index 10fc33a32..87119cdba 100644
--- a/app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb
+++ b/app/forms/hyrax/forms/workflow_responsibility_form_decorator.rb
@@ -5,13 +5,21 @@
 module Hyrax
   module Forms
     module WorkflowResponsibilityFormDecorator
+      ##
+      # @note We introduced this little crease in the code to allow for conditional switching; and
+      #       thus avoid copying a very large controller
+      #       (e.g. Hyrax::Admin::WorkflowRolesController)
+      # @see Hyrax::Forms::WorkflowResponsibilityGroupForm
       module ClassMethods
-        # Determine which form it is, user or group
+        ##
+        # Determine which form it is, user or group.  By default, it will be a user
+        # (e.g. {Hyrax::Forms::WorkflowResponsibilityForm}); however when you provide a :group_id it
+        # will be a group form (e.g. {Hyrax::Forms::WorkflowResponsibilityGroupForm}.
         def new(params = {})
-          if params[:user_id].present?
-            super
-          else
+          if params[:group_id].present?
             Forms::WorkflowResponsibilityGroupForm.new(params)
+          else
+            super
           end
         end
       end
diff --git a/app/forms/hyrax/forms/workflow_responsibility_group_form.rb b/app/forms/hyrax/forms/workflow_responsibility_group_form.rb
index 71f4323fb..7cb6d0715 100644
--- a/app/forms/hyrax/forms/workflow_responsibility_group_form.rb
+++ b/app/forms/hyrax/forms/workflow_responsibility_group_form.rb
@@ -10,6 +10,11 @@ def initialize(params = {})
         model_instance.agent = group.to_sipity_agent
       end
 
+      ##
+      # This method is necessary for the HTML form fields to have the correct name (e.g. `<input
+      # name="sipity_workflow_responsibility[group_id]">`).
+      #
+      # @see ActiveModel::Naming
       def model_instance
         @model ||= Sipity::WorkflowResponsibility.new
       end

From 047c8bc370ab078ea30e569d0c621286baa246fe Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 15:57:20 -0500
Subject: [PATCH 115/126] =?UTF-8?q?=F0=9F=8E=81=20Upgrade=20Redis=20initia?=
 =?UTF-8?q?lizer=20to=20Hyrax=205's=20gen=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prior to this commit, when looking at the
`Hyrax::RedisEventStore.instance` we saw it's connection information as:

`#<Redis client v4.8.1 for redis://localhost:6379/0>`

We were expecting the connection to be the following:

`#<Redis client v4.8.1 for redis://redis:6379/0>`

What we were seeing in tests is when we hit the redis connection we were
getting an error about not being able to connect to 127.0.0.1:6379 (e.g.
localhost).

With this commit, we have a clear connection to Redis.

See Redis Config initializer:

- https://github.com/samvera/hyrax/blob/966951ffaa72524e4a775f8a198bd51a47ece7d9/lib/generators/hyrax/templates/config/initializers/redis_config.rb#L1-L10

Co-authored-by: Kirk Wang <kirk.wang@scientist.com>
---
 config/initializers/redis_config.rb   | 16 ++++++++--------
 spec/features/admin_dashboard_spec.rb |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/initializers/redis_config.rb b/config/initializers/redis_config.rb
index 772ddd2be..9a923b774 100644
--- a/config/initializers/redis_config.rb
+++ b/config/initializers/redis_config.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
-config = YAML.safe_load(ERB.new(IO.read(Rails.root + 'config' + 'redis.yml')).result)[Rails.env].with_indifferent_access
-sentinels = config[:sentinel] && config[:sentinel][:host].present? ? { sentinels: [config[:sentinel]] } : {}
-redis_config = config.except(:sentinel).merge(thread_safe: true).merge(sentinels)
 require 'redis'
-Redis.current = begin
-                  Redis.new(redis_config)
-                rescue
-                  nil
-                end
+require 'connection_pool'
+config = YAML.safe_load(ERB.new(IO.read(Rails.root.join('config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+
+size = ENV.fetch("HYRAX_REDIS_POOL_SIZE", 5)
+timeout = ENV.fetch("HYRAX_REDIS_TIMEOUT", 5)
+
+Hyrax.config.redis_connection =
+  ConnectionPool::Wrapper.new(size: size, timeout: timeout) { Redis.new(config) }
diff --git a/spec/features/admin_dashboard_spec.rb b/spec/features/admin_dashboard_spec.rb
index 3eef1f164..8a10076cc 100644
--- a/spec/features/admin_dashboard_spec.rb
+++ b/spec/features/admin_dashboard_spec.rb
@@ -49,10 +49,10 @@
 
     it 'shows the status page' do
       visit status_path
-      expect(page).to have_content("Fedora\nOK")
-      expect(page).to have_content("Solr\nOK")
-      expect(page).to have_content("Redis\nOK")
-      expect(page).to have_content("Database\nOK")
+      expect(page).to have_selector(".list-group-item-success", text: "Fedora OK")
+      expect(page).to have_selector(".list-group-item-success", text: "Solr OK")
+      expect(page).to have_selector(".list-group-item-success", text: "Redis OK")
+      expect(page).to have_selector(".list-group-item-success", text: "Database OK")
     end
 
     it 'displays the add-users-to-groups page without the hidden form field', js: true do

From d35b250ed674ac5ece2f992dd27c3ecb825683d2 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 20 Dec 2023 12:02:27 -0800
Subject: [PATCH 116/126] =?UTF-8?q?=F0=9F=A7=B9=20Clean=20up=20actors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just found one actor that was overriding Hyrax.  This commit will switch
it to a decorator.
---
 ...nvironment.rb => environment_decorator.rb} | 18 +++++--------
 .../hyrax/environment_decorator_spec.rb       | 26 +++++++++++++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)
 rename app/actors/hyrax/{environment.rb => environment_decorator.rb} (51%)
 create mode 100644 spec/actors/hyrax/environment_decorator_spec.rb

diff --git a/app/actors/hyrax/environment.rb b/app/actors/hyrax/environment_decorator.rb
similarity index 51%
rename from app/actors/hyrax/environment.rb
rename to app/actors/hyrax/environment_decorator.rb
index 814895f87..257f66b11 100644
--- a/app/actors/hyrax/environment.rb
+++ b/app/actors/hyrax/environment_decorator.rb
@@ -1,25 +1,21 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax 2.9 to add in import flag
+# OVERRIDE Hyrax v5.0.0rc2 to add in import flag
+
 module Hyrax
   module Actors
-    class Environment
+    module EnvironmentDecoractor
       # @param [ActiveFedora::Base] curation_concern work to operate on
       # @param [Ability] current_ability the authorizations of the acting user
       # @param [ActionController::Parameters] attributes user provided form attributes
       def initialize(curation_concern, current_ability, attributes, importing = false)
-        @curation_concern = curation_concern
-        @current_ability = current_ability
-        @attributes = attributes.to_h.with_indifferent_access
         @importing = importing
+        super(curation_concern, current_ability, attributes)
       end
 
-      attr_reader :curation_concern, :current_ability, :attributes, :importing
-
-      # @return [User] the user from the current_ability
-      def user
-        current_ability.current_user
-      end
+      attr_reader :importing
     end
   end
 end
+
+Hyrax::Actors::Environment.prepend(Hyrax::Actors::EnvironmentDecoractor)
diff --git a/spec/actors/hyrax/environment_decorator_spec.rb b/spec/actors/hyrax/environment_decorator_spec.rb
new file mode 100644
index 000000000..ad2fd3e36
--- /dev/null
+++ b/spec/actors/hyrax/environment_decorator_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+RSpec.describe Hyrax::Actors::Environment, type: :decorator do
+  let(:curation_concern) { double('curation_concern') }
+  let(:current_ability) { double('current_ability') }
+  let(:attributes) { {} }
+
+  describe '#initialize' do
+    context 'when importing is not explicitly set' do
+      subject { described_class.new(curation_concern, current_ability, attributes) }
+
+      it 'initializes with an importing flag set to false (default behavior)' do
+        expect(subject.importing).to eq(false)
+      end
+    end
+
+    context 'when importing is explicitly set' do
+      let(:importing) { true }
+      subject { described_class.new(curation_concern, current_ability, attributes, importing) }
+
+      it 'initializes with an importing flag set to true' do
+        expect(subject.importing).to eq(true)
+      end
+    end
+  end
+end

From 55fa158ce2cad04d0b4d21a4d763666f5459939f Mon Sep 17 00:00:00 2001
From: LaRita Robinson <larita@scientist.com>
Date: Wed, 20 Dec 2023 16:34:13 -0500
Subject: [PATCH 117/126] =?UTF-8?q?=F0=9F=90=9B=20Handle=20missing=20label?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adjust paths and keys to look for labels.
---
 app/controllers/identity_providers_controller.rb   |  1 +
 .../dashboard/sidebar/_configuration.html.erb      |  2 +-
 app/views/identity_providers/_form.html.erb        |  8 ++++----
 app/views/identity_providers/index.html.erb        | 14 +++++++-------
 config/locales/de.yml                              |  2 +-
 config/locales/en.yml                              |  6 +++++-
 config/locales/es.yml                              |  2 +-
 config/locales/fr.yml                              |  2 +-
 config/locales/it.yml                              |  2 +-
 config/locales/pt-BR.yml                           |  2 +-
 config/locales/zh.yml                              |  2 +-
 11 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/controllers/identity_providers_controller.rb b/app/controllers/identity_providers_controller.rb
index 06cedfb20..7656e9c6e 100644
--- a/app/controllers/identity_providers_controller.rb
+++ b/app/controllers/identity_providers_controller.rb
@@ -7,6 +7,7 @@ class IdentityProvidersController < ApplicationController
   before_action :set_identity_provider, only: %i[edit update destroy]
 
   def index
+    add_breadcrumbs
     @identity_providers = IdentityProvider.all
   end
 
diff --git a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
index 8e31594a1..85184aab0 100644
--- a/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_configuration.html.erb
@@ -16,7 +16,7 @@
         <% end %>
 
         <%= menu.nav_link(main_app.identity_providers_path, class: "nav-link") do %>
-          <span class="fa fa-key"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.identity_providers') %></span>
+          <span class="fa fa-key"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.identity_provider') %></span>
         <% end %>
 
         <%= menu.nav_link(main_app.edit_site_labels_path,
diff --git a/app/views/identity_providers/_form.html.erb b/app/views/identity_providers/_form.html.erb
index 5958f3105..499cc0fbe 100644
--- a/app/views/identity_providers/_form.html.erb
+++ b/app/views/identity_providers/_form.html.erb
@@ -11,7 +11,7 @@
           </ul>
         </div>
       <% end %>
-      <%= f.input :name %>
+      <%= f.input :name, label: t('hyku.identity_provider.label.name'), required: true %>
       <%= f.input :provider,
             collection: Devise.omniauth_providers.map {|o| [o, o.upcase]},
                   label_method: :second,
@@ -38,12 +38,12 @@
         <p>Metadata is available <%= link_to 'here', "/users/auth/saml/#{@identity_provider.id}/metadata", data: { turbolinks: false } %></p>
       <% end %>
 
-      <%= f.input :options, input_html: {value: @identity_provider.options&.to_json } %>
+      <%= f.input :options, label: t('hyku.identity_provider.label.options'), input_html: {value: @identity_provider.options&.to_json } %>
 
 
       <%# Upload Logo Image %>
-      <%= f.input :logo_image, as: :file, wrapper: :vertical_file_input, hint: t('hyrax.admin.appearances.show.forms.logo_image.hint') %>
-      <%= f.input :logo_image_text, as: :text %>
+      <%= f.input :logo_image, label: t('hyku.identity_provider.label.logo_image'), as: :file, wrapper: :vertical_file_input, hint: t('hyrax.admin.appearances.show.forms.logo_image.hint') %>
+      <%= f.input :logo_image_text, label: t('hyku.identity_provider.label.logo_image_alt_text'), as: :text %>
       <%= image_tag f.object.logo_image.url(:medium), class: "img-responsive", alt: f.object.logo_image_text if f.object.logo_image? %>
 
     </div>
diff --git a/app/views/identity_providers/index.html.erb b/app/views/identity_providers/index.html.erb
index d56219c3d..80a459f93 100644
--- a/app/views/identity_providers/index.html.erb
+++ b/app/views/identity_providers/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_header do %>
-  <h1><span class="fa fa-user"></span> <%= t(:'hyrax.admin.sidebar.identity_providers_and_permissions') %></h1>
+  <h1><span class="fa fa-user"></span> <%= t('hyku.identity_provider.header') %></h1>
 <% end %>
 
 <div class="row">
@@ -9,10 +9,10 @@
         <table class="table table-striped datatable">
           <thead>
             <tr>
-              <th>Name</th>
-              <th>Provider</th>
-              <th>Updated At</th>
-              <th>Logo</th>
+              <th><%= t('hyku.identity_provider.label.name') %></th>
+              <th><%= t('hyku.identity_provider.label.provider') %></th>
+              <th><%= t('hyku.identity_provider.label.updated_at') %></th>
+              <th><%= t('hyku.identity_provider.label.logo') %></th>
               <th></th>
             </tr>
           </thead>
@@ -24,7 +24,7 @@
                 <td><%= u.updated_at %></td>
                 <td><%= image_tag u.logo_image.url(:thumb), class: "img-fluid", alt: u.logo_image_text if u.logo_image? %></td>
                 <td class="col-md-2">
-                  <%= link_to t('.edit'), edit_identity_provider_path(u) %>&nbsp;|&nbsp;
+                  <%= link_to t('hyku.identity_provider.label.edit'), edit_identity_provider_path(u) %>&nbsp;|&nbsp;
                   <%= link_to t('helpers.action.delete'), identity_provider_path(u), method: :delete, data: { confirm: t('.confirm_delete') } %>
                 </td>
               </tr>
@@ -32,7 +32,7 @@
           </tbody>
         </table>
         <%= link_to new_identity_provider_path, class: 'btn btn-primary' do %>
-          <span class="fa fa-edit"></span> <%= t('.create_new') %>
+          <span class="fa fa-edit"></span> <%= t('hyku.identity_provider.label.create_new') %>
         <% end %>
       </div>
     </div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 50c856db8..597465395 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -120,7 +120,7 @@ de:
         logo_image: Bild für die SSO-Seite
         logo_image_alt_text: Alternativtext für Bild
         name: Name oder Beschreibung
-        optoins: Optionen
+        options: Optionen
         provider: Anbieter
     proprietor:
       accounts:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 035f347fe..e02788b72 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -122,9 +122,13 @@ en:
       label:
         name: Name or Description
         provider: Provider
-        optoins: Options
+        options: Options
+        logo: Logo
+        updated_at: Updated At
         logo_image: Image for SSO Page
         logo_image_alt_text: Alt Text for Image
+        create_new: New
+        edit: Edit
     footer:
       admin_login: Administrator login
     proprietor:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 83a7512f6..b838588b3 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -120,7 +120,7 @@ es:
         logo_image: Imagen para la página SSO
         logo_image_alt_text: Texto alternativo para imagen
         name: Nombre o descripción
-        optoins: Opciones
+        options: Opciones
         provider: Proveedor
     proprietor:
       accounts:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9da57b8c7..ea9e6ae57 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -120,7 +120,7 @@ fr:
         logo_image: Image de la page SSO
         logo_image_alt_text: Texte alternatif pour l'image
         name: Nom ou description
-        optoins: Possibilités
+        options: Possibilités
         provider: Fournisseur
     proprietor:
       accounts:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 79a0b66f9..b60179053 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -120,7 +120,7 @@ it:
         logo_image: Immagine per la pagina SSO
         logo_image_alt_text: Testo alternativo per l'immagine
         name: Nome o descrizione
-        optoins: Opzioni
+        options: Opzioni
         provider: Fornitore
     proprietor:
       accounts:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index f3fb64ddb..a7ae33b68 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -120,7 +120,7 @@ pt-BR:
         logo_image: Imagem para página SSO
         logo_image_alt_text: Texto alternativo para imagem
         name: Nome ou Descrição
-        optoins: Opções
+        options: Opções
         provider: Fornecedor
     proprietor:
       accounts:
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c21428bd8..9cc0d6f7b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -120,7 +120,7 @@ zh:
         logo_image: SSO 页面的图像
         logo_image_alt_text: 图像的替代文本
         name: 名称或描述
-        optoins: 选项
+        options: 选项
         provider: 提供者
     proprietor:
       accounts:

From 01c86436f63d54235760f599a74a798c490b21c2 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 16:35:43 -0500
Subject: [PATCH 118/126] Appease the cops

---
 Gemfile                             | 2 +-
 spec/models/fcrepo_endpoint_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 02a857b32..9198442bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,8 +70,8 @@ gem 'puma', '~> 5.6' # Use Puma as the app server
 gem 'rack-test', '0.7.0', group: %i[test] # rack-test >= 0.71 does not work with older Capybara versions (< 2.17). See #214 for more details
 gem 'rails-controller-testing', group: %i[test]
 gem 'rdf', '~> 3.2'
-gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
 gem 'redis-namespace', '~> 1.10' # Hyrax v5 relies on 1.5; but we'd like to have the #clear method so we need 1.10 or greater.
+gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
 gem 'riiif', '~> 2.0'
 gem 'rolify'
 gem 'rsolr', '~> 2.0'
diff --git a/spec/models/fcrepo_endpoint_spec.rb b/spec/models/fcrepo_endpoint_spec.rb
index bce230d69..af02cce6c 100644
--- a/spec/models/fcrepo_endpoint_spec.rb
+++ b/spec/models/fcrepo_endpoint_spec.rb
@@ -39,7 +39,7 @@
       # What I found is that I could not stub the last receiver in the chain; as it would still
       # attempt a HEAD request.  So here is the "test".
       connection = double(ActiveFedora::CachingConnection, delete: true)
-      fedora = double(ActiveFedora::Fedora, connection: connection)
+      fedora = double(ActiveFedora::Fedora, connection:)
       expect(ActiveFedora).to receive(:fedora).and_return(fedora)
       expect(connection).to receive(:delete).with(base_path)
       expect { subject.remove! }.to change(described_class, :count).by(-1)

From 70099cbadaffceed27ef35164e520939608a8047 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 16:40:07 -0500
Subject: [PATCH 119/126] =?UTF-8?q?=F0=9F=A7=B9=20Assigning=20collection?=
 =?UTF-8?q?=5Ftype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The partials rendered in the tested view assume that we've set a
collection type.
---
 .../views/hyrax/dashboard/collections/_form_share.erb_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb b/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb
index e81b615db..5ed7e31c3 100644
--- a/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb
+++ b/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb
@@ -8,10 +8,12 @@
                     to_key: template.to_key,
                     access_grants: template.access_grants)
   end
-  let(:collection) { stub_model(Collection, share_applies_to_new_works?: false) }
+  let(:collection) { stub_model(Collection) }
+  let(:collection_type) { stub_model(Hyrax::CollectionType, share_applies_to_new_works?: false) }
 
   before do
     assign(:collection, collection)
+    assign(:collection_type, collection_type)
     @form = instance_double(Hyrax::Forms::CollectionForm,
                             to_model: collection,
                             permission_template: pt_form,

From 8748cda293e89c0f6b6bb3fed24a9e18cd653062 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 16:54:44 -0500
Subject: [PATCH 120/126] Appease rubocop

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

diff --git a/config/initializers/redis_config.rb b/config/initializers/redis_config.rb
index 9a923b774..471fa3849 100644
--- a/config/initializers/redis_config.rb
+++ b/config/initializers/redis_config.rb
@@ -7,4 +7,4 @@
 timeout = ENV.fetch("HYRAX_REDIS_TIMEOUT", 5)
 
 Hyrax.config.redis_connection =
-  ConnectionPool::Wrapper.new(size: size, timeout: timeout) { Redis.new(config) }
+  ConnectionPool::Wrapper.new(size:, timeout:) { Redis.new(config) }

From 8ca1257866fbe5fdb3f7453a7e66cf751747cdd2 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 17:01:43 -0500
Subject: [PATCH 121/126] Fixing nav link selectors to new structure

---
 spec/views/admin/groups/edit.html.erb_spec.rb | 6 +++---
 spec/views/admin/groups/new.html.erb_spec.rb  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/views/admin/groups/edit.html.erb_spec.rb b/spec/views/admin/groups/edit.html.erb_spec.rb
index 647ccd603..fe4dd1585 100644
--- a/spec/views/admin/groups/edit.html.erb_spec.rb
+++ b/spec/views/admin/groups/edit.html.erb_spec.rb
@@ -18,12 +18,12 @@
     end
 
     it 'has the "description" tab in an active state' do
-      expect(rendered).to have_selector('.nav-tabs .active a', text: 'Description')
+      expect(rendered).to have_selector('.nav-tabs .nav-item .nav-link.active', text: 'Description')
     end
 
     it 'has tabs for other actions on the group' do
-      expect(rendered).to have_selector('.nav-tabs li a', text: 'Users')
-      expect(rendered).to have_selector('.nav-tabs li a', text: 'Remove')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a', text: 'Users')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a', text: 'Remove')
     end
 
     it 'has an input for name' do
diff --git a/spec/views/admin/groups/new.html.erb_spec.rb b/spec/views/admin/groups/new.html.erb_spec.rb
index 22050d4f8..ddfaed599 100644
--- a/spec/views/admin/groups/new.html.erb_spec.rb
+++ b/spec/views/admin/groups/new.html.erb_spec.rb
@@ -10,12 +10,12 @@
     end
 
     it 'has the "description" tab in an active state' do
-      expect(rendered).to have_selector('.nav-tabs .active a', text: 'Description')
+      expect(rendered).to have_selector('.nav-tabs .nav-item .nav-link.active', text: 'Description')
     end
 
     it 'has disable tabs for actions that require a group to have been created' do
-      expect(rendered).to have_selector('.nav-tabs .disabled a', text: 'Users')
-      expect(rendered).to have_selector('.nav-tabs .disabled a', text: 'Remove')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link.disabled', text: 'Users')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link.disabled', text: 'Remove')
     end
 
     it 'has an input for name' do

From fe5fc7c3a28fd367b1f6bb59ef91e34d36b4bbb4 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Wed, 20 Dec 2023 17:11:44 -0500
Subject: [PATCH 122/126] Fixing nav link selectors to new structure

---
 spec/views/admin/groups/remove.html.erb_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/views/admin/groups/remove.html.erb_spec.rb b/spec/views/admin/groups/remove.html.erb_spec.rb
index f46901e9b..4c2c68e0f 100644
--- a/spec/views/admin/groups/remove.html.erb_spec.rb
+++ b/spec/views/admin/groups/remove.html.erb_spec.rb
@@ -18,12 +18,12 @@
     end
 
     it 'has the "Remove" tab in an active state' do
-      expect(rendered).to have_selector('.nav-tabs .active a', text: 'Remove')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link.active', text: 'Remove')
     end
 
     it 'has tabs for other actions on the group' do
-      expect(rendered).to have_selector('.nav-tabs li a', text: 'Description')
-      expect(rendered).to have_selector('.nav-tabs li a', text: 'Users')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link', text: 'Description')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link', text: 'Users')
     end
 
     it 'has a delete button' do

From e92726a4a51873a368b83e430765499a5afa5440 Mon Sep 17 00:00:00 2001
From: Kirk Wang <kirk.wang@scientist.com>
Date: Wed, 20 Dec 2023 15:14:34 -0800
Subject: [PATCH 123/126] =?UTF-8?q?=F0=9F=A7=B9=20Clean=20up=20forms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The only big thing in this commit is the appearance_decorator.  I've
added to the spec to show that the decorator should be working as
intended.
---
 ...{appearance.rb => appearance_decorator.rb} | 291 ++++++++----------
 .../permission_template_form_decorator.rb     |   2 +-
 ...e_spec.rb => appearance_decorator_spec.rb} |  14 +-
 3 files changed, 145 insertions(+), 162 deletions(-)
 rename app/forms/hyrax/forms/admin/{appearance.rb => appearance_decorator.rb} (63%)
 rename spec/forms/hyrax/forms/admin/{appearance_spec.rb => appearance_decorator_spec.rb} (57%)

diff --git a/app/forms/hyrax/forms/admin/appearance.rb b/app/forms/hyrax/forms/admin/appearance_decorator.rb
similarity index 63%
rename from app/forms/hyrax/forms/admin/appearance.rb
rename to app/forms/hyrax/forms/admin/appearance_decorator.rb
index 03a521a29..96ffb8019 100644
--- a/app/forms/hyrax/forms/admin/appearance.rb
+++ b/app/forms/hyrax/forms/admin/appearance_decorator.rb
@@ -1,91 +1,143 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax 3.4.0 to add custom theming
+# OVERRIDE Hyrax v5.0.0rc2 to add custom theming
 
-# rubocop:disable Metrics/ClassLength
+# rubocop:disable Metrics/ModuleLength
 module Hyrax
   module Forms
     module Admin
       # An object to model and persist the form data for the appearance
       # customization menu
-      class Appearance
-        extend ActiveModel::Naming
-        delegate :banner_image, :banner_image?, to: :site
-        delegate :logo_image, :logo_image?, to: :site
-        delegate :favicon, :favicon?, to: :site
-        delegate :directory_image, :directory_image?, to: :site
-        delegate :default_collection_image, :default_collection_image?, to: :site
-        delegate :default_work_image, :default_work_image?, to: :site
-
-        ##
-        # @!group Class Attributes
-        #
-        # @!attribute default_fonts
-        #   @return [Hash<String, String>] there should be at least the key "body_font" and
-        #           "headline_font"
-        class_attribute :default_fonts, default: {
-          'body_font' => 'Helvetica Neue, Helvetica, Arial, sans-serif;',
-          'headline_font' => 'Helvetica Neue, Helvetica, Arial, sans-serif;'
-        }
-
-        ##
-        # @!attribute default_colors
-        #   @return [Hash<String, String>]
-        class_attribute :default_colors, default: {
-          'header_and_footer_background_color' => '#3c3c3c',
-          'header_and_footer_text_color' => '#dcdcdc',
-          'navbar_background_color' => '#000000',
-          'navbar_link_background_hover_color' => '#ffffff',
-          'navbar_link_text_color' => '#eeeeee',
-          'navbar_link_text_hover_color' => '#eeeeee',
-          'link_color' => '#2e74b2',
-          'link_hover_color' => '#215480',
-          'footer_link_color' => '#ffebcd',
-          'footer_link_hover_color' => '#ffffff',
-          'primary_button_hover_color' => '#286090',
-          'default_button_background_color' => '#ffffff',
-          'default_button_border_color' => '#cccccc',
-          'default_button_text_color' => '#333333',
-          # 'active_tabs_background_color'     => '#337ab7',
-          'facet_panel_background_color' => '#f5f5f5',
-          'facet_panel_text_color' => '#333333'
-        }
-        # @!endgroup Class Attributes
-
-        # @param [Hash] attributes the list of parameters from the form
-        def initialize(attributes = {})
-          @attributes = attributes
-        end
-
-        attr_reader :attributes
-        private :attributes
-
-        # This allows this object to route to the correct path
-        def self.model_name
-          ActiveModel::Name.new(self, Hyrax, "Hyrax::Admin::Appearance")
-        end
-
-        # Override this method if your form takes more than just the customization_params
-        def self.permitted_params
-          customization_params + image_params
-        end
-
-        def self.image_params
-          %i[favicon banner_image logo_image directory_image default_collection_image default_work_image]
-        end
+      module AppearanceDecorator
+        extend ActiveSupport::Concern
+
+        # rubocop:disable Metrics/BlockLength
+        prepended do
+          delegate :banner_image, :banner_image?, to: :site
+          delegate :logo_image, :logo_image?, to: :site
+          delegate :favicon, :favicon?, to: :site
+          delegate :directory_image, :directory_image?, to: :site
+          delegate :default_collection_image, :default_collection_image?, to: :site
+          delegate :default_work_image, :default_work_image?, to: :site
+
+          ##
+          # @!group Class Attributes
+          #
+          # @!attribute default_fonts
+          #   @return [Hash<String, String>] there should be at least the key "body_font" and
+          #           "headline_font"
+          class_attribute :default_fonts, default: {
+            'body_font' => 'Helvetica Neue, Helvetica, Arial, sans-serif;',
+            'headline_font' => 'Helvetica Neue, Helvetica, Arial, sans-serif;'
+          }
+
+          ##
+          # @!attribute default_colors
+          #   @return [Hash<String, String>]
+          class_attribute :default_colors, default: {
+            'header_and_footer_background_color' => '#3c3c3c',
+            'header_and_footer_text_color' => '#dcdcdc',
+            'navbar_background_color' => '#000000',
+            'navbar_link_background_hover_color' => '#ffffff',
+            'navbar_link_text_color' => '#eeeeee',
+            'navbar_link_text_hover_color' => '#eeeeee',
+            'link_color' => '#2e74b2',
+            'link_hover_color' => '#215480',
+            'footer_link_color' => '#ffebcd',
+            'footer_link_hover_color' => '#ffffff',
+            'primary_button_hover_color' => '#286090',
+            'default_button_background_color' => '#ffffff',
+            'default_button_border_color' => '#cccccc',
+            'default_button_text_color' => '#333333',
+            # 'active_tabs_background_color'     => '#337ab7',
+            'facet_panel_background_color' => '#f5f5f5',
+            'facet_panel_text_color' => '#333333'
+          }
+          # @!endgroup Class Attributes
+        end
+
+        class_methods do
+          # Override this method if your form takes more than just the customization_params
+          def permitted_params
+            customization_params + image_params
+          end
 
-        def site
-          @site ||= Site.instance
-        end
+          def image_params
+            %i[favicon banner_image logo_image directory_image default_collection_image default_work_image]
+          end
+
+          # @return [Array<Symbol>] a list of fields that are related to the banner
+          def banner_fields
+            %i[
+              banner_image banner_label
+            ]
+          end
+
+          def favicon_fields
+            [:favicon]
+          end
 
-        # Required to back a form
-        def to_key
-          []
+          # @return [Array<Symbol>] a list of fields that are related to the logo
+          def logo_fields
+            %i[
+              logo_image logo_label
+            ]
+          end
+
+          # @return [Array<Symbol>] a list of fields that are related to the directory
+          def directory_fields
+            %i[
+              directory_image directory_image_label
+            ]
+          end
+
+          # @return [Array<Symbol>] a list of fields that are related to default works & collections
+          def default_image_fields
+            %i[
+              default_collection_image
+              default_work_image
+              default_collection_label
+              default_work_label
+            ]
+          end
+
+          # A list of parameters that are related to customizations
+          # rubocop:disable Metrics/MethodLength
+          def customization_params
+            %i[
+              body_font
+              headline_font
+              header_and_footer_background_color
+              header_and_footer_text_color
+              link_color
+              link_hover_color
+              footer_link_color
+              footer_link_hover_color
+              primary_button_hover_color
+              default_button_background_color
+              default_button_border_color
+              default_button_text_color
+              active_tabs_background_color
+              facet_panel_background_color
+              facet_panel_text_color
+              navbar_background_color
+              navbar_link_background_hover_color
+              navbar_link_text_color
+              navbar_link_text_hover_color
+              custom_css_block
+              logo_image_text
+              banner_image_text
+              directory_image_text
+              default_collection_image_text
+              default_work_image_text
+            ]
+          end
+          # rubocop:enable Metrics/MethodLength
         end
+        # rubocop:enable Metrics/BlockLength
 
-        # Required to back a form (for route determination)
-        def persisted?
-          true
+        def site
+          @site ||= Site.instance
         end
 
         # The alt text for the logo image
@@ -198,31 +250,16 @@ def primary_button_hover_background_color
           darken_color(primary_button_hover_color, 0.1)
         end
 
-        # The mouse over color for the border of "primary" buttons
-        def primary_button_hover_border_color
-          darken_color(primary_button_border_color, 0.12)
-        end
-
         # The color for the background of active "primary" buttons
         def primary_button_active_background_color
           darken_color(primary_button_hover_color, 0.1)
         end
 
-        # The color for the border of active "primary" buttons
-        def primary_button_active_border_color
-          darken_color(primary_button_border_color, 0.12)
-        end
-
         # The color for the background of focused "primary" buttons
         def primary_button_focus_background_color
           darken_color(primary_button_hover_color, 0.1)
         end
 
-        # The color for the border of focused "primary" buttons
-        def primary_button_focus_border_color
-          darken_color(primary_button_border_color, 0.25)
-        end
-
         # The custom css module
         def custom_css_block
           # we want to be able to read the css
@@ -325,41 +362,6 @@ def default_image_attributes
           attributes.slice(*self.class.default_image_fields)
         end
 
-        # @return [Array<Symbol>] a list of fields that are related to the banner
-        def self.banner_fields
-          %i[
-            banner_image banner_label
-          ]
-        end
-
-        def self.favicon_fields
-          [:favicon]
-        end
-
-        # @return [Array<Symbol>] a list of fields that are related to the logo
-        def self.logo_fields
-          %i[
-            logo_image logo_label
-          ]
-        end
-
-        # @return [Array<Symbol>] a list of fields that are related to the directory
-        def self.directory_fields
-          %i[
-            directory_image directory_image_label
-          ]
-        end
-
-        # @return [Array<Symbol>] a list of fields that are related to default works & collections
-        def self.default_image_fields
-          %i[
-            default_collection_image
-            default_work_image
-            default_collection_label
-            default_work_label
-          ]
-        end
-
         # Persist the form values
         def update!
           self.class.customization_params.each do |field|
@@ -372,39 +374,6 @@ def update!
                                         .merge(default_image_attributes))
         end
 
-        # A list of parameters that are related to customizations
-        # rubocop:disable Metrics/MethodLength
-        def self.customization_params
-          %i[
-            body_font
-            headline_font
-            header_and_footer_background_color
-            header_and_footer_text_color
-            link_color
-            link_hover_color
-            footer_link_color
-            footer_link_hover_color
-            primary_button_hover_color
-            default_button_background_color
-            default_button_border_color
-            default_button_text_color
-            active_tabs_background_color
-            facet_panel_background_color
-            facet_panel_text_color
-            navbar_background_color
-            navbar_link_background_hover_color
-            navbar_link_text_color
-            navbar_link_text_hover_color
-            custom_css_block
-            logo_image_text
-            banner_image_text
-            directory_image_text
-            default_collection_image_text
-            default_work_image_text
-          ]
-        end
-        # rubocop:enable Metrics/MethodLength
-
         def font_import_body_url
           body = body_font.split('|').first.to_s.tr(" ", "+")
           # we need to be able to read the url to import fonts
@@ -469,4 +438,6 @@ def format_font_names(font_style)
     end
   end
 end
-# rubocop:enable Metrics/ClassLength
+# rubocop:enable Metrics/ModuleLength
+
+Hyrax::Forms::Admin::Appearance.prepend(Hyrax::Forms::Admin::AppearanceDecorator)
diff --git a/app/forms/hyrax/forms/permission_template_form_decorator.rb b/app/forms/hyrax/forms/permission_template_form_decorator.rb
index c09e514f2..7eda3fe0b 100644
--- a/app/forms/hyrax/forms/permission_template_form_decorator.rb
+++ b/app/forms/hyrax/forms/permission_template_form_decorator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# OVERRIDE Hyrax 3.4.1 to fix Hyrax::Groups args
+# OVERRIDE Hyrax v5.0.0rc2 to fix Hyrax::Groups args
 module Hyrax
   module Forms
     module PermissionTemplateFormDecorator
diff --git a/spec/forms/hyrax/forms/admin/appearance_spec.rb b/spec/forms/hyrax/forms/admin/appearance_decorator_spec.rb
similarity index 57%
rename from spec/forms/hyrax/forms/admin/appearance_spec.rb
rename to spec/forms/hyrax/forms/admin/appearance_decorator_spec.rb
index 466c50e3b..0fb32f2a1 100644
--- a/spec/forms/hyrax/forms/admin/appearance_spec.rb
+++ b/spec/forms/hyrax/forms/admin/appearance_decorator_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Hyrax::Forms::Admin::Appearance do
+RSpec.describe Hyrax::Forms::Admin::Appearance, type: :decorator do
   describe '.default_fonts' do
     subject { described_class.default_fonts }
 
@@ -18,4 +18,16 @@
 
     it { is_expected.to be_a(Hash) }
   end
+
+  describe '.image_params' do
+    subject { described_class.image_params }
+
+    it { is_expected.to be_an(Array) }
+  end
+
+  describe '#banner_image' do
+    subject { described_class.new.banner_image }
+
+    it { is_expected.to be_a(Hyrax::AvatarUploader) }
+  end
 end

From 72180016c5459bf2f5e1f97ff53c995ea7412a52 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Thu, 21 Dec 2023 08:42:50 -0500
Subject: [PATCH 124/126] =?UTF-8?q?=F0=9F=A7=B9=20Fix=20spec=20based=20on?=
 =?UTF-8?q?=20HTML=20class=20changes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spec/views/admin/groups/users.html.erb_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/views/admin/groups/users.html.erb_spec.rb b/spec/views/admin/groups/users.html.erb_spec.rb
index 9cfd94656..b8d095abd 100644
--- a/spec/views/admin/groups/users.html.erb_spec.rb
+++ b/spec/views/admin/groups/users.html.erb_spec.rb
@@ -33,12 +33,12 @@
     end
 
     it 'has the "users" tab in an active state' do
-      expect(rendered).to have_selector('.nav-tabs .active a', text: 'Users')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link.active', text: 'Users')
     end
 
     it 'has tabs for other actions on the group' do
-      expect(rendered).to have_selector('.nav-tabs li a', text: 'Description')
-      expect(rendered).to have_selector('.nav-tabs li a', text: 'Remove')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link', text: 'Description')
+      expect(rendered).to have_selector('.nav-tabs .nav-item a.nav-link', text: 'Remove')
     end
 
     it 'has a user search control' do

From cffe41b0bc3c90cdff9ebdcadf8078bc8e5b722d Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Thu, 21 Dec 2023 09:11:23 -0500
Subject: [PATCH 125/126] =?UTF-8?q?=F0=9F=A7=B9=20Narrow=20specificity=20o?=
 =?UTF-8?q?f=20CSS=20selector?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The selector was *very* specific, and with the HTML class changes for
Bootstrap 3 to 4, this almost certainly broke.

Note, there are still underlying issues with two other specs; there
errors are listed below:

```
1) Admin can select home page theme when a search results theme is
selected updates the search results page with the selected layout view

Failure/Error: super

     ActionView::Template::Error:
       undefined method `with_collection' for nil:NilClass
```
---
 spec/features/appearance_theme_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/features/appearance_theme_spec.rb b/spec/features/appearance_theme_spec.rb
index 6495d6b4a..1e0cca783 100644
--- a/spec/features/appearance_theme_spec.rb
+++ b/spec/features/appearance_theme_spec.rb
@@ -139,7 +139,7 @@
       allow_any_instance_of(ApplicationController).to receive(:current_account).and_return(account)
       visit '/'
       expect(page).to have_css('body.cultural_repository')
-      expect(page).to have_css('nav.navbar.navbar-inverse.navbar-static-top.cultural-repository-nav')
+      expect(page).to have_css('nav.navbar.cultural-repository-nav')
     end
 
     it 'updates the home theme when the theme is changed' do # rubocop:disable RSpec/ExampleLength
@@ -154,7 +154,7 @@
       allow_any_instance_of(ApplicationController).to receive(:current_account).and_return(account)
       visit '/'
       expect(page).to have_css('body.cultural_repository')
-      expect(page).to have_css('nav.navbar.navbar-inverse.navbar-static-top.cultural-repository-nav')
+      expect(page).to have_css('nav.navbar.cultural-repository-nav')
       visit '/admin/appearance'
       click_link('Themes')
       select('Default home', from: 'Home Page Theme')
@@ -174,7 +174,7 @@
       visit '/'
       expect(page).to have_css('body.missing_theme')
       expect(page).not_to have_css('nav.cultural-repsitory-nav')
-      expect(page).to have_css('nav.navbar.navbar-inverse.navbar-static-top')
+      expect(page).to have_css('nav.navbar.navbar-expand-lg')
     end
   end
 end

From 9c3c46a19a98203294f6352b195283d4911b35a0 Mon Sep 17 00:00:00 2001
From: Jeremy Friesen <jeremy.n.friesen@gmail.com>
Date: Thu, 21 Dec 2023 09:46:58 -0500
Subject: [PATCH 126/126] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20specificity=20o?=
 =?UTF-8?q?f=20CSS=20selectors=20in=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The hyper specific selectors are not durable for CSS framework upgrades.
---
 .../themes/institutional_repository/_masthead.html.erb      | 2 +-
 spec/features/cultural_repository_theme_spec.rb             | 4 ++--
 spec/features/institutional_repository_theme_spec.rb        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/themes/institutional_repository/_masthead.html.erb b/app/views/themes/institutional_repository/_masthead.html.erb
index 09a06ebab..dd2ffdd4e 100644
--- a/app/views/themes/institutional_repository/_masthead.html.erb
+++ b/app/views/themes/institutional_repository/_masthead.html.erb
@@ -1,6 +1,6 @@
 <% # OVERRIDE: Hyrax v5.0.0rc2 - added the search bar and removed the /login and locale nav menu and moved to the /controls partial for theming %>
 <header aria-label="header" class="top-header">
-  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between cultural-repository-nav <%= placement_class %>" role="navigation" aria-label="masthead">
+  <nav id="masthead" class="navbar navbar-expand-lg navbar-dark bg-dark justify-content-between institutional-repository-nav <%= placement_class %>" role="navigation" aria-label="masthead">
     <div class="container-fluid">
       <!-- Brand and toggle get grouped for better mobile display -->
       <div class="navbar-header">
diff --git a/spec/features/cultural_repository_theme_spec.rb b/spec/features/cultural_repository_theme_spec.rb
index b006a214a..ed5fe8cc2 100644
--- a/spec/features/cultural_repository_theme_spec.rb
+++ b/spec/features/cultural_repository_theme_spec.rb
@@ -47,9 +47,9 @@
       allow_any_instance_of(ApplicationController).to receive(:current_account).and_return(account)
       visit '/'
       expect(page).to have_css('body.cultural_repository')
-      expect(page).to have_css('nav.navbar.navbar-inverse.navbar-static-top.cultural-repository-nav')
+      expect(page).to have_css('nav.navbar.cultural-repository-nav')
       expect(page).to have_css('form#search-form-header.cultural-repository.form-horizontal.search-form')
-      expect(page).to have_css('ul#user_utility_links.cultural-repository.nav.navbar-nav.navbar-right')
+      expect(page).to have_css('ul#user_utility_links.cultural-repository.nav.navbar-nav')
       expect(page).to have_css('div.cultural-repository.facets')
       expect(page).to have_css('div.cultural-repository.featured-works-container')
       expect(page).to have_css('div.cultural-repository.recent-works-container')
diff --git a/spec/features/institutional_repository_theme_spec.rb b/spec/features/institutional_repository_theme_spec.rb
index d7ca4673f..6d88fa1c9 100644
--- a/spec/features/institutional_repository_theme_spec.rb
+++ b/spec/features/institutional_repository_theme_spec.rb
@@ -44,14 +44,14 @@
       allow_any_instance_of(ApplicationController).to receive(:current_account).and_return(account)
       visit '/'
       expect(page).to have_css('body.institutional_repository')
-      expect(page).to have_css('nav.navbar.navbar-inverse.navbar-static-top.institutional-repsitory-nav')
+      expect(page).to have_css('nav#masthead.navbar.institutional-repository-nav')
       expect(page).to have_css('div.ir-stats')
       expect(page).to have_css('div.institutional-repository-featured-researcher')
       expect(page).to have_css('div.institutional-repository-recent-uploads')
-      expect(page).to have_css('div.col-xs-12.col-md-8.institutional-repository.collections-container')
+      expect(page).to have_css('div.col-12.col-md-8.institutional-repository.collections-container')
       expect(page).not_to have_css('ul#homeTabs')
       expect(page).not_to have_css('ul.nav.nav-pills')
-      expect(page).not_to have_css('nav.navbar.navbar-inverse.navbar-static-top.cultural-repository-nav')
+      expect(page).not_to have_css('nav.navbar.cultural-repository-nav')
       expect(page).not_to have_css('background-container-gradient')
     end