Upgrade to blacklight 9

Author: jcoyne

.rubocop_todo.yml

@@ -41,9 +41,8 @@ gem 'view_component'
 gem 'zip_tricks'
 
 # Stanford related gems
-gem 'blacklight', '~> 7.41'
-# pinned because 6.7.0 is effectively coupled to BL >= 8.3.0 and Argo hasn't been updated to BL8 yet
-gem 'blacklight-hierarchy', '~> 6.6.0'
+gem 'blacklight', '~> 9.0'
+gem 'blacklight-hierarchy', '~> 6.9'
 gem 'cocina_display', '~> 2'
 gem 'dor-services-client', '~> 15.1'
 gem 'druid-tools'

Gemfile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ConstraintComponent < Blacklight::ConstraintComponent
-  def initialize(facet_item_presenter:, classes: 'filter', layout: ConstraintLayoutComponent)
+  def initialize(facet_item_presenter:, classes: ['filter'], layout: ConstraintLayoutComponent)
     super
   end
 end

Gemfile.lock

@@ -3,15 +3,15 @@
     <%= @facet_field.label %>
   <% end %>
   <% component.with_body do %>
-     <%= render Blacklight::FacetFieldListComponent.new(facet_field: @facet_field, layout: false) %>
+     <%= render Blacklight::Facets::ListComponent.new(facet_field: @facet_field, layout: false) %>
 
     <div data-controller="date-choice">
-      <div class='mb-3 row'>
+      <div class="mb-3 row">
         <div class="col-3"><label for="<%= @facet_field.key %>_after_datepicker">From:</label></div>
         <div class="col"><input id="<%= @facet_field.key %>_after_datepicker" type="date"
                data-date-choice-target="afterDate" data-action="change->date-choice#updateQuery" autocomplete="off"></div>
       </div>
-      <div class='mb-3 row'>
+      <div class="mb-3 row">
         <div class="col-3"><label for="<%= @facet_field.key %>_before_datepicker">Through:</label></div>
         <div class="col"><input id="<%= @facet_field.key %>_before_datepicker" type="date"
                data-date-choice-target="beforeDate" data-action="change->date-choice#updateQuery" autocomplete="off"></div>

app/components/constraint_component.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class DateChoiceFacetComponent < Blacklight::FacetFieldListComponent
+class DateChoiceFacetComponent < Blacklight::Facets::ListComponent
   def search_params
     @facet_field.search_state.params_for_search.except(:page, :utf8)
   end

app/components/date_choice_facet_component.html.erb

@@ -6,6 +6,8 @@ def initialize(document: nil, **kwargs)
   end
 
   def child_component
+    return super unless @view_context.action_name == 'show' && @view_context.controller_name == 'catalog'
+
     component_class.new(presenter: @presenter)
   end
 

app/components/date_choice_facet_component.rb

@@ -6,14 +6,14 @@
         <%= version_banner %>
         <% if show_latest_link? %>
           <div class="text-body">
-              <%= link_to('View latest version', solr_document_path(@document.id)) %>
+              <%= link_to('View latest version', solr_document_path(@presenter.document.id)) %>
           </div>
         <% end %>
       </div>
     </div>
   <% end %>
   <div class="row">
-    <%= render OpenCloseComponent.new(id: @document.id) if helpers.can?(:update, @presenter.cocina) && !version_or_user_version_view? %>
+    <%= render OpenCloseComponent.new(id: @presenter.document.id) if helpers.can?(:update, @presenter.cocina) && !version_or_user_version_view? %>
 
     <%= content_tag @as, class: @classes do %>
       <%= title -%>

app/components/document_component.rb

@@ -2,9 +2,9 @@
 
 class DocumentTitleComponent < Blacklight::DocumentTitleComponent
   def object_type_label
-    return 'apo' if @document.admin_policy?
+    return 'apo' if @presenter.document.admin_policy?
 
-    @document.object_type
+    @presenter.document.object_type
   end
 
   def object_type_class

app/components/document_title_component.html.erb

@@ -1,14 +1,6 @@
 # frozen_string_literal: true
 
-# @TODO after upgrading to BL 8, inherit from Blacklight::SearchNavbarComponent and remove most of it except for
-# "container_classes"
-class SearchNavbarComponent < Blacklight::Component
-  def initialize(blacklight_config:)
-    @blacklight_config = blacklight_config
-  end
-
-  attr_reader :blacklight_config
-
+class SearchNavbarComponent < Blacklight::SearchNavbarComponent
   def container_classes
     'container'
   end
@@ -22,7 +14,7 @@ def search_bar_component
       url: helpers.search_action_url,
       advanced_search_url: helpers.search_action_url(action: 'advanced_search'),
       params: helpers.search_state.params_for_search.except(:qt),
-      autocomplete_path: suggest_index_catalog_path
+      autocomplete_path: helpers.suggest_index_catalog_path
     )
   end