Bugfix for BL8 bookmark actions; replace @document_list. Fixes TD-1390.

- @document_list was removed in BL8 in favor of @response.documents

app/controllers/bookmarks_controller.rb

@@ -3,9 +3,9 @@ class BookmarksController < CatalogController
   include TrlnArgon::BookmarksControllerBehavior
   include BookmarksHelper
 
-  # blacklight 7 will try, in default configuration to POST any request
+  # Blacklight will try, in default configuration to POST any request
   # which is blocked by our Solr configuration, so we need to ensure
-  # our requests are done via GET
+  # our requests are done via GET (i.e., don't use search_service.fetch)
   # rubocop:disable Layout/LineLength
   # rubocop:disable Metrics/MethodLength
   def index
@@ -14,7 +14,7 @@ def index
 
     if bookmark_ids.empty?
       @response = Blacklight::Solr::Response.new({}, {})
-      @document_list = []
+      @documents = []
     else
       query_params = {
         q: bookmarks_query(bookmark_ids),
@@ -23,7 +23,7 @@ def index
       }
       # search_service.fetch does this internally (7.25)
       @response = search_service.repository.search(query_params)
-      @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(@response.documents, 'The @document_list instance variable is now deprecated and will be removed in Blacklight 8.0')
+      @documents = @response.documents
     end
 
     respond_to do |format|
@@ -40,18 +40,21 @@ def index
 
   # Override BL core to query Solr via GET rather than POST
   # for bookmarks tools, e.g., Cite, Email, SMS. See:
-  # https://github.com/projectblacklight/blacklight/blob/main/app/controllers/concerns/blacklight/bookmarks.rb#L27-L31
-  # https://github.com/projectblacklight/blacklight/blob/main/app/controllers/concerns/blacklight/catalog.rb#L126-L131
+  # https://github.com/projectblacklight/blacklight/blob/release-8.x/app/controllers/concerns/blacklight/bookmarks.rb#L27-L31
+  # https://github.com/projectblacklight/blacklight/blob/release-8.x/app/controllers/concerns/blacklight/catalog.rb#L115-L122
   # See also: lib/trln_argon/controller_override.rb
   def action_documents
-    @bookmarks = token_or_current_or_guest_user.bookmarks
-    bookmark_ids = @bookmarks.collect { |b| b.document_id.to_s }
+    bookmarks = token_or_current_or_guest_user.bookmarks
+    bookmark_ids = bookmarks.collect { |b| b.document_id.to_s }
     query_params = {
       q: bookmarks_query(bookmark_ids),
       defType: 'lucene',
       rows: bookmark_ids.count
     }
-    solr_response = search_service.repository.search(query_params)
-    [solr_response, solr_response.documents]
+    @response = search_service.repository.search(query_params)
+    @documents = @response.documents
+    raise Blacklight::Exceptions::RecordNotFound if @documents.blank?
+
+    @documents
   end
 end

app/views/catalog/_citation.html.erb

@@ -1,4 +1,4 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
   <% component.with_title { t('blacklight.tools.citation_note_html') } %>
   <%= render TrlnArgon::Document::CitationComponent.with_collection(@documents) if @documents.present? %>
-<% end %>
+<% end %>

lib/trln_argon/controller_override.rb

@@ -695,7 +695,7 @@ def is_advanced_search?(req_params = params)
       # rubocop:enable Naming/PredicateName
 
       def render_ris_action?
-        doc = @document || (@document_list || []).first
+        doc = @document || (@response.documents || []).first
         doc && doc.respond_to?(:export_formats) && doc.export_formats.keys.include?(:ris)
       end